//
function ADD_MODULE_TITLE($mod)
{
- global $MODULES, $_CONFIG;
+ global $cacheArray, $_CONFIG;
$name = ""; $result = false;
// Load title
if (!mxchange_installing)
{
- if ((GET_EXT_VERSION("cache") >= "0.1.2") && (is_array($MODULES['module'])) && (isset($MODULES['module'][$mod])))
+ if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheArray['modules']['module'])) && (is_array($cacheArray['modules']['module'])) && (isset($cacheArray['modules']['module'][$mod])))
{
// Load from cache
- $name = $MODULES['title'][$mod];
+ $name = $cacheArray['modules']['title'][$mod];
// Update cache hits
$_CONFIG['cache_hits']++;
// Check validity of a given module name (no file extension)
function CHECK_MODULE($mod) {
// We need them now here...
- global $MODULES, $_CONFIG, $CACHE;
+ global $cacheArray, $_CONFIG, $cacheInstance;
// Filter module name (names with low chars and underlines are fine!)
$mod = preg_replace("/[^a-z_]/", "", $mod);
// 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_array($MODULES['module']))) {
+ if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheArray['modules']['module'])) && (is_array($cacheArray['modules']['module']))) {
// Is the module cached?
- if (isset($MODULES['locked'][$mod_chk])) {
+ if (isset($cacheArray['modules']['locked'][$mod_chk])) {
// Check cache
- $locked = $MODULES['locked'][$mod_chk];
- $hidden = $MODULES['hidden'][$mod_chk];
- $admin = $MODULES['admin_only'][$mod_chk];
- $mem = $MODULES['mem_only'][$mod_chk];
+ $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];
// Update cache hits
$_CONFIG['cache_hits']++;
// Destroy cache here
if (GET_EXT_VERSION("cache") >= "0.1.2") {
- if ($CACHE->cache_file("mod_reg", true)) $CACHE->cache_destroy();
- unset($MODULES);
+ if ($cacheInstance->cache_file("mod_reg", true)) $cacheInstance->cache_destroy();
+ unset($cacheArray['modules']);
}
// And reload data
}
break;
}
- $DUMMY = substr($search, 0, -4);
- $AND .= " AND action='".GET_ACTION($ACC_LVL, $DUMMY)."'";
+ $dummy = substr($search, 0, -4);
+ $AND .= " AND action='".GET_ACTION($ACC_LVL, $dummy)."'";
} elseif (($ACC_LVL == "sponsor") || ($ACC_LVL == "engine")) {
// Sponsor / engine menu
$type = "what";
// This patched function will reduce many SELECT queries for the specified or current admin login
function IS_ADMIN($admin="")
{
- global $_COOKIE, $ADMINS, $_CONFIG;
+ global $cacheArray, $_CONFIG;
$ret = false; $passCookie = ""; $valPass = "";
//* DEBUG: */ echo __LINE__."ADMIN:".$admin."<br />";
// If admin login is not given take current from cookies...
- if ((empty($admin)) && (!empty($_COOKIE['admin_login'])) && (!empty($_COOKIE['admin_md5'])))
+ if ((empty($admin)) && (!empty($_SESSION['admin_login'])) && (!empty($_SESSION['admin_md5'])))
{
- $admin = SQL_ESCAPE($_COOKIE['admin_login']); $passCookie = $_COOKIE['admin_md5'];
+ $admin = SQL_ESCAPE($_SESSION['admin_login']); $passCookie = $_SESSION['admin_md5'];
}
//* DEBUG: */ echo __LINE__."ADMIN:".$admin."/".$passCookie."<br />";
// Search in array for entry
- if ((!empty($passCookie)) && (isset($ADMINS['password'][$admin])) && (!empty($admin)))
+ if ((!empty($passCookie)) && (isset($cacheArray['admins']['password'][$admin])) && (!empty($admin)))
{
// Count cache hits
$_CONFIG['cache_hits']++;
// Login data is valid or not?
- $valPass = generatePassString($ADMINS['password'][$admin]);
+ $valPass = generatePassString($cacheArray['admins']['password'][$admin]);
}
elseif (!empty($admin))
{
//
function IS_LOGGED_IN()
{
- global $_COOKIE, $status, $LAST;
+ global $status, $LAST;
if (!is_array($LAST)) $LAST = array();
$ret = false;
FIX_DELETED_COOKIES(array('userid', 'u_hash', 'lifetime'));
// Are cookies set?
- if ((!empty($GLOBALS['userid'])) && (!empty($_COOKIE['u_hash'])) && (!empty($_COOKIE['lifetime'])) && (defined('COOKIE_PATH')))
+ if ((!empty($GLOBALS['userid'])) && (!empty($_SESSION['u_hash'])) && (!empty($_SESSION['lifetime'])) && (defined('COOKIE_PATH')))
{
// Cookies are set with values, but are they valid?
$result = SQL_QUERY_ESC("SELECT password, status, last_module, last_online FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
if ((!empty($mod)) && (empty($LAST['module']))) { $LAST['module'] = $mod; $LAST['online'] = $onl; }
// So did we now have valid data and an unlocked user?
- //* DEBUG: */ echo $valPass."<br>".$_COOKIE['u_hash']."<br>";
- if (($status == "CONFIRMED") && ($valPass == $_COOKIE['u_hash']))
+ //* DEBUG: */ echo $valPass."<br>".$_SESSION['u_hash']."<br>";
+ if (($status == "CONFIRMED") && ($valPass == $_SESSION['u_hash']))
{
// Account is confirmed and all cookie data is valid so he is definely logged in! :-)
$ret = true;
{
// Maybe got locked etc.
//* DEBUG: */ echo __LINE__."!!!<br>";
- @setcookie("userid", "", time() - 3600, COOKIE_PATH);
- @setcookie("u_hash", "", time() - 3600, COOKIE_PATH);
- @setcookie("lifetime", "0", time() - 3600, COOKIE_PATH);
+ set_session("userid", "", time() - 3600, COOKIE_PATH);
+ set_session("u_hash", "", time() - 3600, COOKIE_PATH);
+ set_session("lifetime", "", time() - 3600, COOKIE_PATH);
// Remove array elements to prevent errors
unset($GLOBALS['userid']);
- unset($_COOKIE['u_hash']);
- unset($_COOKIE['lifetime']);
}
}
else
{
// Cookie data is invalid!
//* DEBUG: */ echo __LINE__."***<br>";
- @setcookie("userid", "", time() - 3600, COOKIE_PATH);
- @setcookie("u_hash", "", time() - 3600, COOKIE_PATH);
- @setcookie("lifetime", "0", time() - 3600, COOKIE_PATH);
+ set_session("userid", "", time() - 3600, COOKIE_PATH);
+ set_session("u_hash", "", time() - 3600, COOKIE_PATH);
+ set_session("lifetime", "", time() - 3600, COOKIE_PATH);
// Remove array elements to prevent errors
unset($GLOBALS['userid']);
- unset($_COOKIE['u_hash']);
- unset($_COOKIE['lifetime']);
}
// Free memory
{
// Cookie data is invalid!
//* DEBUG: */ echo __LINE__."///<br>";
- @setcookie("userid", "", time() - 3600, COOKIE_PATH);
- @setcookie("u_hash", "", time() - 3600, COOKIE_PATH);
- @setcookie("lifetime", "0", time() - 3600, COOKIE_PATH);
+ set_session("userid", "", time() - 3600, COOKIE_PATH);
+ set_session("u_hash", "", time() - 3600, COOKIE_PATH);
+ set_session("lifetime", "", time() - 3600, COOKIE_PATH);
// Remove array elements to prevent errors
unset($GLOBALS['userid']);
- unset($_COOKIE['u_hash']);
- unset($_COOKIE['lifetime']);
}
return $ret;
}
if (!is_array($LAST)) $LAST = array();
// Are the required cookies set?
- if ((!isset($GLOBALS['userid'])) || (!isset($_COOKIE['u_hash'])) || (!isset($_COOKIE['lifetime']))) {
+ if ((!isset($GLOBALS['userid'])) || (!isset($_SESSION['u_hash'])) || (!isset($_SESSION['lifetime']))) {
// Nope, then return here to caller function
return false;
} else {
// Secure user ID
- $GLOBALS['userid'] = bigintval($_COOKIE['userid']);
+ $GLOBALS['userid'] = bigintval($_SESSION['userid']);
}
// Extract last online time (life) and how long is auto-login valid (time)
- $newl = time() + bigintval($_COOKIE['lifetime']);
+ $newl = time() + bigintval($_SESSION['lifetime']);
// Recheck if logged in
if (!IS_LOGGED_IN()) return false;
// Maybe first login time?
if (empty($mod)) $mod = "login";
- if (@setcookie("userid", $GLOBALS['userid'], $newl, COOKIE_PATH) && @setcookie("u_hash", SQL_ESCAPE($_COOKIE['u_hash']), $newl, COOKIE_PATH) && @setcookie("lifetime", bigintval($_COOKIE['lifetime']), $newl, COOKIE_PATH)) {
+ if (set_session("userid", $GLOBALS['userid'], $newl, COOKIE_PATH) && set_session("u_hash", SQL_ESCAPE($_SESSION['u_hash']), $newl, COOKIE_PATH) && set_session("lifetime", bigintval($_SESSION['lifetime']), $newl, COOKIE_PATH)) {
// This will be displayed on welcome page! :-)
if (empty($LAST['module'])) {
$LAST['module'] = $mod; $LAST['online'] = $onl;
else
{
// Destroy session, we cannot update!
- @setcookie("userid", "", time() - 3600, COOKIE_PATH);
- @setcookie("u_hash", "", time() - 3600, COOKIE_PATH);
- @setcookie("lifetime", "0", time() - 3600, COOKIE_PATH);
+ set_session("userid", "", time() - 3600, COOKIE_PATH);
+ set_session("u_hash", "", time() - 3600, COOKIE_PATH);
+ set_session("lifetime", "", time() - 3600, COOKIE_PATH);
}
}
//
list($hashDB) = SQL_FETCHROW($result_main);
// Extract salt from cookie
- $salt = substr($_COOKIE['u_hash'], 0, -40);
+ $salt = substr($_SESSION['u_hash'], 0, -40);
// Now let's compare passwords
$hash = generatePassString($hashDB);
- if (($hash == $_COOKIE['u_hash']) || ($_POST['pass1'] == $_POST['pass2'])) {
+ if (($hash == $_SESSION['u_hash']) || ($_POST['pass1'] == $_POST['pass2'])) {
// Load user's data
$result = SQL_QUERY_ESC("SELECT sex, surname, family, street_nr, country, zip, city, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d AND password='%s' LIMIT 1",
array($GLOBALS['userid'], $hashDB), __FILE__, __LINE__);
//
function UPDATE_REF_COUNTER($uid)
{
- global $REF_LVL, $link, $CACHE;
+ global $REF_LVL, $link, $cacheInstance;
// Make it sure referral level zero (member him-/herself) is at least selected
if (empty($REF_LVL)) $REF_LVL = "0";
elseif ((($ref == $uid) || ($ref == 0)) && (GET_EXT_VERSION("cache") >= "0.1.2"))
{
// Remove cache here
- if ($CACHE->cache_file("refsystem", true)) $CACHE->cache_destroy();
+ if ($cacheInstance->cache_file("refsystem", true)) $cacheInstance->cache_destroy();
}
}
//
// Is administrator
$ADMIN = 'Y';
}
- if (!empty($_COOKIE['refid']))
+ if (!empty($_SESSION['refid']))
{
// Check cookie
- if ($_COOKIE['refid'] > 0) $rid = $GLOBALS['refid'];
+ if ($_SESSION['refid'] > 0) $rid = $GLOBALS['refid'];
}
// Now Read data
}
// Purge old entries
- $TIMEOUT = time() - $_CONFIG['online_timeout'];
- $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_online WHERE timestamp <= %d",
- array($TIMEOUT), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_online WHERE timestamp <= (UNIX_TIMESTAMP() - %d)",
+ array($_CONFIG['online_timeout']), __FILE__, __LINE__);
}
// OBSULETE: Sends out mail to all administrators
function SEND_ADMIN_EMAILS($subj, $msg)
// Get ID number from administrator's login name
function GET_ADMIN_ID($login)
{
- global $ADMINS;
+ global $cacheArray;
$ret = "-1";
- if (!empty($ADMINS['aid'][$login]))
+ if (!empty($cacheArray['admins']['aid'][$login]))
{
// Check cache
- $ret = $ADMINS['aid'][$login];
+ $ret = $cacheArray['admins']['aid'][$login];
if (empty($ret)) $ret = "-1";
}
else
// Get password hash from administrator's login name
function GET_ADMIN_HASH($login)
{
- global $ADMINS;
+ global $cacheArray;
$ret = "-1";
- if (!empty($ADMINS['password'][$login]))
+ if (!empty($cacheArray['admins']['password'][$login]))
{
// Check cache
- $ret = $ADMINS['password'][$login];
+ $ret = $cacheArray['admins']['password'][$login];
if (empty($ret)) $ret = "-1";
}
else
//
function GET_ADMIN_LOGIN($aid)
{
- global $ADMINS;
+ global $cacheArray;
$ret = "***";
- if (!empty($ADMINS['login']['aid']))
+ if (!empty($cacheArray['admins']['login']['aid']))
{
// Check cache
- if (!empty($ADMINS['login'][$aid])) $ret = $ADMINS['login'][$aid];
+ if (!empty($cacheArray['admins']['login'][$aid])) $ret = $cacheArray['admins']['login'][$aid];
if (empty($ret)) $ret = "***";
}
else
$SQLs = array(
"UPDATE "._MYSQL_PREFIX."_mod_reg SET locked='N', hidden='N', mem_only='Y' WHERE module='order' LIMIT 1",
"UPDATE "._MYSQL_PREFIX."_member_menu SET visible='Y', locked='N' WHERE what='order' OR what='unconfirmed' LIMIT 2",
- "UPDATE "._MYSQL_PREFIX."_config SET activate_xchange='0' WHERE config='0' LIMIT 1"
+ "UPDATE "._MYSQL_PREFIX."_config SET activate_xchange='0' WHERE config=0 LIMIT 1"
);
// Run SQLs
}
}
//
-function IS_DEMO()
-{
- global $_COOKIE;
- return ((EXT_IS_ACTIVE("demo")) && ($_COOKIE['admin_login'] == "demo"));
+function IS_DEMO() {
+ return ((EXT_IS_ACTIVE("demo")) && ($_SESSION['admin_login'] == "demo"));
}
//
function LOAD_CONFIG($no="0")
{
- global $CFG_CACHE, $_CONFIG;
- $CFG_DUMMY = false;
+ global $cacheArray;
+ $CFG_DUMMY = array();
+
// Check for cache extension, cache-array and if the requested configuration is in cache
- if ((is_array($CFG_CACHE)) && (isset($CFG_CACHE['config'][$no])))
- {
+ if ((is_array($cacheArray)) && (isset($cacheArray['config'][$no])) && (is_array($cacheArray['config'][$no]))) {
// Load config from cache
- $CFG_DUMMY = array();
- foreach ($CFG_CACHE as $element=>$cfgs)
- {
- $CFG_DUMMY[$element] = $cfgs[$no];
+ //* DEBUG: */ echo gettype($cacheArray['config'][$no])."<br />\n";
+ foreach ($cacheArray['config'][$no] as $key=>$value) {
+ $CFG_DUMMY[$key] = $value;
}
// Count cache hits
- $_CONFIG['cache_hits']++;
- }
- else
- {
+ $CFG_DUMMY['cache_hits']++;
+ } else {
// Load config from DB
- $result_config = SQL_QUERY_ESC("SELECT * FROM "._MYSQL_PREFIX."_config WHERE config='%d' LIMIT 1",
- array(bigintval($no)), __FILE__, __LINE__);
+ $result_config = SQL_QUERY_ESC("SELECT * FROM "._MYSQL_PREFIX."_config WHERE config=%d LIMIT 1",
+ array(bigintval($no)), __FILE__, __LINE__);
+
+ // Get config from database
$CFG_DUMMY = SQL_FETCHARRAY($result_config);
+
+ // Free result
SQL_FREERESULT($result_config);
+
+ // Remember this config in the array
+ $cacheArray['config'][$no] = $CFG_DUMMY;
}
// Return config array
//
function MODULE_HAS_MENU($mod)
{
- global $EXTENSIONS, $MODULES, $_CONFIG;
+ global $cacheArray, $_CONFIG;
// All is false by default
$ret = false;
if (GET_EXT_VERSION("cache") >= "0.1.2")
{
- if (isset($MODULES['has_menu'][$mod]))
+ if (isset($cacheArray['modules']['has_menu'][$mod]))
{
// Check module cache and count hit
- if ($MODULES['has_menu'][$mod] == 'Y') $ret = true;
+ if ($cacheArray['modules']['has_menu'][$mod] == 'Y') $ret = true;
$_CONFIG['cache_hits']++;
}
- elseif (isset($EXTENSIONS['ext_menu'][$mod]))
+ elseif (isset($cacheArray['extensions']['ext_menu'][$mod]))
{
// Check cache and count hit
- if ($EXTENSIONS['ext_menu'][$mod] == 'Y') $ret = true;
+ if ($cacheArray['extensions']['ext_menu'][$mod] == 'Y') $ret = true;
$_CONFIG['cache_hits']++;
}
}
projects / mailer.git / blobdiff