# HG changeset patch # User Matti Hamalainen # Date 1384714263 -7200 # Node ID 5bae420200340ca6edaffb59aafda56238126d25 # Parent cafc05949a19f24b8a24d29a4e444883a263d1b5 Factorize some code into msitegen. diff -r cafc05949a19 -r 5bae42020034 admajax.php --- a/admajax.php Sun Nov 17 20:35:52 2013 +0200 +++ b/admajax.php Sun Nov 17 20:51:03 2013 +0200 @@ -505,20 +505,5 @@ break; } -if ($errorSet && !$statusSet) - stSetStatus(902, "Error"); - -if ($statusSet) -{ - http_response_code($statusSet); - header("Status: ".$statusSet." ".$statusMsg); -} - -if ($errorSet) -{ - echo "Following errors occured:\n"; - foreach ($errorMsgs as $msg) - echo " - ".$msg."\n"; -} - +stDumpAJAXStatusErrors(); ?> \ No newline at end of file diff -r cafc05949a19 -r 5bae42020034 msitegen.inc.php --- a/msitegen.inc.php Sun Nov 17 20:35:52 2013 +0200 +++ b/msitegen.inc.php Sun Nov 17 20:51:03 2013 +0200 @@ -48,6 +48,28 @@ } +function stDumpAJAXStatusErrors() +{ + global $errorSet, $errorMsgs, $statusSet, $statusMsg; + + if ($errorSet && !$statusSet) + stSetStatus(902, "Error"); + + if ($statusSet) + { + http_response_code($statusSet); + header("Status: ".$statusSet." ".$statusMsg); + } + + if ($errorSet) + { + echo "Following errors occured:\n"; + foreach ($errorMsgs as $msg) + echo " - ".$msg."\n"; + } +} + + function stCheckHTTPS() { return isset($_SERVER["HTTPS"]) && ($_SERVER["HTTPS"] != "" && $_SERVER["HTTPS"] != "off"); diff -r cafc05949a19 -r 5bae42020034 showajax.php --- a/showajax.php Sun Nov 17 20:35:52 2013 +0200 +++ b/showajax.php Sun Nov 17 20:51:03 2013 +0200 @@ -170,7 +170,6 @@ // Check if there has been any change $changed = stGetRequestItem("lastUpdate") != stGetDisplayVar("lastUpdate"); echo $changed ? "changed" : "nochange"; - stSetStatus(200, "OK"); break; case "get": @@ -230,4 +229,6 @@ // Save changed variables stSaveDisplayVars(); + +stDumpAJAXStatusErrors(); ?> \ No newline at end of file diff -r cafc05949a19 -r 5bae42020034 usrajax.php --- a/usrajax.php Sun Nov 17 20:35:52 2013 +0200 +++ b/usrajax.php Sun Nov 17 20:51:03 2013 +0200 @@ -132,4 +132,5 @@ break; } +stDumpAJAXStatusErrors(); ?> \ No newline at end of file