Mercurial > hg > fapweb

changeset 148:6d4325451570

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
And some more work on the info system.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 23 Oct 2013 02:48:40 +0300
parents 91af5b225fd6
children 7e20560ac479
files createdb.php showajax.php
diffstat 2 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/createdb.php	Wed Oct 23 02:27:39 2013 +0300
+++ b/createdb.php	Wed Oct 23 02:48:40 2013 +0300
@@ -153,17 +153,23 @@
 );
 
 $siteDisplayVars = array(
+  "showMode"          => array(VT_INT, 0, "Currently active display mode"),
+  "rotateDuration"    => array(VT_INT, 15, "Slide rotation time per slide (seconds)"),
+
   "tempDuration"      => array(VT_INT, 120, "Temporary slide display time (seconds)"),
   "tempSlide"         => array(VT_INT, 0, "Temporary slide ID"),
+
+  "compoID"           => array(VT_INT, 0, "Compo ID of current compo"),
+  "compoPrevEntry"    => array(VT_INT, 0, "Previously shown compo entry"),
+  "compoCurrEntry"    => array(VT_INT, 0, "Current / next compo entry to be shown"),
+  
+  // Not user-manageable
   "tempSlideSet"      => array(VT_BOOL, false, "Temporary slide set"),
 
-  "showMode"          => array(VT_INT, 0, "Currently active display mode"),
-
   "activeSlideMode"   => array(VT_INT, 0, "Current active slide display mode"),
   "activeSlide"       => array(VT_INT, 0, "Current active slide"),
   "activeSlideExpire" => array(VT_INT, 0, "Expiration timestamp of current slide"),
 
-  "rotateDuration"    => array(VT_INT, 15, "Slide rotation time per slide (seconds)"),
   "rotateList"        => array(VT_INT, 0, "Current rotation list ID"),
   "rotateListIndex"   => array(VT_INT, 0, "Current index in rotation list"),
 
--- a/showajax.php	Wed Oct 23 02:27:39 2013 +0300
+++ b/showajax.php	Wed Oct 23 02:48:40 2013 +0300
@@ -188,7 +188,7 @@
           // Competition mode
           $compo = stFetchSQL(stPrepareSQL(
             "SELECT * FROM compos WHERE id=%d",
-            stGetDisplayVar("compoCompo")));
+            stGetDisplayVar("compoID")));
 
           $prev = stFetchSQL(stPrepareSQL(
             "SELECT * FROM entries WHERE id=%d",