# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1386235992 -7200
# Node ID 0c1798c9d4866ef7833303462d8f75536afcdf6d
# Parent  3257ae94ba1c95cc406f2a138af34e35e70300e6
Add disabled mode.

diff -r 3257ae94ba1c -r 0c1798c9d486 admajax.php
--- a/admajax.php	Thu Dec 05 10:51:45 2013 +0200
+++ b/admajax.php	Thu Dec 05 11:33:12 2013 +0200
@@ -380,7 +380,7 @@
       case "setShowMode":
         if (stChkRequestItem("mode", $mode,
           array(CHK_TYPE, VT_INT, "Invalid data."),
-          array(CHK_RANGE, VT_INT, array(SMODE_ROTATE, SMODE_COMPO), "Invalid mode value.")))
+          array(CHK_RANGE, VT_INT, array(SMODE_DISABLED, SMODE_COMPO), "Invalid mode value.")))
         {
           $prev = stGetDisplayVar("showMode");
           if ($prev != $mode)
@@ -450,6 +450,7 @@
           "<div id=\"ctrlGlobalControls\">\n".
           "<div>\n".
           "Active mode:\n".
+          stGetShowModeButton(SMODE_DISABLED, "Off/disabled", $showMode)."\n".
           stGetShowModeButton(SMODE_ROTATE, "Slide rotation", $showMode)."\n".
           stGetShowModeButton(SMODE_COMPO, "Compo mode", $showMode)."\n".
           stGetFormButtonInput("syscheck", "", "", " Perform system check ", "performSystemCheck()")."\n".
diff -r 3257ae94ba1c -r 0c1798c9d486 msite.inc.php
--- a/msite.inc.php	Thu Dec 05 10:51:45 2013 +0200
+++ b/msite.inc.php	Thu Dec 05 11:33:12 2013 +0200
@@ -7,6 +7,7 @@
 require_once "msitegen.inc.php";
 
 // Define modes of party information display system
+define("SMODE_DISABLED", 0);
 define("SMODE_ROTATE", 1);
 define("SMODE_COMPO", 2);
 
diff -r 3257ae94ba1c -r 0c1798c9d486 showajax.php
--- a/showajax.php	Thu Dec 05 10:51:45 2013 +0200
+++ b/showajax.php	Thu Dec 05 11:33:12 2013 +0200
@@ -64,6 +64,16 @@
 }
 
 
+function stGuruMeditation()
+{
+  echo
+    "<div class=\"guru\">".
+    "Software Failure.&nbsp;&nbsp;&nbsp;Press left mouse button to continue.<br />".
+    "Guru Meditation #00000004.0000AAC0".
+    "</div>\n";
+}
+
+
 //
 // Initialize
 //
@@ -80,6 +90,11 @@
 //
 $updated = FALSE;
 
+if (stGetDisplayVar("showMode") == SMODE_DISABLED)
+{
+  stGuruMeditation();
+  exit;
+}
 
 // Temporary slides are handled globally
 if (stGetDisplayVar("tempDuration") > 0 &&
@@ -203,9 +218,7 @@
               stPrintRotationSlide($slide);
           }
           else
-          {
-            echo "<div class=\"guru\">Software Failure.&nbsp;&nbsp;&nbsp;Press left mouse button to continue.<br />Guru Meditation #00000004.0000AAC0</div>\n";
-          }
+            stGuruMeditation();
           break;
         
         case SMODE_COMPO:
@@ -232,7 +245,7 @@
     break;
 
   default:
-    stSetStatus(404, "Not Found");
+    stGuruMeditation();
     break;
 }