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 4b4a1e6..d9a7dc6 100644 (file)
--- a/server/control.c
+++ b/server/control.c
@@ -32,46 +32,40 @@ bool PathExists(const char *path)
  * @param params The input parameters
  */
 void Control_Handler(FCGIContext *context, char *params) {
-       const char *action, *key = "", *name = "";
+       const char *action = "";
+       const char *name = "";
        bool force = false;
        ControlModes desired_mode;
 
-       FCGIValue values[4] = {
+
+       // 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[3] = {
                {"action", &action, FCGI_REQUIRED(FCGI_STRING_T)},
-               {"key", &key, 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 (FCGI_HasControl(context, key)) {
-               if (!strcmp(action, "release")) {
-                       FCGI_ReleaseControl(context);
-               } else if (!strcmp(action, "start")) {
-                       desired_mode = CONTROL_START;
-               } else if (!strcmp(action, "pause")) {
-                       desired_mode = CONTROL_PAUSE;
-               } else if (!strcmp(action, "resume")) {
-                       desired_mode = CONTROL_RESUME;
-               } else if (!strcmp(action, "stop")) {
-                       desired_mode = CONTROL_STOP;
-               } else {
-                       FCGI_RejectJSON(context, "Unknown action specified.");
-                       return;
-               }
+       } else if (!strcmp(action, "start")) {
+               desired_mode = CONTROL_START;
+       } else if (!strcmp(action, "pause")) {
+               desired_mode = CONTROL_PAUSE;
+       } else if (!strcmp(action, "resume")) {
+               desired_mode = CONTROL_RESUME;
+       } else if (!strcmp(action, "stop")) {
+               desired_mode = CONTROL_STOP; 
        } else {
-               FCGI_RejectJSONEx(context, STATUS_UNAUTHORIZED, 
-                       "Invalid control key specified.");
+               FCGI_RejectJSON(context, "Unknown action specified.");
                return;
        }
-
+       
        void *arg = NULL;
        if (desired_mode == CONTROL_START) {
                if (PathExists(name) && !force) {