Mercurial > hg > fapweb
changeset 1071:76e11ae923a7
Use long tags.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Tue, 24 Jan 2017 17:44:50 +0200 |
| parents | e23057465ca2 |
| children | 7da8bde9b7be |
| files | admajax.js.php admajax.php admin.php admlogin.php admlogout.php faptool.php index.php msite.inc.php msitegen.inc.php show.php showajax.js.php showajax.php |
| diffstat | 12 files changed, 44 insertions(+), 46 deletions(-) [+] |
line wrap: on
line diff
--- a/admajax.js.php Tue Jan 24 17:37:50 2017 +0200 +++ b/admajax.js.php Tue Jan 24 17:44:50 2017 +0200 @@ -10,6 +10,7 @@ require_once "msite.inc.php"; require_once "msession.inc.php"; + // Initiate SQL database connection if (!stConnectSQLDB()) { @@ -25,6 +26,8 @@ if (!stChkSetting("admPassword") || !stAdmSessionAuth(FALSE)) exit; + +// Output JavaScript settings echo "\n". "var jsSettingsArgs = [];\n";
--- a/admajax.php Tue Jan 24 17:37:50 2017 +0200 +++ b/admajax.php Tue Jan 24 17:44:50 2017 +0200 @@ -1,4 +1,4 @@ -<? +<?php // // FAPWeb - Simple Web-based Demoparty Management System // Party administration page AJAX backend module
--- a/admin.php Tue Jan 24 17:37:50 2017 +0200 +++ b/admin.php Tue Jan 24 17:44:50 2017 +0200 @@ -1,4 +1,4 @@ -<? +<?php // // FAPWeb - Simple Web-based Demoparty Management System // Party administration page frontend module @@ -79,21 +79,18 @@ } else { -?> -<script type="text/javascript" src="admajax.js.php"></script> -<script type="text/javascript" src="genajax.js"></script> - -<div id="adminPopup"></div> -<div id="adminContent"> - -<div id="nstatus">-</div> -<div id="tabHeadersCC" class="tabHeaders"></div> -<div id="tabContentsCC" class="tabContents"> -<noscript> -<h1>Ehm, you need to enable JavaScript to use the admin interface.</h1> -</noscript> -</div> -<? + echo + "<script type=\"text/javascript\" src=\"admajax.js.php\"></script>\n". + "<script type=\"text/javascript\" src=\"genajax.js\"></script>\n". + "<div id=\"adminPopup\"></div>\n". + "<div id=\"adminContent\">\n". + "<div id=\"nstatus\">-</div>\n". + "<div id=\"tabHeadersCC\" class=\"tabHeaders\"></div>\n". + "<div id=\"tabContentsCC\" class=\"tabContents\">\n". + "<noscript>\n". + " <h1>Ehm, you need to enable JavaScript to use the admin interface.</h1>\n". + "</noscript>\n". + "</div>\n"; } cmPrintPageFooter();
--- a/admlogin.php Tue Jan 24 17:37:50 2017 +0200 +++ b/admlogin.php Tue Jan 24 17:44:50 2017 +0200 @@ -1,4 +1,4 @@ -<? +<?php // // FAPWeb - Simple Web-based Demoparty Management System // Administration interface session login handler
--- a/admlogout.php Tue Jan 24 17:37:50 2017 +0200 +++ b/admlogout.php Tue Jan 24 17:44:50 2017 +0200 @@ -1,4 +1,4 @@ -<? +<?php // // FAPWeb - Simple Web-based Demoparty Management System // Administration interface session logout
--- a/faptool.php Tue Jan 24 17:37:50 2017 +0200 +++ b/faptool.php Tue Jan 24 17:44:50 2017 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/php -<? +<?php // // FAPWeb - Simple Web-based Demoparty Management System // Special entry/preview/etc backend management commandline utility
--- a/index.php Tue Jan 24 17:37:50 2017 +0200 +++ b/index.php Tue Jan 24 17:44:50 2017 +0200 @@ -1,4 +1,4 @@ -<? +<?php // // FAPWeb - Simple Web-based Demoparty Management System // Main HTML page wrapper @@ -96,18 +96,18 @@ " </div>\n". "</div>\n". "<div id=\"infobox\">".$pageName."</div>\n"; -?> -<div id="mainContent"> -<div id="mainContentInner"> -<div id="mainContentWrap"> -<? + "<div id=\"mainContent\">\n". + "<div id=\"mainContentInner\">\n". + "<div id=\"mainContentWrap\">\n"; + if (file_exists($pagePath.$pageName.$pageExt)) include($pagePath.$pageName.$pageExt); -?> -</div> -</div> -</div> -<? -echo stGetSetting("siteExtraHTML"); + +echo + "</div>\n". + "</div>\n". + "</div>\n". + stGetSetting("siteExtraHTML"); + cmPrintPageFooter(); ?> \ No newline at end of file
--- a/msite.inc.php Tue Jan 24 17:37:50 2017 +0200 +++ b/msite.inc.php Tue Jan 24 17:44:50 2017 +0200 @@ -1,4 +1,4 @@ -<? +<?php // // FAPWeb - Simple Web-based Demoparty Management System // Generic and miscellaneous site support code
--- a/msitegen.inc.php Tue Jan 24 17:37:50 2017 +0200 +++ b/msitegen.inc.php Tue Jan 24 17:44:50 2017 +0200 @@ -1,4 +1,4 @@ -<? +<?php // // FAPWeb - Simple Web-based Demoparty Management System // Generic and miscellaneous site support code @@ -971,7 +971,7 @@ echo "// No CSRF?\n"; ?> var req = jsCreateXMLRequest(); - req.open("POST", "<? echo $backend ?>", true); + req.open("POST", "<?php echo $backend ?>", true); req.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); req.setRequestHeader("Content-length", params.length); req.setRequestHeader("Connection", "close"); @@ -983,7 +983,7 @@ switch (req.status) { case 404: - window.location = "<? echo $failover ?>"; + window.location = "<?php echo $failover ?>"; break; case 902:
--- a/show.php Tue Jan 24 17:37:50 2017 +0200 +++ b/show.php Tue Jan 24 17:44:50 2017 +0200 @@ -1,4 +1,4 @@ -<? +<?php // // FAPWeb - Simple Web-based Demoparty Management System // Party information display system @@ -30,6 +30,6 @@ <div class="showView" id="mainView"></div> -<? +<?php cmPrintPageFooter(FALSE); ?> \ No newline at end of file
--- a/showajax.js.php Tue Jan 24 17:37:50 2017 +0200 +++ b/showajax.js.php Tue Jan 24 17:44:50 2017 +0200 @@ -1,15 +1,14 @@ <?php -header("Content-Type: application/javascript"); -require_once "mconfig.inc.php"; -require_once "msite.inc.php"; -require_once "msession.inc.php"; -?> // // FAPWeb - Simple Web-based Demoparty Management System // Party main screen viewer // (C) Copyright 2012-2017 Tecnic Software productions (TNSP) // -<?php +header("Content-Type: application/javascript"); +require_once "mconfig.inc.php"; +require_once "msite.inc.php"; +require_once "msession.inc.php"; + stCommonAJAX("showajax.php", "show.php"); ?> @@ -111,4 +110,3 @@ setTickUpdate(100); viewChanged(); }); -