Comments removed

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index c2a5e2445854213130b8bf19e3fb7b11f659ef4a..f9f775a00363cd6860966e8573424bc9a216efdf 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -64,12 +64,12 @@ function REGISTER_ADMIN ($user, $md5)
 // Only be executed on login procedure!
 function CHECK_ADMIN_LOGIN ($admin_login, $password)
 {
-       global $ADMINS, $_CONFIG, $CACHE;
+       global $cacheArray, $_CONFIG, $cacheInstance;
        $ret = "404"; $pass = "";
-       if (!empty($ADMINS['aid'][$admin_login]))
+       if (!empty($cacheArray['admins']['aid'][$admin_login]))
        {
                // Get password from cache
-               $pass = $ADMINS['password'][$admin_login];
+               $pass = $cacheArray['admins']['password'][$admin_login];
                $ret = "pass";
                $_CONFIG['cache_hits']++;
        }
@@ -111,9 +111,9 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
                 array($pass, $admin_login), __FILE__, __LINE__);
 
                // Shall I remove the cache file?
-               if ((EXT_IS_ACTIVE("cache")) && ($CACHE != false))
+               if ((EXT_IS_ACTIVE("cache")) && ($cacheInstance != false))
                {
-                       if ($CACHE->cache_file("admins", true)) $CACHE->cache_destroy();
+                       if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy();
                }
 
                // Password matches!
@@ -128,11 +128,11 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
 }
 // Only be executed on cookie checking
 function CHECK_ADMIN_COOKIES ($admin_login, $password) {
-       global $ADMINS, $_CONFIG;
+       global $cacheArray, $_CONFIG;
        $ret = "404"; $pass = "";
-       if (!empty($ADMINS['aid'][$admin_login])) {
+       if (!empty($cacheArray['admins']['aid'][$admin_login])) {
                // Get password from cache
-               $pass = $ADMINS['password'][$admin_login];
+               $pass = $cacheArray['admins']['password'][$admin_login];
                $ret = "pass";
                $_CONFIG['cache_hits']++;
        } else {
@@ -199,17 +199,17 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0)
                                // Copy back tmp file and delete tmp :-)
                                @copy($tmp, $file);
                                @unlink($tmp);
-                               define ('_FATAL', false);
+                               define('_FATAL', false);
                        }
                         elseif (!$found)
                        {
                                OUTPUT_HTML("<STRONG>CHANGE:</STRONG> 404!");
-                               define ('_FATAL', true);
+                               define('_FATAL', true);
                        }
                         else
                        {
                                OUTPUT_HTML("<STRONG>TMP:</STRONG> UNDONE!");
-                               define ('_FATAL', true);
+                               define('_FATAL', true);
                        }
                }
        }
