# HG changeset patch # User Matti Hamalainen # Date 1382475846 -10800 # Node ID 20ca8edfb01a7768467e5c221ea8454bdf877668 # Parent 75cf14ee99a7abd271d7e27f77ac05d12d6ab43c Rename some settings and variables. diff -r 75cf14ee99a7 -r 20ca8edfb01a createdb.php --- a/createdb.php Tue Oct 22 23:58:41 2013 +0300 +++ b/createdb.php Wed Oct 23 00:04:06 2013 +0300 @@ -147,22 +147,22 @@ "votes" => "id INTEGER PRIMARY KEY AUTOINCREMENT, entry_id INT DEFAULT NULL, voter_id INT DEFAULT NULL, value INT DEFAULT 0", "displayVars" => "key VARCHAR(32) PRIMARY KEY, vtype INT, vstr VARCHAR(128), vtext TEXT, vint INT, desc VARCHAR(128)", - "displayPages" => "id INTEGER PRIMARY KEY AUTOINCREMENT, title VARCHAR(128), text VARCHAR(4096)", + "displaySlides" => "id INTEGER PRIMARY KEY AUTOINCREMENT, title VARCHAR(128), text VARCHAR(4096)", "displayListData" => "id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(128)", - "displayListPages" => "id INTEGER PRIMARY KEY AUTOINCREMENT, list_id INT DEFAULT 0, page_id INT DEFAULT 0", + "displayListSlides" => "id INTEGER PRIMARY KEY AUTOINCREMENT, list_id INT DEFAULT 0, slide_id INT DEFAULT 0", ); $siteDisplayVars = array( - "tempPageDuration" => array(VT_INT, 120, "Temporary page display time (seconds)"), - "tempPage" => array(VT_INT, 0, "Temporary page ID"), + "tempSlideDuration" => array(VT_INT, 120, "Temporary slide display time (seconds)"), + "tempSlide" => array(VT_INT, 0, "Temporary slide ID"), "showMode" => array(VT_INT, 0, "Currently active display mode"), - "activePageMode" => array(VT_INT, 0, "Current active page display mode"), - "activePage" => array(VT_INT, 0, "Current active page"), - "activePageExpire" => array(VT_INT, 0, "Expiration timestamp of current page"), + "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, 60, "Page rotation time per page (seconds)"), + "rotateDuration" => array(VT_INT, 60, "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"), ); @@ -208,7 +208,7 @@ array("jenkka", "aegis", 2, "jenkka.mod"), ), - "displayPages" => array( + "displaySlides" => array( "title,text", "%s,%s", array("Next Up", "

Next up: 4k intro

4k intro compo is about to begin

