# # # patch "www/admin-source_control.js" # from [a082da5d4a5e50cb274bb9328c9f9b1c2118043b] # to [816e285379b7cda121c3b8b285f6d8c826e18e72] # # patch "www/admin-source_control_backend.php" # from [fba0353ba15fd485a423e7d0cb980081ebc0fcb9] # to [760d04815e06e924ac1078d2318568403561d2c5] # ============================================================ --- www/admin-source_control.js a082da5d4a5e50cb274bb9328c9f9b1c2118043b +++ www/admin-source_control.js 816e285379b7cda121c3b8b285f6d8c826e18e72 @@ -51,7 +51,7 @@ set_state_display = function(state){ replaceChildNodes("serverstate", state); } // set 'chstate' button to enable/disable appropriately - if (state.match("WAITING") || state == "RUNNING" || state == "SLEEPING") { + if (state.match("WAITING") || state.match("RUNNING") || state.match("SLEEPING")) { getElement("chstate").value = "Disable server"; } else { getElement("chstate").value = "Enable server"; ============================================================ --- www/admin-source_control_backend.php fba0353ba15fd485a423e7d0cb980081ebc0fcb9 +++ www/admin-source_control_backend.php 760d04815e06e924ac1078d2318568403561d2c5 @@ -33,7 +33,8 @@ if ($action == "getsrv") { $what = "STOP"; else $what = "START"; - print $json->encode(array("status" => usherctrl("$what $project"))); + usherctrl("$what $project"); + print $json->encode(array("status" => usherctrl("STATUS " . $project))); } } else if ($action === "resetdb") { if(allowed('server')) {