diff admin.php @ 1069:5f92fa5e683a

Refactor how the "AJAX" stuff works.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 24 Jan 2017 17:25:48 +0200
parents ffacd904fd1f
children e23057465ca2
line wrap: on
line diff
--- a/admin.php	Tue Jan 24 16:44:30 2017 +0200
+++ b/admin.php	Tue Jan 24 17:25:48 2017 +0200
@@ -8,48 +8,6 @@
 require_once "mconfig.inc.php";
 require_once "msite.inc.php";
 require_once "msession.inc.php";
-require_once "majax.inc.php";
-
-
-function stCreateSettingsData()
-{
-  echo
-  "<script type=\"text/javascript\">\n".
-  "\n".
-  "var jsSettingsArgs = [];\n";
-
-  foreach (stExecSQL("SELECT * FROM settings_groups") as $group)
-  {
-    $args = array();
-    if (($res = stExecSQL("SELECT * FROM settings WHERE vgroup=".$group["id"])) !== false)
-    {
-      foreach ($res as $item)
-      {
-        switch ($item["vtype"])
-        {
-          case VT_STR:
-          case VT_TEXT: $type = 1; break;
-          case VT_INT:  $type = 2; break;
-          case VT_BOOL: $type = 3; break;
-        }
-        $args[] = "\"".$item["key"]."\":".$type;
-      }
-    }
-
-    echo "jsSettingsArgs[".$group["id"]."] = {".implode(",", $args)."};\n";
-  }
-
-  echo
-  "\n".
-  "function jsUpdateSettings(id)\n".
-  "{\n".
-  "  if (id in jsSettingsArgs)\n".
-  "    jsSendPOSTRequest(\"action=update&type=settings&id=\"+id+\"&\"+jsMakePostArgs(jsSettingsArgs[id], \"st\", \"\"));\n".
-  "  return false;\n".
-  "}\n".
-  "\n".
-  "</script>\n";
-}
 
 
 function stLoginContent()
@@ -74,7 +32,9 @@
 // Start output
 $pageCSS = "css/admin.css";
 cmPrintPageHeader("FAPWeb Administration",
-  "  <meta http-equiv=\"Pragma\" content=\"no-cache\" />\n",
+  "  <meta http-equiv=\"Pragma\" content=\"no-cache\" />\n".
+  "  <script type=\"text/javascript\" src=\"admajax.js.php\"></script>\n".
+  "  <script type=\"text/javascript\" src=\"genajax.js\"></script>\n",
   FALSE);
 
 
@@ -121,8 +81,6 @@
 }
 else
 {
-stCreateSettingsData();
-stCommonAJAX("admajax.php", "admlogout.php");
 ?>
 <script type="text/javascript" src="admin.js"></script>