... in about 10 minutes."), @@ -223,8 +223,8 @@ array("Next Up"), ), - "displayListPages" => array( - "list_id,page_id", + "displayListSlides" => array( + "list_id,slide_id", "%d,%d", array(1,2), array(1,3), diff -r 75cf14ee99a7 -r 20ca8edfb01a showajax.php --- a/showajax.php Tue Oct 22 23:58:41 2013 +0300 +++ b/showajax.php Wed Oct 23 00:04:06 2013 +0300 @@ -29,7 +29,7 @@ " \n"; } -function stPrintCompoPage($compo, $entry, $prev) +function stPrintCompoSlide($compo, $entry, $prev) { echo "
\n". @@ -45,14 +45,14 @@ } -function stPrintRotationPage($page) +function stPrintRotationSlide($slide) { echo "
\n". "
\n". "
\n". "
\n". - $page["text"]. + $slide["text"]. "
\n"; } @@ -115,17 +115,17 @@ case "check": // Check if there has been any change $changed = FALSE; - if (stGetDisplayVar("tempPageDuration") > 0 && stGetDisplayVar("tempPage") > 0) + if (stGetDisplayVar("tempSlideDuration") > 0 && stGetDisplayVar("tempSlide") > 0) { - $sql = stPrepareSQL("SELECT * FROM displayPages WHERE id=%d", - stGetDisplayVar("tempPage")); + $sql = stPrepareSQL("SELECT * FROM displaySlides WHERE id=%d", + stGetDisplayVar("tempSlide")); if (($res = stFetchSQL($sql)) !== false) { - stSetDisplayVar("tempPageDuration", 0); - stSetDisplayVar("activePageMode", SMODE_ROTATE); - stSetDisplayVar("activePage", stGetDisplayVar("tempPage")); - stSetDisplayVar("activePageExpire", time() + stGetDisplayVar("tempPageDuration")); + stSetDisplayVar("tempSlideDuration", 0); + stSetDisplayVar("activeSlideMode", SMODE_ROTATE); + stSetDisplayVar("activeSlide", stGetDisplayVar("tempSlide")); + stSetDisplayVar("activeSlideExpire", time() + stGetDisplayVar("tempSlideDuration")); $changed = TRUE; } } @@ -134,40 +134,40 @@ { case SMODE_ROTATE: default: - stSetDisplayVar("activePageMode", SMODE_ROTATE); + stSetDisplayVar("activeSlideMode", SMODE_ROTATE); if (stGetDisplayVar("rotateList") == 0) { stSetDisplayVar("rotateList", 1); - stSetDisplayVar("activePageExpire", 0); + stSetDisplayVar("activeSlideExpire", 0); $changed = TRUE; } - if (time() >= stGetDisplayVar("activePageExpire") && + if (time() >= stGetDisplayVar("activeSlideExpire") && stGetDisplayVar("rotateList") > 0) { - error_log("page rotated"); + error_log("slide rotated"); - // Get list of pages from active rotation list + // Get list of slides from active rotation list $list = stGetDisplayVar("rotateList"); $sql = stPrepareSQL( - "SELECT * FROM displayListPages WHERE list_id=%d ORDER BY id", + "SELECT * FROM displayListSlides WHERE list_id=%d ORDER BY id", $list); - if (($pageList = stFetchSQL($sql)) !== false) + if (($slideList = stFetchSQL($sql)) !== false) { - // Get page at current index + // Get slide at current index $index = stGetDisplayVar("rotateListIndex"); - if (count($pageList) < $index) + if (count($slideList) < $index) { - $page_id = $pageList[$index]["page_id"]; - stSetDisplayVar("activePage", $page_id); - stSetDisplayVar("activePageExpire", time() + stGetDisplayVar("rotatePageTime")); + $slide_id = $slideList[$index]["slide_id"]; + stSetDisplayVar("activeSlide", $slide_id); + stSetDisplayVar("activeSlideExpire", time() + stGetDisplayVar("rotateSlideTime")); } - // Rotate to next page - if (++$index >= count($pageList)) + // Rotate to next slide + if (++$index >= count($slideList)) $index = 0; stSetDisplayVar("rotateListIndex", $index); @@ -175,11 +175,11 @@ } } else - if (stGetDisplayVar("activePage") != -1) + if (stGetDisplayVar("activeSlide") != -1) { - // Emergency page - stSetDisplayVar("activePage", -1); - stSetDisplayVar("activePageExpire", time() + stGetDisplayVar("rotatePageTime")); + // Emergency slide + stSetDisplayVar("activeSlide", -1); + stSetDisplayVar("activeSlideExpire", time() + stGetDisplayVar("rotateSlideTime")); $changed = TRUE; } break; @@ -197,17 +197,17 @@ case "get": // Based on the currently active mode ... - switch (stGetDisplayVar("activePageMode")) + switch (stGetDisplayVar("activeSlideMode")) { case SMODE_ROTATE: - // Page rotation mode, display currently active page - if (stGetDisplayVar("activePage") > 0) + // Slide rotation mode, display currently active slide + if (stGetDisplayVar("activeSlide") > 0) { - $sql = stPrepareSQL("SELECT * FROM displayPages WHERE id=%d", - stGetDisplayVar("activePage")); + $sql = stPrepareSQL("SELECT * FROM displaySlides WHERE id=%d", + stGetDisplayVar("activeSlide")); - if (($page = stFetchSQL($sql)) !== false) - stPrintRotationPage($page); + if (($slide = stFetchSQL($sql)) !== false) + stPrintRotationSlide($slide); } else { @@ -230,7 +230,7 @@ stGetDisplayVar("compoCurrEntry"))); if ($compo !== false) - stPrintCompoPage($compo, $entry, $prev); + stPrintCompoSlide($compo, $entry, $prev); break; } break;