X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=6b244371c278f309b049efa4f6221b62aade5e79;hb=439a544d74b0f34908b8524777c8c50294c03073;hp=fa65d85ae598da387404e4f4180840e797719d96;hpb=1fe7cf281be6832ba105934537aba5127892c576;p=mailer.git
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index fa65d85ae5..6b244371c2 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -39,8 +39,6 @@ if (!defined('__SECURITY')) {
// Returns the title for given module
function ADD_MODULE_TITLE ($mod) {
- global $cacheArray;
-
// Init variables
$name = "";
$result = false;
@@ -48,15 +46,16 @@ function ADD_MODULE_TITLE ($mod) {
// Is the script installed?
if (isBooleanConstantAndTrue('mxchange_installed')) {
// Check if cache is valid
- if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheArray['modules']['module'])) && (in_array($mod, $cacheArray['modules']['module']))) {
+ if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($GLOBALS['cache_array']['modules']['module'])) && (in_array($mod, $GLOBALS['cache_array']['modules']['module']))) {
// Load from cache
- $name = $cacheArray['modules']['title'][$mod];
+ $name = $GLOBALS['cache_array']['modules']['title'][$mod];
// Update cache hits
incrementConfigEntry('cache_hits');
} elseif (!EXT_IS_ACTIVE("cache")) {
// Load from database
- $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE module='%s' LIMIT 1", array($mod), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE module='%s' LIMIT 1",
+ array($mod), __FILE__, __LINE__);
list($name) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
}
@@ -81,9 +80,6 @@ function ADD_MODULE_TITLE ($mod) {
// Check validity of a given module name (no file extension)
function CHECK_MODULE ($mod) {
- // We need them now here...
- global $cacheArray, $cacheInstance;
-
// Filter module name (names with low chars and underlines are fine!)
$mod = preg_replace("/[^a-z_]/", "", $mod);
@@ -97,25 +93,34 @@ function CHECK_MODULE ($mod) {
if (EXT_IS_ACTIVE($modSplit[0])) {
// The prefix is an extension's name, so let's set it
$extension = $modSplit[0]; $mod = $modSplit[1];
- }
- }
+ } // END - if
+ } // END - if
// Major error in module registry is the default
$ret = "major";
// Check if script is installed if not return a "done" to prevent some errors
- if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (!isBooleanConstantAndTrue('admin_registered'))) return "done";
+ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isInstalling()) || (!isBooleanConstantAndTrue('admin_registered'))) {
+ // Not installed or no admin registered or in installation phase
+ return "done";
+ } // END - if
+
+ // Init variables
+ $locked = "Y";
+ $hidden = "N";
+ $admin = "N";
+ $mem = "N";
+ $found = false;
// Check if cache is latest version
- $locked = "Y"; $hidden = "N"; $admin = "N"; $mem = "N"; $found = false;
if (GET_EXT_VERSION("cache") >= "0.1.2") {
// Is the module cached?
- if (isset($cacheArray['modules']['locked'][$mod_chk])) {
+ if (isset($GLOBALS['cache_array']['modules']['locked'][$mod_chk])) {
// Check cache
- $locked = $cacheArray['modules']['locked'][$mod_chk];
- $hidden = $cacheArray['modules']['hidden'][$mod_chk];
- $admin = $cacheArray['modules']['admin_only'][$mod_chk];
- $mem = $cacheArray['modules']['mem_only'][$mod_chk];
+ $locked = $GLOBALS['cache_array']['modules']['locked'][$mod_chk];
+ $hidden = $GLOBALS['cache_array']['modules']['hidden'][$mod_chk];
+ $admin = $GLOBALS['cache_array']['modules']['admin_only'][$mod_chk];
+ $mem = $GLOBALS['cache_array']['modules']['mem_only'][$mod_chk];
// Update cache hits
incrementConfigEntry('cache_hits');
@@ -126,7 +131,8 @@ function CHECK_MODULE ($mod) {
}
} elseif (!EXT_IS_ACTIVE("cache")) {
// Check for module in database
- $result = SQL_QUERY_ESC("SELECT locked, hidden, admin_only, mem_only FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE module='%s' LIMIT 1", array($mod_chk), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT locked, hidden, admin_only, mem_only FROM `{!_MYSQL_PREFIX!}_mod_reg` WHERE module='%s' LIMIT 1",
+ array($mod_chk), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Read data
list($locked, $hidden, $admin, $mem) = SQL_FETCHROW($result);
@@ -152,12 +158,20 @@ function CHECK_MODULE ($mod) {
} elseif (($admin == "Y") && (!IS_ADMIN())) {
// Only the Admin is allowed to enter this module!
$ret = "admin_only";
+ } else {
+ // @TODO Nothing helped???
+ DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("ret=%s,locked=%s,admin=%s,mem=%s",
+ $ret,
+ $locked,
+ $admin,
+ $mem
+ ));
}
} // END - if
// Still no luck or not found?
if (($ret == "cache_miss") || (!$found)) {
- // ----- Legacy module ----- ---- Module in base folder ---- --- Module with extension's name ---
+ // ----- Legacy module ----- ---- Module in base folder ---- --- Module with extension's name ---
if ((FILE_READABLE(sprintf("%sinc/modules/%s.php", constant('PATH'), $mod))) || (FILE_READABLE(sprintf("%s%s.php", constant('PATH'), $mod))) || (FILE_READABLE(sprintf("%s%s/%s.php", constant('PATH'), $extension, $mod)))) {
// Data is missing so we add it
if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
@@ -205,22 +219,21 @@ function CHECK_MODULE ($mod) {
}
// Add menu description pending on given file name (without path!)
-function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
- global $NAV_DEPTH;
-
- // Use only filename of the file ;)
- $file = basename($file);
+function ADD_DESCR ($ACC_LVL, $FQFN, $return = false, $output = true) {
+ // Use only filename of the FQFN...
+ $file = basename($FQFN);
// Init variables
- $LINK_ADD = ""; $OUT = ""; $AND = "";
+ $LINK_ADD = "";
+ $OUT = "";
+ $AND = "";
// First we have to do some analysis...
if (substr($file, 0, 7) == "action-") {
// This is an action file!
$type = "action";
$search = substr($file, 7);
- switch ($ACC_LVL)
- {
+ switch ($ACC_LVL) {
case "admin":
$modCheck = "admin";
break;
@@ -237,8 +250,7 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
$type = "what";
$search = substr($file, 5);
$AND = "";
- switch ($ACC_LVL)
- {
+ switch ($ACC_LVL) {
case "admin":
$modCheck = "admin";
break;
@@ -255,22 +267,24 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
$AND .= " AND `action`='".GET_ACTION($ACC_LVL, $dummy)."'";
} elseif (($ACC_LVL == "sponsor") || ($ACC_LVL == "engine")) {
// Sponsor / engine menu
- $type = "what";
- $search = $file;
+ $type = "what";
+ $search = $file;
$modCheck = $GLOBALS['module'];
- $AND = "";
+ $AND = "";
} else {
// Other
- $type = "menu";
- $search = $file;
+ $type = "menu";
+ $search = $file;
$modCheck = $GLOBALS['module'];
- $AND = "";
+ $AND = "";
}
- if ((!isset($NAV_DEPTH)) && (!$return)) {
- $NAV_DEPTH = 0;
+
+ // Begin the navigation line
+ if ((!isset($GLOBALS['nav_depth'])) && (!$return)) {
+ $GLOBALS['nav_depth'] = 0;
$prefix = "
{--YOU_ARE_HERE--}
Home";
} else {
- if (!$return) $NAV_DEPTH++;
+ if (!$return) $GLOBALS['nav_depth']++;
$prefix = "";
}
@@ -305,7 +319,7 @@ function ADD_DESCR ($ACC_LVL, $file, $return = false, $output = true) {
//* DEBUG: */ echo __LINE__."+".$type."+
\n";
// Add closing div and br-tag
$OUT .= "
\n";
- $NAV_DEPTH = "0";
+ $GLOBALS['nav_depth'] = "0";
// Run the filter chain
$ret = RUN_FILTER('post_youhere_line', array('access_level' => $ACC_LVL, 'type' => $type, 'content' => ""));
@@ -448,8 +462,6 @@ function ADD_MENU ($MODE, $act, $wht) {
// This patched function will reduce many SELECT queries for the specified or current admin login
function IS_ADMIN ($admin="") {
- global $cacheArray;
-
// Init variables
$ret = false; $passCookie = ""; $valPass = "";
//* DEBUG: */ echo __LINE__."ADMIN:".$admin."
";
@@ -463,19 +475,19 @@ function IS_ADMIN ($admin="") {
//* DEBUG: */ echo __LINE__."ADMIN:".$admin."/".$passCookie."
";
// Search in array for entry
- if (isset($cacheArray['admin_hash'])) {
+ if (isset($GLOBALS['cache_array']['admin_hash'])) {
// Use cached string
- $valPass = $cacheArray['admin_hash'];
- } elseif ((!empty($passCookie)) && (isset($cacheArray['admins']['password'][$admin])) && (!empty($admin))) {
+ $valPass = $GLOBALS['cache_array']['admin_hash'];
+ } elseif ((!empty($passCookie)) && (isset($GLOBALS['cache_array']['admins']['password'][$admin])) && (!empty($admin))) {
// Login data is valid or not?
- $valPass = generatePassString($cacheArray['admins']['password'][$admin]);
+ $valPass = generatePassString($GLOBALS['cache_array']['admins']['password'][$admin]);
// Cache it away
- $cacheArray['admin_hash'] = $valPass;
+ $GLOBALS['cache_array']['admin_hash'] = $valPass;
// Count cache hits
incrementConfigEntry('cache_hits');
- } elseif ((!empty($admin)) && ((!EXT_IS_ACTIVE("cache"))) || (!isset($cacheArray['admins']['password'][$admin]))) {
+ } elseif ((!empty($admin)) && ((!EXT_IS_ACTIVE("cache"))) || (!isset($GLOBALS['cache_array']['admins']['password'][$admin]))) {
// Search for admin
$result = SQL_QUERY_ESC("SELECT HIGH_PRIORITY password FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",
array($admin), __FILE__, __LINE__);
@@ -487,7 +499,7 @@ function IS_ADMIN ($admin="") {
list($passDB) = SQL_FETCHROW($result);
// Temporary cache it
- $cacheArray['admins']['password'][$admin] = $passDB;
+ $GLOBALS['cache_array']['admins']['password'][$admin] = $passDB;
// Generate password hash
$valPass = generatePassString($passDB);
@@ -510,7 +522,6 @@ function IS_ADMIN ($admin="") {
// Generates a list of "max receiveable emails per day"
function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) {
- global $_POST;
$OUT = "";
switch ($MODE) {
case "guest":
@@ -520,7 +531,7 @@ function ADD_MAX_RECEIVE_LIST ($MODE, $default = "", $return = false) {
$OUT = "";
while (list($value, $comment) = SQL_FETCHROW($result)) {
$OUT .= " ";
@@ -919,12 +927,12 @@ function GET_ACTION ($MODE, &$wht) {
// Get category name back
function GET_CATEGORY ($cid) {
// Default is not found
- $ret = _CATEGORY_404;
+ $ret = getMessage('_CATEGORY_404');
// Is the category id set?
if ($cid == "0") {
// No category
- $ret = _CATEGORY_NONE;
+ $ret = getMessage('_CATEGORY_NONE');
} elseif ($cid > 0) {
// Lookup the category in database
$result = SQL_QUERY_ESC("SELECT cat FROM `{!_MYSQL_PREFIX!}_cats` WHERE id=%s LIMIT 1",
@@ -945,7 +953,7 @@ function GET_CATEGORY ($cid) {
// Get a string of "mail title" and price back
function GET_PAYMENT ($pid, $full=false) {
// Default is not found
- $ret = _PAYMENT_404;
+ $ret = getMessage('_PAYMENT_404');
// Load payment data
$result = SQL_QUERY_ESC("SELECT mail_title, price FROM `{!_MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",
@@ -958,7 +966,7 @@ function GET_PAYMENT ($pid, $full=false) {
} else {
// Return title and price
list($t, $p) = SQL_FETCHROW($result);
- $ret = $t." / ".TRANSLATE_COMMA($p)." ".POINTS;
+ $ret = $t." / ".TRANSLATE_COMMA($p)." {!POINTS!}";
}
}
@@ -970,13 +978,11 @@ function GET_PAYMENT ($pid, $full=false) {
}
// Get (basicly) the price of given payment id
-function GET_PAY_POINTS($pid, $lookFor="price")
-{
+function GET_PAY_POINTS ($pid, $lookFor = "price") {
$ret = "-1";
$result = SQL_QUERY_ESC("SELECT %s FROM `{!_MYSQL_PREFIX!}_payments` WHERE id=%s LIMIT 1",
array($lookFor, $pid), __FILE__, __LINE__);
- if (SQL_NUMROWS($result) == 1)
- {
+ if (SQL_NUMROWS($result) == 1) {
// Payment type found... :-)
list($ret) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
@@ -985,8 +991,7 @@ function GET_PAY_POINTS($pid, $lookFor="price")
}
// Remove a receiver's ID from $ARRAY and add a link for him to confirm
-function REMOVE_RECEIVER (&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=false)
-{
+function REMOVE_RECEIVER (&$ARRAY, $key, $uid, $pool_id, $stats_id="", $bonus=false) {
$ret = "failed";
if ($uid > 0)
{
@@ -1058,18 +1063,16 @@ function GET_TOTAL_DATA ($search, $tableName, $lookFor, $whereStatement="userid"
}
// "Getter fro ref level percents
function GET_REF_LEVEL_PERCENTS ($level) {
- global $cacheInstance, $cacheArray;
-
// Default is zero
$per = 0;
// Do we have cache?
- if ((isset($cacheArray['ref_depths']['level'])) && (EXT_IS_ACTIVE("cache"))) {
+ if ((isset($GLOBALS['cache_array']['ref_depths']['level'])) && (EXT_IS_ACTIVE("cache"))) {
// First look for level
- $key = array_search($level, $cacheArray['ref_depths']['level']);
+ $key = array_search($level, $GLOBALS['cache_array']['ref_depths']['level']);
if ($key !== false) {
// Entry found!
- $per = $cacheArray['ref_depths']['percents'][$key];
+ $per = $GLOBALS['cache_array']['ref_depths']['percents'][$key];
// Count cache hit
incrementConfigEntry('cache_hits');
@@ -1107,7 +1110,7 @@ function GET_REF_LEVEL_PERCENTS ($level) {
*/
function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid="0", $locked=false, $add_mode="ref") {
//* DEBUG: */ print "----------------------- ".__FUNCTION__." - ENTRY ------------------------- \n";
- global $DATA, $cacheArray;
+ global $DATA;
// Convert mode to lower-case
$add_mode = strtolower($add_mode);
@@ -1150,7 +1153,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
if (SQL_NUMROWS($result_user) == 1) {
// This is the user and his ref
list($ref, $email) = SQL_FETCHROW($result_user);
- $cacheArray['add_uid'][$ref] = $uid;
+ $GLOBALS['cache_array']['add_uid'][$ref] = $uid;
// Get percents
$per = GET_REF_LEVEL_PERCENTS($GLOBALS['ref_level']);
@@ -1163,10 +1166,10 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
$ref_points = $points * $per / 100;
// Pay refback here if level > 0 and in ref-mode
- if ((EXT_IS_ACTIVE("refback")) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == "ref") && (isset($cacheArray['add_uid'][$uid]))) {
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."):uid={$uid},data={$cacheArray['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE!
\n";
- $ref_points = ADD_REFBACK_POINTS($cacheArray['add_uid'][$uid], $uid, $points, $ref_points);
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."):uid={$uid},data={$cacheArray['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER!
\n";
+ if ((EXT_IS_ACTIVE("refback")) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == "ref") && (isset($GLOBALS['cache_array']['add_uid'][$uid]))) {
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):uid={$uid},data={$GLOBALS['cache_array']['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE!
\n";
+ $ref_points = ADD_REFBACK_POINTS($GLOBALS['cache_array']['add_uid'][$uid], $uid, $points, $ref_points);
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):uid={$uid},data={$GLOBALS['cache_array']['add_uid'][$uid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER!
\n";
} // END - if
// Update points...
@@ -1217,7 +1220,7 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
// And sent it away
SEND_EMAIL($email, SUBJECT_DIRECT_PAYMENT, $msg);
- if (!isset($_GET['mid'])) LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_POINTS_ADDED'));
+ if (!REQUEST_ISSET_GET(('mid'))) LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_POINTS_ADDED'));
}
// Maybe there's another ref?
@@ -1235,22 +1238,20 @@ function ADD_POINTS_REFSYSTEM ($subject, $uid, $points, $send_notify=false, $rid
}
//
function UPDATE_REF_COUNTER ($uid) {
- global $cacheArray, $cacheInstance;
-
// Make it sure referal level zero (member him-/herself) is at least selected
- if (empty($cacheArray['ref_level'][$uid])) $cacheArray['ref_level'][$uid] = 1;
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."):uid={$uid},level={$cacheArray['ref_level'][$uid]}
\n";
+ if (empty($GLOBALS['cache_array']['ref_level'][$uid])) $GLOBALS['cache_array']['ref_level'][$uid] = 1;
+ //* DEBUG: */ print __FUNCTION__."(".__LINE__."):uid={$uid},level={$GLOBALS['cache_array']['ref_level'][$uid]}
\n";
// Update counter
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_refsystem` SET counter=counter+1 WHERE userid=%s AND level='%s' LIMIT 1",
- array(bigintval($uid), $cacheArray['ref_level'][$uid]), __FILE__, __LINE__);
+ array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FILE__, __LINE__);
// When no entry was updated then we have to create it here
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):updated=".SQL_AFFECTEDROWS()."
\n";
if (SQL_AFFECTEDROWS() < 1) {
// First count!
SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_refsystem` (userid, level, counter) VALUES (%s,%s,1)",
- array(bigintval($uid), $cacheArray['ref_level'][$uid]), __FILE__, __LINE__);
+ array(bigintval($uid), $GLOBALS['cache_array']['ref_level'][$uid]), __FILE__, __LINE__);
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):uid={$uid}
\n";
} // END - if
@@ -1269,7 +1270,7 @@ function UPDATE_REF_COUNTER ($uid) {
if (($ref > 0) && ($ref != $uid)) {
// Move to next referal level and count his counter one up!
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):ref={$ref} - ADVANCE!
\n";
- $cacheArray['ref_level'][$uid]++; UPDATE_REF_COUNTER($ref);
+ $GLOBALS['cache_array']['ref_level'][$uid]++; UPDATE_REF_COUNTER($ref);
} elseif ((($ref == $uid) || ($ref == 0)) && (GET_EXT_VERSION("cache") >= "0.1.2")) {
// Remove cache here
//* DEBUG: */ print __FUNCTION__."(".__LINE__."):ref={$ref} - CACHE!
\n";
@@ -1277,7 +1278,7 @@ function UPDATE_REF_COUNTER ($uid) {
}
// "Walk" back here
- $cacheArray['ref_level'][$uid]--;
+ $GLOBALS['cache_array']['ref_level'][$uid]--;
// Handle refback here if extension is installed
if (EXT_IS_ACTIVE("refback")) {
@@ -1302,18 +1303,20 @@ function SEND_ADMIN_EMAILS ($subj, $msg) {
// Get ID number from administrator's login name
function GET_ADMIN_ID ($login) {
- global $cacheArray;
+ // By default no admin is found
$ret = "-1";
- if (isset($cacheArray['admins']['aid'][$login])) {
- // Check cache
- $ret = $cacheArray['admins']['aid'][$login];
+
+ // Check cache
+ if (isset($GLOBALS['cache_array']['admins']['aid'][$login])) {
+ // Use it if found to save SQL queries
+ $ret = $GLOBALS['cache_array']['admins']['aid'][$login];
// Update cache hits
incrementConfigEntry('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__);
+ array($login), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
list($ret) = SQL_FETCHROW($result);
} // END - if
@@ -1338,11 +1341,12 @@ function GET_CURRENT_ADMIN_ID () {
// Get password hash from administrator's login name
function GET_ADMIN_HASH ($aid) {
- global $cacheArray;
+ // By default an invalid hash is returned
$ret = "-1";
- if (isset($cacheArray['admins']['password'][$aid])) {
+
+ if (isset($GLOBALS['cache_array']['admins']['password'][$aid])) {
// Check cache
- $ret = $cacheArray['admins']['password'][$aid];
+ $ret = $GLOBALS['cache_array']['admins']['password'][$aid];
// Update cache hits
incrementConfigEntry('cache_hits');
@@ -1355,7 +1359,7 @@ function GET_ADMIN_HASH ($aid) {
list($ret) = SQL_FETCHROW($result);
// Set cache
- $cacheArray['admins']['password'][$aid] = $ret;
+ $GLOBALS['cache_array']['admins']['password'][$aid] = $ret;
}
// Free result
@@ -1365,11 +1369,12 @@ function GET_ADMIN_HASH ($aid) {
}
//
function GET_ADMIN_LOGIN ($aid) {
- global $cacheArray;
+ // By default a non-existent login is returned (other functions react on this!)
$ret = "***";
- if (isset($cacheArray['admins']['login'][$aid])) {
+
+ if (isset($GLOBALS['cache_array']['admins']['login'][$aid])) {
// Get cache
- $ret = $cacheArray['admins']['login'][$aid];
+ $ret = $GLOBALS['cache_array']['admins']['login'][$aid];
// Update cache hits
incrementConfigEntry('cache_hits');
@@ -1382,7 +1387,7 @@ function GET_ADMIN_LOGIN ($aid) {
list($ret) = SQL_FETCHROW($result);
// Set cache
- $cacheArray['admins']['login'][$aid] = $ret;
+ $GLOBALS['cache_array']['admins']['login'][$aid] = $ret;
} // END - if
// Free memory
@@ -1392,12 +1397,12 @@ function GET_ADMIN_LOGIN ($aid) {
}
// Get email address of admin id
function GET_ADMIN_EMAIL ($aid) {
- global $cacheArray;
-
+ // By default an invalid emails is returned
$ret = "***";
- if (isset($cacheArray['admins']['email'][$aid])) {
+
+ if (isset($GLOBALS['cache_array']['admins']['email'][$aid])) {
// Get cache
- $ret = $cacheArray['admins']['email'][$aid];
+ $ret = $GLOBALS['cache_array']['admins']['email'][$aid];
// Update cache hits
incrementConfigEntry('cache_hits');
@@ -1410,7 +1415,7 @@ function GET_ADMIN_EMAIL ($aid) {
list($ret) = SQL_FETCHROW($result_aid);
// Set cache
- $cacheArray['admins']['email'][$aid] = $ret;
+ $GLOBALS['cache_array']['admins']['email'][$aid] = $ret;
} // END - if
// Free result
@@ -1422,12 +1427,12 @@ function GET_ADMIN_EMAIL ($aid) {
}
// Get default ACL of admin id
function GET_ADMIN_DEFAULT_ACL ($aid) {
- global $cacheArray;
-
+ // By default an invalid ACL value is returned
$ret = "***";
- if (isset($cacheArray['admins']['def_acl'][$aid])) {
+
+ if (isset($GLOBALS['cache_array']['admins']['def_acl'][$aid])) {
// Use cache
- $ret = $cacheArray['admins']['def_acl'][$aid];
+ $ret = $GLOBALS['cache_array']['admins']['def_acl'][$aid];
// Update cache hits
incrementConfigEntry('cache_hits');
@@ -1440,7 +1445,7 @@ function GET_ADMIN_DEFAULT_ACL ($aid) {
list($ret) = SQL_FETCHROW($result_aid);
// Set cache
- $cacheArray['admins']['def_acl'][$aid] = $ret;
+ $GLOBALS['cache_array']['admins']['def_acl'][$aid] = $ret;
}
// Free result
@@ -1616,14 +1621,13 @@ function IS_DEMO () {
}
//
function LOAD_CONFIG ($no="0") {
- global $cacheArray;
$CFG_DUMMY = array();
// Check for cache extension, cache-array and if the requested configuration is in cache
- if ((is_array($cacheArray)) && (isset($cacheArray['config'][$no])) && (is_array($cacheArray['config'][$no]))) {
+ if ((is_array($GLOBALS['cache_array'])) && (isset($GLOBALS['cache_array']['config'][$no])) && (is_array($GLOBALS['cache_array']['config'][$no]))) {
// Load config from cache
- //* DEBUG: */ echo gettype($cacheArray['config'][$no])."
\n";
- foreach ($cacheArray['config'][$no] as $key => $value) {
+ //* DEBUG: */ echo gettype($GLOBALS['cache_array']['config'][$no])."
\n";
+ foreach ($GLOBALS['cache_array']['config'][$no] as $key => $value) {
$CFG_DUMMY[$key] = $value;
} // END - foreach
@@ -1631,7 +1635,7 @@ function LOAD_CONFIG ($no="0") {
if ((isset($CFG_DUMMY['cache_hits'])) && (EXT_IS_ACTIVE("cache"))) {
$CFG_DUMMY['cache_hits']++;
} // END - if
- } elseif ((!EXT_IS_ACTIVE("cache")) || (!isset($cacheArray['config'][$no]))) {
+ } elseif ((!EXT_IS_ACTIVE("cache")) || (!isset($GLOBALS['cache_array']['config'][$no]))) {
// Load config from DB
$result_config = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_config` WHERE config=%d LIMIT 1",
array(bigintval($no)), __FILE__, __LINE__);
@@ -1643,7 +1647,7 @@ function LOAD_CONFIG ($no="0") {
SQL_FREERESULT($result_config);
// Remember this config in the array
- $cacheArray['config'][$no] = $CFG_DUMMY;
+ $GLOBALS['cache_array']['config'][$no] = $CFG_DUMMY;
}
// Return config array
@@ -1695,10 +1699,8 @@ function SUB_POINTS ($subject, $uid, $points) {
// Update config entries
function UPDATE_CONFIG ($entries, $values, $updateMode="") {
- global $CSS;
-
// Do not update config in CSS mode
- if (($CSS == "1") || ($CSS == -1)) {
+ if (($GLOBALS['output_mode'] == "1") || ($GLOBALS['output_mode'] == -1)) {
return;
} // END - if