Extension 'yoomedia' now alpha status, some rewrites

[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 74ba0ce258a39acad47cd8aa6d384cbe224d6128..de735f5f5cfef9fe7e7b857726b39ec7ddf71573 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -71,7 +71,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
                // Get password from cache
                $data['password'] = $cacheArray['admins']['password'][$admin_login];
                $ret = "pass";
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
 
                // Include more admins data?
                if (GET_EXT_VERSION("admins") >= "0.7.0") {
@@ -79,7 +79,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
                        $data['login_failtures'] = $cacheArray['admins']['login_failtures'][$admin_login];
                        $data['last_failture']   = $cacheArray['admins']['last_failture'][$admin_login];
                } // END - if
-       } elseif (EXT_IS_ACTIVE("cache")) {
+       } elseif (!EXT_IS_ACTIVE("cache")) {
                $ADD = "";
                if (GET_EXT_VERSION("admins") >= "0.7.0") {
                        // Load them here
@@ -216,7 +216,7 @@ function CHECK_ADMIN_COOKIES ($admin_login, $password) {
        $pass = GET_ADMIN_HASH($admin_login);
        if ($pass != "-1") $ret = "pass";
 
-       //* DEBUG: */ echo __FUNCTION__.":".generatePassString($pass)."(".strlen($pass).")/".$password."(".strlen($password).")<br />\n";
+       //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):".generatePassString($pass)."(".strlen($pass).")/".$password."(".strlen($password).")<br />\n";
 
        // Check if password matches
        if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass)))) {
@@ -232,6 +232,7 @@ 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?
@@ -256,7 +257,7 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) {
                                        if (strpos($line, $search) > -1) { $next = 0; $found = true; }
 
                                        if ($next > -1) {
-                                               if ($next == $seek) {
+                                               if ($next === $seek) {
                                                        $next = -1;
                                                        $line = $prefix . $DATA . $suffix."\n";
                                                } else {
@@ -298,24 +299,20 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) {
 }
 
 //
-function ADMIN_DO_ACTION($wht)
-{
+function ADMIN_DO_ACTION($wht) {
        global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $DATA, $DEPTH;
+
        //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*<br />\n";
-       if (EXT_IS_ACTIVE("cache"))
-       {
+       if (EXT_IS_ACTIVE("cache")) {
                // Include cache instance
                global $cacheInstance;
        }
 
        // Remove any spaces from variable
-       if (empty($wht))
-       {
+       if (empty($wht)) {
                // Default admin action is the overview page
                $wht = "overview";
-       }
-        else
-       {
+       } else {
                // Compile out some chars
                $wht = COMPILE_CODE($wht, false, false, false);
        }
@@ -340,29 +337,21 @@ function ADMIN_DO_ACTION($wht)
        LOAD_TEMPLATE("admin_main_header");
 
        // Check if action/what pair is valid
-       $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admin_menu
+       $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'))
 LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) == 1)
-       {
-               // Free memory
-               SQL_FREERESULT($result);
+       if (SQL_NUMROWS($result_action) == 1) {
 
                // Is valid but does the inlcude file exists?
                $INC = sprintf("%sinc/modules/admin/action-%s.php", PATH, $act);
-               if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true))
-               {
+               if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) {
                        // Ok, we finally load the admin action module
                        include($INC);
-               }
-                elseif (__ACL_ALLOW == false)
-               {
+               } elseif (__ACL_ALLOW == false) {
                        // Access denied
                        LOAD_TEMPLATE("admin_menu_failed", false, ADMINS_ACCESS_DENIED);
                        ADD_FATAL(ADMINS_ACCESS_DENIED);
-               }
-                else
-               {
+               } else {
                        // Include file not found! :-(
                        LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_404_ACTION);
                        ADD_FATAL(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);
@@ -373,6 +362,9 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
                ADD_FATAL(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
        }
 
+       // Free memory
+       SQL_FREERESULT($result_action);
+
        // Tableset footer
        LOAD_TEMPLATE("admin_main_footer");
 }
@@ -654,7 +646,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
                                // Translate the value? (comma to dot!)
                                if ((is_array($translateComma)) && (in_array($id, $translateComma))) {
                                        // Then do it here... :)
-                                       $val = str_replace(",", ".", $val);
+                                       $val = REVERT_COMMA($val);
                                } // END - if
 
                                // Shall we add numbers or strings?
@@ -779,7 +771,7 @@ function ADMIN_CHECK_MENU_MODE() {
        if (isset($cacheArray['admins']['la_mode'][get_session('admin_login')])) {
                // Load from cache
                $ADMIN = $cacheArray['admins']['la_mode'][get_session('admin_login')];
-               $_CONFIG['cache_hits']++;
+               if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
        } 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",