]> git.mxchange.org Git - mailer.git/blobdiff - inc/modules/admin/admin-inc.php
More globals rewritten, see #100
[mailer.git] / inc / modules / admin / admin-inc.php
index 9230839a83dfa2444faeb589dd82ffea50ecb381..ea677c8fdbc60bf4d1e2b7f9535623cb94ba6833 100644 (file)
@@ -62,8 +62,6 @@ function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) {
 }
 // Only be executed on login procedure!
 function CHECK_ADMIN_LOGIN ($admin_login, $password) {
-       global $cacheArray, $cacheInstance;
-
        // By default no admin is found
        $ret = "404";
 
@@ -74,17 +72,17 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
        $data = array('aid' => $aid);
 
        // Is the cache valid?
-       if (isset($cacheArray['admins']['password'][$aid])) {
+       if (isset($GLOBALS['cache_array']['admins']['password'][$aid])) {
                // Get password from cache
-               $data['password'] = $cacheArray['admins']['password'][$aid];
+               $data['password'] = $GLOBALS['cache_array']['admins']['password'][$aid];
                $ret = "pass";
                incrementConfigEntry('cache_hits');
 
                // Include more admins data?
                if (GET_EXT_VERSION("admins") >= "0.7.0") {
                        // Load them here
-                       $data['login_failures'] = $cacheArray['admins']['login_failures'][$aid];
-                       $data['last_failure']   = $cacheArray['admins']['last_failure'][$aid];
+                       $data['login_failures'] = $GLOBALS['cache_array']['admins']['login_failures'][$aid];
+                       $data['last_failure']   = $GLOBALS['cache_array']['admins']['last_failure'][$aid];
                } // END - if
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Add extra data via filter now
@@ -187,8 +185,6 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
 
 // Try to login the admin by setting some session/cookie variables
 function LOGIN_ADMIN ($adminLogin, $passHash) {
-       global $cacheInstance;
-
        // Reset failure counter on matching admins version
        if ((GET_EXT_VERSION("admins") >= "0.7.0") && ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == ""))) {
                // Reset counter on out-dated sql_patches version
@@ -215,7 +211,7 @@ function LOGIN_ADMIN ($adminLogin, $passHash) {
 
 // Only be executed on cookie checking
 function CHECK_ADMIN_COOKIES ($admin_login, $password) {
-       global $cacheArray;
+       // By default no admin cookies are found
        $ret = "404"; $pass = "";
 
        // Get hash
@@ -233,86 +229,11 @@ function CHECK_ADMIN_COOKIES ($admin_login, $password) {
        // Return result
        return $ret;
 }
-//
-function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) {
-       // Initialize some variables
-       $done = false;
-       $seek++;
-       $next=-1;
-       $found = false;
-
-       // Is the file there and read-/write-able?
-       if ((FILE_READABLE($file)) && (is_writeable($file))) {
-               $search = "CFG: ".$comment;
-               $tmp = $file.".tmp";
-
-               // Open the source file
-               $fp = @fopen($file, 'r') or OUTPUT_HTML("<strong>READ:</strong> ".$file."<br />");
-
-               // Is the resource valid?
-               if (is_resource($fp)) {
-                       // Open temporary file
-                       $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("<strong>WRITE:</strong> ".$tmp."<br />");
-
-                       // Is the resource again valid?
-                       if (is_resource($fp_tmp)) {
-                               while (!feof($fp)) {
-                                       // Read from source file
-                                       $line = fgets ($fp, 1024);
-
-                                       if (strpos($line, $search) > -1) { $next = 0; $found = true; }
-
-                                       if ($next > -1) {
-                                               if ($next === $seek) {
-                                                       $next = -1;
-                                                       $line = $prefix . $DATA . $suffix."\n";
-                                               } else {
-                                                       $next++;
-                                               }
-                                       }
-
-                                       // Write to temp file
-                                       fputs($fp_tmp, $line);
-                               }
-
-                               // Close temp file
-                               fclose($fp_tmp);
-
-                               // Finished writing tmp file
-                               $done = true;
-                       }
-
-                       // Close source file
-                       fclose($fp);
-
-                       if (($done) && ($found)) {
-                               // Copy back tmp file and delete tmp :-)
-                               @copy($tmp, $file);
-                               @unlink($tmp);
-                               define('_FATAL', false);
-                       } elseif (!$found) {
-                               OUTPUT_HTML("<strong>CHANGE:</strong> 404!");
-                               define('_FATAL', true);
-                       } else {
-                               OUTPUT_HTML("<strong>TMP:</strong> UNDONE!");
-                               define('_FATAL', true);
-                       }
-               }
-       } else {
-               // File not found, not readable or writeable
-               OUTPUT_HTML("<strong>404:</strong> ".$file."<br />");
-       }
-}
 
 //
 function ADMIN_DO_ACTION($wht) {
-       global $menuDesription, $menuTitle, $cacheArray, $DATA;
-
+       global $DATA;
        //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*<br />\n";
-       if (EXT_IS_ACTIVE("cache")) {
-               // Include cache instance
-               global $cacheInstance;
-       }
 
        // Remove any spaces from variable
        if (empty($wht)) {
@@ -344,13 +265,13 @@ function ADMIN_DO_ACTION($wht) {
 
        // Check if action/what pair is valid
        $result_action = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu`
-WHERE action='%s' AND ((what='%s' AND what != 'overview') OR ((what='' OR `what` IS NULL) AND '%s'='overview'))
+WHERE `action`='%s' AND ((what='%s' AND what != 'overview') OR ((what='' OR `what` IS NULL) AND '%s'='overview'))
 LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_action) == 1) {
 
                // Is valid but does the inlcude file exists?
                $INC = sprintf("inc/modules/admin/action-%s.php", $act);
-               if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) {
+               if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) {
                        // Ok, we finally load the admin action module
                        LOAD_INC($INC);
                } elseif (__ACL_ALLOW == false) {
@@ -359,13 +280,13 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
                        addFatalMessage(getMessage('ADMIN_ACCESS_DENIED'));
                } else {
                        // Include file not found! :-(
-                       LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_404_ACTION'));
-                       addFatalMessage(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);
+                       LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_404'), $act));
+                       addFatalMessage(getMessage('ADMIN_ACTION_404'), $act);
                }
        } else {
                // Invalid action/what pair found!
-               LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_INVALID_ACTION'));
-               addFatalMessage(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
+               LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht));
+               addFatalMessage(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht);
        }
 
        // Free memory
@@ -376,30 +297,28 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
 }
 //
 function ADD_ADMIN_MENU($act, $wht, $return=false) {
-       global $menuDesription, $menuTitle, $cacheInstance;
-
        // Init variables
        $SUB = false;
        $OUT = "";
 
        // Menu descriptions
-       $menuDesription = array();
-       $menuTitle = array();
+       $GLOBALS['menu']['description'] = array();
+       $GLOBALS['menu']['title'] = array();
 
        // Is there a cache instance?
-       if ((is_object($cacheInstance)) && (getConfig('cache_admin_menu') == "Y")) {
+       if ((is_object($GLOBALS['cache_instance'])) && (getConfig('cache_admin_menu') == "Y")) {
                // Create cache name
                $cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login'));
 
                // Is that cache there?
-               if ($cacheInstance->loadCacheFile($cacheName)) {
+               if ($GLOBALS['cache_instance']->loadCacheFile($cacheName)) {
                        // Then load it
-                       $data = $cacheInstance->getArrayFromCache();
+                       $data = $GLOBALS['cache_instance']->getArrayFromCache();
 
                        // Extract all parts
                        $OUT = base64_decode($data['output'][0]);
-                       $menuTitle = unserialize(base64_decode($data['title'][0]));
-                       $menuDescription = unserialize(base64_decode($data['descr'][0]));
+                       $GLOBALS['menu']['title'] = unserialize(base64_decode($data['title'][0]));
+                       $GLOBALS['menu']['description'] = unserialize(base64_decode($data['descr'][0]));
 
                        // Return or output content?
                        if ($return) {
@@ -412,28 +331,22 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
 
        // Build main menu
        $result_main = SQL_QUERY("SELECT action, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`, id DESC", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result_main) > 0)
-       {
+       if (SQL_NUMROWS($result_main) > 0) {
                $OUT = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
 <tr><td colspan=\"2\" height=\"7\" class=\"seperator\">&nbsp;</td></tr>\n";
-               while (list($menu, $title, $descr) = SQL_FETCHROW($result_main))
-               {
-                       if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2"))
-                       {
+               while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) {
+                       if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) {
                                $ACL = ADMINS_CHECK_ACL($menu, "");
-                       }
-                        else
-                       {
+                       } else {
                                // ACL is "allow"... hmmm
                                $ACL = true;
                        }
-                       if ($ACL)
-                       {
-                               if (!$SUB)
-                               {
+
+                       if ($ACL === true) {
+                               if (!$SUB) {
                                        // Insert compiled menu title and description
-                                       $menuTitle[$menu]      = $title;
-                                       $menuDesription[$menu] = $descr;
+                                       $GLOBALS['menu']['title'][$menu]      = $title;
+                                       $GLOBALS['menu']['description'][$menu] = $descr;
                                }
                                $OUT .= "<tr>
        <td class=\"admin_menu\" colspan=\"2\">
@@ -457,12 +370,12 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                }
                                $OUT .= "</NOBR></td>
 </tr>\n";
-                               $result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE action='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`, id DESC",
+                               $result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`, id DESC",
                                        array($menu), __FILE__, __LINE__);
                                if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu))
                                {
-                                       $menuDesription = array();
-                                       $menuTitle = array(); $SUB = true;
+                                       $GLOBALS['menu']['description'] = array();
+                                       $GLOBALS['menu']['title'] = array(); $SUB = true;
                                        $OUT .= "<tr>
        <td width=\"10\" class=\"seperator\">&nbsp;</td>
        <td class=\"admin_menu\">
@@ -476,15 +389,15 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                                        // ACL is "allow"... hmmm
                                                        $ACL = true;
                                                }
-                                               $readable = FILE_READABLE($INC);
-                                               if ($ACL) {
+                                               $readable = INCLUDE_READABLE($INC);
+                                               if ($ACL === true) {
                                                        // Insert compiled title and description
-                                                       $menuTitle[$wht_sub]      = $title_what;
-                                                       $menuDesription[$wht_sub] = $desc_what;
+                                                       $GLOBALS['menu']['title'][$wht_sub]      = $title_what;
+                                                       $GLOBALS['menu']['description'][$wht_sub] = $desc_what;
                                                        $OUT .= "<tr>
        <td class=\"admin_menu\" colspan=\"2\">
                <NOBR>&nbsp;<strong>--&gt;</strong>&nbsp;";
-                                                       if ($readable)
+                                                       if ($readable === true)
                                                        {
                                                                if ($wht == $wht_sub)
                                                                {
@@ -500,7 +413,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                                                $OUT .= "<i class=\"admin_note\">";
                                                        }
                                                        $OUT .= $title_what;
-                                                       if ($readable)
+                                                       if ($readable === true)
                                                        {
                                                                if ($wht == $wht_sub)
                                                                {
@@ -537,26 +450,26 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
 
        // Compile and run the code here. This inserts all constants into the
        // HTML output. Costs me some time to figure this out... *sigh* Quix0r
-       $eval = "\$OUT = \"".COMPILE_CODE(addslashes($OUT))."\";";
+       $eval = "\$OUT = \"".COMPILE_CODE(SQL_ESCAPE($OUT))."\";";
        eval($eval);
 
        // Is there a cache instance again?
-       if ((is_object($cacheInstance)) && (getConfig('cache_admin_menu') == "Y")) {
+       if ((is_object($GLOBALS['cache_instance'])) && (getConfig('cache_admin_menu') == "Y")) {
                // Init cache
-               $cacheInstance->init($cacheName);
+               $GLOBALS['cache_instance']->init($cacheName);
 
                // Prepare cache data
                $data = array(
                        'output' => base64_encode($OUT),
-                       'title'  => $menuTitle,
-                       'descr'  => $menuDesription
+                       'title'  => $GLOBALS['menu']['title'],
+                       'descr'  => $GLOBALS['menu']['description']
                );
 
                // Write the data away
-               $cacheInstance->addRow($data);
+               $GLOBALS['cache_instance']->addRow($data);
 
                // Close cache
-               $cacheInstance->finalize();
+               $GLOBALS['cache_instance']->finalize();
        } // END - if
 
        // Return or output content?
@@ -632,8 +545,6 @@ function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") {
 
 // Save settings to the database
 function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="config=0", $translateComma=array(), $alwaysAdd=false) {
-       global $_CONFIG, $cacheArray, $cacheInstance;
-
        // Prepare all arrays, variables
        $DATA = array();
        $skip = false;
@@ -667,7 +578,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
                                }
 
                                // Update current configuration
-                               $_CONFIG[$id] = $val;
+                               setConfigEntry($id, $val);
                        } // END - if
                } // END - if
        } // END - foreach
@@ -783,8 +694,6 @@ function ADMIN_USER_PROFILE_LINK ($uid, $title="", $wht="list_user") {
 
 // Check "logical-area-mode"
 function ADMIN_CHECK_MENU_MODE () {
-       global $cacheArray;
-
        // Set the global mode as the mode for all admins
        $MODE = getConfig('admin_menu');
        $ADMIN = $MODE;
@@ -793,9 +702,9 @@ function ADMIN_CHECK_MENU_MODE () {
        $aid = GET_CURRENT_ADMIN_ID();
 
        // Check individual settings of current admin
-       if (isset($cacheArray['admins']['la_mode'][$aid])) {
+       if (isset($GLOBALS['cache_array']['admins']['la_mode'][$aid])) {
                // Load from cache
-               $ADMIN = $cacheArray['admins']['la_mode'][$aid];
+               $ADMIN = $GLOBALS['cache_array']['admins']['la_mode'][$aid];
                incrementConfigEntry('cache_hits');
        } elseif (GET_EXT_VERSION("admins") >= "0.6.7") {
                // Load from database when version of "admins" is enough
@@ -1214,10 +1123,8 @@ function ADMIN_UNDELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filter
 
 // Checks proxy settins by fetching check-updates3.php from www.mxchange.org
 function ADMIN_TEST_PROXY_SETTINGS ($settingsArray) {
-       global $_CONFIG;
-
        // Set temporary the new settings
-       $_CONFIG = merge_array($_CONFIG, $settingsArray);
+       mergeConfig($settingsArray);
 
        // Now get the test URL
        $content = GET_URL("check-updates3.php");