projects / mailer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix for removed userid
[mailer.git] / inc / mysql-manager.php
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 50fcf10742eb1d5cbb23471f06f910aa1e732c3f..a54357dafddb326f3689d6cec0ff06e5df95cffc 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -623,15 +623,15 @@ function IS_MEMBER()
                                //* DEBUG: */ echo __LINE__."!!!<br />";
                                destroy_user_session();
 
-                               // Remove array elements to prevent errors
-                               unset($GLOBALS['userid']);
+                               // Reset userid
+                               $GLOBALS['userid'] = 0;
                        }
                } else {
                        // Cookie data is invalid!
                        //* DEBUG: */ echo __LINE__."***<br />";
 
-                       // Remove array elements to prevent errors
-                       unset($GLOBALS['userid']);
+                       // Reset userid
+                       $GLOBALS['userid'] = 0;
                }
 
                // Free memory
@@ -641,8 +641,8 @@ function IS_MEMBER()
                //* DEBUG: */ echo __LINE__."///<br />";
                destroy_user_session();
 
-               // Remove array elements to prevent errors
-               unset($GLOBALS['userid']);
+               // Reset userid
+               $GLOBALS['userid'] = 0;
        }
 
        // Cache status
@@ -1060,8 +1060,7 @@ function REMOVE_RECEIVER(&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=fal
        return $ret;
 }
 //
