# HG changeset patch # User Matti Hamalainen # Date 1448009298 -7200 # Node ID f188caaedf0f18d065b318cf5292cf40a3751ed4 # Parent 3c3a1dc4008ac3882d981ec7b3fd9969566519a7 Implement force reloading of show screen web-page. diff -r 3c3a1dc4008a -r f188caaedf0f admajax.php --- a/admajax.php Fri Nov 20 10:39:50 2015 +0200 +++ b/admajax.php Fri Nov 20 10:48:18 2015 +0200 @@ -825,6 +825,14 @@ } break; + case "screencmd": + if (stChkRequestItem("cmd", $stmp, array(CHK_TYPE, VT_STR, "Invalid data."))) + { + stSetDisplayVar("screenCmdSet", TRUE); + stSetDisplayVarUpd("screenCmd", $stmp); + } + break; + case "check": // // Perform systems check @@ -1204,6 +1212,7 @@ stGetShowModeButton(SMODE_ROTATE, "Slide rotation", $showMode)."\n". stGetShowModeButton(SMODE_COMPO, "Compo mode", $showMode)."\n". "Open info window\n". + stGetFormButtonElement("showForceReload", "", "", "Showscreen reload", "showScreenCmd('reload')")."\n". "\n". "
\n". stGetFormButtonInput("syscheck", "", "", "Perform system check", "performSystemCheck()")."\n". diff -r 3c3a1dc4008a -r f188caaedf0f admin.js --- a/admin.js Fri Nov 20 10:39:50 2015 +0200 +++ b/admin.js Fri Nov 20 10:48:18 2015 +0200 @@ -617,6 +617,12 @@ // // Misc functions // +function showScreenCmd(str) +{ + jsSendPOSTRequest("action=screencmd&cmd="+str); +} + + function performSystemCheck() { jsSendPOSTRequest("action=check", jsMessageBox); diff -r 3c3a1dc4008a -r f188caaedf0f dbdefs.inc.php --- a/dbdefs.inc.php Fri Nov 20 10:39:50 2015 +0200 +++ b/dbdefs.inc.php Fri Nov 20 10:48:18 2015 +0200 @@ -387,6 +387,9 @@ "rotateListIndex" => array(VT_INT, 0, "Current index in rotation list"), "lastUpdate" => array(VT_INT, 0, "Timestamp of last slide update"), + + "screenCmd" => array(VT_STR, "", "Off-channel showscreen command"), + "screenCmdSet" => array(VT_BOOL, false, "Off-channel showscreen command has been set"), ); diff -r 3c3a1dc4008a -r f188caaedf0f show.php --- a/show.php Fri Nov 20 10:39:50 2015 +0200 +++ b/show.php Fri Nov 20 10:48:18 2015 +0200 @@ -103,6 +103,11 @@ } } else + if (txt == "reload") + { + location.reload(); + } + else { if (!timeOutSet) { diff -r 3c3a1dc4008a -r f188caaedf0f showajax.php --- a/showajax.php Fri Nov 20 10:39:50 2015 +0200 +++ b/showajax.php Fri Nov 20 10:48:18 2015 +0200 @@ -199,7 +199,13 @@ case "check": // Check if there has been any change $changed = stGetRequestItem("lastUpdate") != stGetDisplayVar("lastUpdate"); - echo $changed ? "changed" : "nochange"; + if (stGetDisplayVar("screenCmdSet")) + { + echo stGetDisplayVar("screenCmd"); + stSetDisplayVar("screenCmdSet", FALSE); + } + else + echo $changed ? "changed" : "nochange"; break; case "get":