Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

[matches/MCTX3420.git] / server / control.c

diff --git a/server/control.c b/server/control.c
index 820c37c..d9a7dc6 100644 (file)
--- a/server/control.c
+++ b/server/control.c
@@ -38,28 +38,21 @@ void Control_Handler(FCGIContext *context, char *params) {
        ControlModes desired_mode;
 
 
-
        // Login/auth now handled entirely in fastcgi.c and login.c
        //TODO: Need to not have the ability for any user to stop someone else' experiment...
        // (achieve by storing the username of the person running the current experiment, even when they log out?)
        // (Our program should only realisitically support a single experiment at a time, so that should be sufficient)
-       FCGIValue values[4] = {
+       FCGIValue values[3] = {
                {"action", &action, FCGI_REQUIRED(FCGI_STRING_T)},
                {"force", &force, FCGI_BOOL_T},
                {"name", &name, FCGI_STRING_T}
        };
 
-       if (!FCGI_ParseRequest(context, params, values, 4))
+       if (!FCGI_ParseRequest(context, params, values, 3))
                return;
        
-       if (!strcmp(action, "lock")) {
-               FCGI_LockControl(context, force);
-               return;
-       } else if (!strcmp(action, "emergency")) {
+       if (!strcmp(action, "emergency")) {
                desired_mode = CONTROL_EMERGENCY;
-       }
-       else if (!strcmp(action, "release")) {
-               FCGI_ReleaseControl(context);
        } else if (!strcmp(action, "start")) {
                desired_mode = CONTROL_START;
        } else if (!strcmp(action, "pause")) {