-function GET_TOTAL_DATA($search, $tableName, $lookFor, $whereStatement="userid", $onlyRows=false)
-{
+function GET_TOTAL_DATA($search, $tableName, $lookFor, $whereStatement="userid", $onlyRows=false) {
        $ret = 0;
        if ($onlyRows) {
                // Count rows
@@ -1075,15 +1074,16 @@ function GET_TOTAL_DATA($search, $tableName, $lookFor, $whereStatement="userid",
 
        // Load row
        list($ret) = SQL_FETCHROW($result);
-       //* DEBUG: */ echo __LINE__."*".$DATA."/".$search."/".$tableName."/".$ret."*<br />\n";
+
+       // Free result
        SQL_FREERESULT($result);
-       if (empty($ret)) {
-               if (($lookFor == "counter") || ($lookFor == "id")) {
-                       $ret = 0;
-               } else {
-                       $ret = "0.00000";
-               }
-       }
+
+       // Fix empty values
+       if ((empty($ret)) && ($lookFor != "counter") && ($lookFor != "id") && ($lookFor != "userid")) {
+               $ret = "0.00000";
+       } // END - if
+
+       // Return value
        return $ret;
 }
 /**
@@ -1353,13 +1353,15 @@ function SEND_ADMIN_EMAILS($subj, $msg) {
 }
 // Get ID number from administrator's login name
 function GET_ADMIN_ID($login) {
-       global $cacheArray;
+       global $cacheArray, $_CONFIG;
        $ret = "-1";
        if (!empty($cacheArray['admins']['aid'][$login])) {
                // Check cache
                $ret = $cacheArray['admins']['aid'][$login];
-               if (empty($ret)) $ret = "-1";
-       } else {
+
+               // Update cache hits
+               $_CONFIG['cache_hits']++;
+       } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
                 array($login), __FILE__, __LINE__);
@@ -1376,54 +1378,118 @@ function GET_ADMIN_ID($login) {
 // Get password hash from administrator's login name
 function GET_ADMIN_HASH($login)
 {
-       global $cacheArray;
+       global $cacheArray, $_CONFIG;
        $ret = "-1";
-       if (!empty($cacheArray['admins']['password'][$login]))
-       {
+       if (!empty($cacheArray['admins']['password'][$login])) {
                // Check cache
                $ret = $cacheArray['admins']['password'][$login];
-               if (empty($ret)) $ret = "-1";
-       }
-        else
-       {
+
+               // Update cache hits
+               $_CONFIG['cache_hits']++;
+       } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
                 array($login), __FILE__, __LINE__);
-               if (SQL_NUMROWS($result) == 1)
-               {
+               if (SQL_NUMROWS($result) == 1) {
+                       // Fetch data
                        list($ret) = SQL_FETCHROW($result);
-                       SQL_FREERESULT($result);
+
+                       // Set cache
+                       $cacheArray['admins']['password'][$login] = $ret;
                }
+
+               // Free result
+               SQL_FREERESULT($result);
        }
        return $ret;
 }
 //
 function GET_ADMIN_LOGIN ($aid) {
-       global $cacheArray;
+       global $cacheArray, $_CONFIG;
        $ret = "***";
-       if (!empty($cacheArray['admins']['login'])) {
-               // Check cache
-               if (!empty($cacheArray['admins']['login'][$aid])) {
-                       $ret = $cacheArray['admins']['login'][$aid];
-               } // END - if
-               if (empty($ret)) $ret = "***";
-       } else {
+       if (!empty($cacheArray['admins']['login'][$aid])) {
+               // Get cache
+               $ret = $cacheArray['admins']['login'][$aid];
+
+               // Update cache hits
+               $_CONFIG['cache_hits']++;
+       } elseif (!EXT_IS_ACTIVE("cache")) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT login FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
-                array(bigintval($aid)), __FILE__, __LINE__);
+                       array(bigintval($aid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1) {
                        // Fetch data
                        list($ret) = SQL_FETCHROW($result);
 
                        // Set cache
                        $cacheArray['admins']['login'][$aid] = $ret;
-               }
+               } // END - if
 
                // Free memory
                SQL_FREERESULT($result);
        }
        return $ret;
 }
+// Get email address of admin id
+function GET_ADMIN_EMAIL ($aid) {
+       global $cacheArray, $_CONFIG;
+
+       $ret = "***";
+       if (!empty($cacheArray['admins']['email'])) {
+               // Get cache
+               $ret = $cacheArray['admins']['email'][$aid];
+
+               // Update cache hits
+               $_CONFIG['cache_hits']++;
+       } elseif (!EXT_IS_ACTIVE("cache")) {
+               // Load from database
+               $result_aid = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
+                       array(bigintval($ret)), __FILE__, __LINE__);
+               if (SQL_NUMROWS($result) == 1) {
+                       // Get data
+                       list($ret) = SQL_FETCHROW($result_aid);
+
+                       // Set cache
+                       $cacheArray['admins']['email'][$aid] = $ret;
+                       } // END - if
+
+               // Free result
+               SQL_FREERESULT($result_aid);
+       }
+
+       // Return email
+       return $ret;
+}
+// Get default ACL  of admin id
+function GET_ADMIN_DEFAULT_ACL ($aid) {
+       global $cacheArray, $_CONFIG;
+
+       $ret = "***";
+       if (!empty($cacheArray['admins']['def_acl'])) {
+               // Use cache
+               $ret = $cacheArray['admins']['def_acl'][$aid];
+
+               // Update cache hits
+               $_CONFIG['cache_hits']++;
+       } else {
+               // Load from database
+               $result_aid = SQL_QUERY_ESC("SELECT default_acl FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
+                       array(bigintval($ret)), __FILE__, __LINE__);
+               if (SQL_NUMROWS($result) == 1) {
+                       // Fetch data
+                       list($ret) = SQL_FETCHROW($result_aid);
+
+                       // Set cache
+                       $cacheArray['admins']['def_acl'][$aid] = $ret;
+               }
+
+               // Free result
+               SQL_FREERESULT($result_aid);
+       }
+
+       // Return email
+       return $ret;
+}
 //
 function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="") {
        $ret = "";
@@ -1435,8 +1501,8 @@ function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="")
                                $ret .= "<OPTION value=\"".$value."\"";
                                if ($default == $value) $ret .= " selected checked";
                                $ret .= ">".$name[$idx]."</OPTION>\n";
-                       }
-               }
+                       } // END - foreach
+               } // END - if
        } else {
                // Data from database
                $SPEC = ", ".$id;
@@ -1453,7 +1519,7 @@ function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="")
                                if ($default == $value) $ret .= " selected checked";
                                if (!empty($add)) $add = " (".$add.")";
                                $ret .= ">".$title.$add."</OPTION>\n";
-                       }
+                       } // END - while
 
                        // Free memory
                        SQL_FREERESULT($result);
@@ -1466,7 +1532,7 @@ function ADD_OPTION_LINES($table, $id, $name, $default="",$special="",$where="")
        // Return - hopefully - the requested data
        return $ret;
 }
-// Aiut
+// Activate exchange (DEPERECATED???)
 function activateExchange() {
        global $_CONFIG;
        $result = SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE status='CONFIRMED' AND max_mails > 0", __FILE__, __LINE__);
Mailer-Project repository