@@ -221,12 +221,12 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0)
 //
 function ADMIN_DO_ACTION($wht)
 {
-       global $menuDesription, $menuTitle, $_CONFIG, $EXTENSIONS, $link, $DATA;
+       global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $link, $DATA, $DEPTH;
        //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*<br />\n";
        if (EXT_IS_ACTIVE("cache"))
        {
                // Include cache instance
-               global $CACHE;
+               global $cacheInstance;
        }
 
        // Remove any spaces from variable
@@ -245,8 +245,8 @@ function ADMIN_DO_ACTION($wht)
        $act = GET_ACTION($GLOBALS['module'], $wht);
 
        // Define admin login name and ID number
-       define('__ADMIN_LOGIN', SQL_ESCAPE($_SESSION['admin_login']));
-       define('__ADMIN_ID'   , GET_ADMIN_ID($_SESSION['admin_login']));
+       define('__ADMIN_LOGIN', SQL_ESCAPE(get_session('admin_login')));
+       define('__ADMIN_ID'   , GET_ADMIN_ID(get_session('admin_login')));
 
        // Preload templates
        if (EXT_IS_ACTIVE("admins")) {
@@ -300,7 +300,7 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
 //
 function ADD_ADMIN_MENU($act, $wht,$return=false)
 {
-       global $_GET, $menuDesription, $menuTitle, $link;
+       global $menuDesription, $menuTitle, $link;
        $SUB = false;
 
        // Menu descriptions
@@ -334,9 +334,9 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                        $menuDesription[$menu] = $descr;
                                }
                                $OUT .= "<TR>
-  <TD class=\"admin_menu\" colspan=\"2\">
-    <NOBR>&nbsp;<STRONG>&middot;</STRONG>&nbsp;";
-                               if (($menu == $act) && (empty($wht)))
+       <TD class=\"admin_menu\" colspan=\"2\">
+               <NOBR>&nbsp;<STRONG>&middot;</STRONG>&nbsp;";
+                                       if (($menu == $act) && (empty($wht)))
                                {
                                        $OUT .= "<STRONG>";
                                }
@@ -345,7 +345,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                        $OUT .= "[&nbsp;<A href=\"".URL."/modules.php?module=admin&amp;action=".$menu."\">";
                                }
                                $OUT .= $title;
-                               if (($menu == $act) && (empty($wht)))
+                                       if (($menu == $act) && (empty($wht)))
                                {
                                        $OUT .= "</STRONG>";
                                }
@@ -362,10 +362,10 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                        $menuDesription = array();
                                        $menuTitle = array(); $SUB = true;
                                        $OUT .= "<TR>
-  <TD width=\"10\" class=\"seperator\">&nbsp;</TD>
-  <TD class=\"admin_menu\">
-    <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_sub\">\n";
-                                       while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what))
+       <TD width=\"10\" class=\"seperator\">&nbsp;</TD>
+       <TD class=\"admin_menu\">
+               <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_sub\">\n";
+                                               while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what))
                                        {
                                                // Filename
                                                $INC = sprintf(PATH."inc/modules/admin/what-%s.php", $wht_sub);
@@ -385,8 +385,8 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                                        $menuTitle[$wht_sub]        = $title_what;
                                                        $menuDesription[$wht_sub] = $desc_what;
                                                        $OUT .= "<TR>
-  <TD class=\"admin_menu\" colspan=\"2\">
-    <NOBR>&nbsp;<STRONG>--&gt;</STRONG>&nbsp;";
+       <TD class=\"admin_menu\" colspan=\"2\">
+               <NOBR>&nbsp;<STRONG>--&gt;</STRONG>&nbsp;";
                                                        if ($readable)
                                                        {
                                                                if ($wht == $wht_sub)
@@ -426,7 +426,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                        // Free memory
                                        SQL_FREERESULT($result_what);
                                        $OUT .= "    </TABLE>
-  </TD>
+       </TD>
 </TR>\n";
                                }
                                $OUT .= "<TR><TD height=\"7\" colspan=\"2\"></TD></TR>\n";
@@ -453,7 +453,6 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
 //
 function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = false, $def = "0")
 {
-       global $_GET;
        // Output selection form with all confirmed user accounts listed
        $result = SQL_QUERY("SELECT userid, surname, family FROM "._MYSQL_PREFIX."_user_data ORDER BY userid", __FILE__, __LINE__);
        $OUT = "";
@@ -474,8 +473,7 @@ function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = fal
        // Remeber options in constant
        define('_MEMBER_SELECTION', $OUT);
 
-       if (!$return)
-       {
+       if (!$return) {
                // Display selection box
                define('__LANG_VALUE', GET_LANGUAGE());
 
@@ -484,8 +482,7 @@ function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = fal
        }
 }
 //
-function ADMIN_MENU_SELECTION($MODE, $default="", $defid="")
-{
+function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") {
        $wht = "what != ''";
        if ($MODE == "action") $wht = "what='' AND action !='login'";
        $result = SQL_QUERY_ESC("SELECT %s, title FROM "._MYSQL_PREFIX."_admin_menu WHERE ".$wht." ORDER BY sort",
@@ -496,7 +493,7 @@ function ADMIN_MENU_SELECTION($MODE, $default="", $defid="")
                $OUT = "<SELECT name=\"".$MODE."_menu";
                if ((!empty($defid)) || ($defid == "0")) $OUT .= "[".$defid."]";
                $OUT .= "\" size=\"1\" class=\"admin_select\">
-  <OPTION value=\"\">".SELECT_NONE."</OPTION>\n";
+       <OPTION value=\"\">".SELECT_NONE."</OPTION>\n";
                while (list($menu, $title) = SQL_FETCHROW($result))
                {
                        $OUT .= "  <OPTION value=\"".$menu."\"";
@@ -520,7 +517,7 @@ function ADMIN_MENU_SELECTION($MODE, $default="", $defid="")
 //
 function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="config=0", $translateComma = array(), $alwaysAdd=false)
 {
-       global $_CONFIG, $CFG_CACHE, $CACHE;
+       global $_CONFIG, $cacheArray, $cacheInstance;
        $DATA = array();
        $skip = false; $TEST2 = "";
        foreach ($POST as $id=>$val) {
@@ -622,8 +619,8 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
        // Is the config table updated and the cache extension installed?
        if ((GET_EXT_VERSION("cache") >= "0.1.2") && ($tableName == "_config")) {
                // Remove it here...
-               if ($CACHE->cache_file("config", true)) $CACHE->cache_destroy();
-               unset($CFG_CACHE);
+               if ($cacheInstance->cache_file("config", true)) $cacheInstance->cache_destroy();
+               unset($cacheArray);
        }
 
        // Settings saved
@@ -675,23 +672,23 @@ function ADMIN_USER_PROFILE_LINK($uid, $title="", $wht="list_user")
 //
 function ADMIN_CHECK_MENU_MODE()
 {
-       global $_CONFIG, $ADMINS, $_SESSION;
+       global $_CONFIG, $cacheArray;
 
        // Set the global mode as the mode for all admins
        $MODE = $_CONFIG['admin_menu']; $ADMIN = $MODE;
 
        // Check individual settings of current admin
-       if (isset($ADMINS['la_mode'][$_SESSION['admin_login']]))
+       if (isset($cacheArray['admins']['la_mode'][get_session('admin_login')]))
        {
                // Load from cache
-               $ADMIN = $ADMINS['la_mode'][$_SESSION['admin_login']];
+               $ADMIN = $cacheArray['admins']['la_mode'][get_session('admin_login')];
                $_CONFIG['cache_hits']++;
        }
         elseif (GET_EXT_VERSION("admins") >= "0.6.7")
        {
                // Load from database when version of "admins" is enough
                $result = SQL_QUERY_ESC("SELECT la_mode FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
-                array($_SESSION['admin_login']), __FILE__, __LINE__);
+                array(get_session('admin_login')), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                {
                        // Load data