X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=1ea993612dcb38b6b5b5c3f8b491b4ed008c33f2;hp=da0aa7159611826a404838f107ab7fd70ba07e1f;hb=7ff28f7292939ad1a61b9b7a4e3398ff6310a3d0;hpb=5e5fba72f1686dc9ae819f545253f0d99b4ebcba
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index da0aa71596..1ea993612d 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -44,18 +44,14 @@ function ADD_MODULE_TITLE($mod)
global $cacheArray, $_CONFIG;
$name = ""; $result = false;
// Load title
- if (!mxchange_installing)
- {
- if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheArray['modules']['module'])) && (is_array($cacheArray['modules']['module'])) && (isset($cacheArray['modules']['module'][$mod])))
- {
+ if (!isBooleanConstantAndTrue('mxchange_installed')) {
+ 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 = $cacheArray['modules']['title'][$mod];
// Update cache hits
$_CONFIG['cache_hits']++;
- }
- else
- {
+ } else {
// Load from database
$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);
@@ -67,12 +63,10 @@ function ADD_MODULE_TITLE($mod)
$name = trim($name);
// Still no luck or empty title?
- if (empty($name))
- {
+ if (empty($name)) {
// No name found
$name = LANG_UNKNOWN_MODULE." (".$mod.")";
- if (SQL_NUMROWS($result) == 0)
- {
+ if (SQL_NUMROWS($result) == 0) {
// Add module to database
$dummy = CHECK_MODULE($mod);
}
@@ -104,7 +98,7 @@ function CHECK_MODULE($mod) {
$ret = "major";
// Check if script is installed if not return a "done" to prevent some errors
- if ((!mxchange_installed) || (mxchange_installing) || (!admin_registered)) return "done";
+ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (isBooleanConstantAndTrue('mxchange_installing')) || (!isBooleanConstantAndTrue('admin_registered'))) return "done";
// Check if cache is latest version
$locked = 'Y'; $hidden = 'N'; $admin = 'N'; $mem = 'N'; $found = false;
@@ -387,38 +381,33 @@ 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="")
+function IS_ADMIN ($admin="")
{
global $cacheArray, $_CONFIG;
$ret = false; $passCookie = ""; $valPass = "";
//* DEBUG: */ echo __LINE__."ADMIN:".$admin."
";
// If admin login is not given take current from cookies...
- if ((empty($admin)) && (!empty($_SESSION['admin_login'])) && (!empty($_SESSION['admin_md5'])))
- {
- $admin = SQL_ESCAPE($_SESSION['admin_login']); $passCookie = $_SESSION['admin_md5'];
+ if ((empty($admin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) {
+ $admin = SQL_ESCAPE(get_session('admin_login')); $passCookie = get_session('admin_md5');
}
//* DEBUG: */ echo __LINE__."ADMIN:".$admin."/".$passCookie."
";
// Search in array for entry
- if ((!empty($passCookie)) && (isset($cacheArray['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($cacheArray['admins']['password'][$admin]);
- }
- elseif (!empty($admin))
- {
+ } elseif (!empty($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__);
// Is he admin?
$passDB = "";
- if (SQL_NUMROWS($result) == 1)
- {
+ if (SQL_NUMROWS($result) == 1) {
// Admin login was found so let's load password from DB
list($passDB) = SQL_FETCHROW($result);
$valPass = generatePassString($passDB);
@@ -428,8 +417,7 @@ function IS_ADMIN($admin="")
SQL_FREERESULT($result);
}
- if (!empty($valPass))
- {
+ if (!empty($valPass)) {
// Check if password is valid
//* DEBUG: */ echo __LINE__."*".$valPass."/".$passCookie)."*
";
$ret = (($valPass == $passCookie) || (($valPass == "*FAILED*") && (!EXT_IS_ACTIVE("cache"))));
@@ -546,7 +534,7 @@ function IS_LOGGED_IN()
FIX_DELETED_COOKIES(array('userid', 'u_hash', 'lifetime'));
// Are cookies set?
- if ((!empty($GLOBALS['userid'])) && (!empty($_SESSION['u_hash'])) && (!empty($_SESSION['lifetime'])) && (defined('COOKIE_PATH')))
+ if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash')) && (isSessionVariableSet('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",
@@ -563,31 +551,26 @@ function IS_LOGGED_IN()
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."
".$_SESSION['u_hash']."
";
- if (($status == "CONFIRMED") && ($valPass == $_SESSION['u_hash']))
- {
+ //* DEBUG: */ echo $valPass."
".get_session('u_hash')."
";
+ if (($status == "CONFIRMED") && ($valPass == get_session('u_hash'))) {
// Account is confirmed and all cookie data is valid so he is definely logged in! :-)
$ret = true;
- }
- else
- {
+ } else {
// Maybe got locked etc.
//* DEBUG: */ echo __LINE__."!!!
";
- set_session("userid", "", time() - 3600, COOKIE_PATH);
- set_session("u_hash", "", time() - 3600, COOKIE_PATH);
- set_session("lifetime", "", time() - 3600, COOKIE_PATH);
+ set_session("userid", "");
+ set_session("u_hash", "");
+ set_session("lifetime", "");
// Remove array elements to prevent errors
unset($GLOBALS['userid']);
}
- }
- else
- {
+ } else {
// Cookie data is invalid!
//* DEBUG: */ echo __LINE__."***
";
- set_session("userid", "", time() - 3600, COOKIE_PATH);
- set_session("u_hash", "", time() - 3600, COOKIE_PATH);
- set_session("lifetime", "", time() - 3600, COOKIE_PATH);
+ set_session("userid", "");
+ set_session("u_hash", "");
+ set_session("lifetime", "");
// Remove array elements to prevent errors
unset($GLOBALS['userid']);
@@ -600,9 +583,9 @@ function IS_LOGGED_IN()
{
// Cookie data is invalid!
//* DEBUG: */ echo __LINE__."///
";
- set_session("userid", "", time() - 3600, COOKIE_PATH);
- set_session("u_hash", "", time() - 3600, COOKIE_PATH);
- set_session("lifetime", "", time() - 3600, COOKIE_PATH);
+ set_session("userid", "");
+ set_session("u_hash", "");
+ set_session("lifetime", "");
// Remove array elements to prevent errors
unset($GLOBALS['userid']);
@@ -615,16 +598,16 @@ function UPDATE_LOGIN_DATA ($UPDATE=true) {
if (!is_array($LAST)) $LAST = array();
// Are the required cookies set?
- if ((!isset($GLOBALS['userid'])) || (!isset($_SESSION['u_hash'])) || (!isset($_SESSION['lifetime']))) {
+ if ((!isset($GLOBALS['userid'])) || (!isSessionVariableSet('u_hash')) || (!isSessionVariableSet('lifetime'))) {
// Nope, then return here to caller function
return false;
} else {
// Secure user ID
- $GLOBALS['userid'] = bigintval($_SESSION['userid']);
+ $GLOBALS['userid'] = bigintval(get_session('userid'));
}
// Extract last online time (life) and how long is auto-login valid (time)
- $newl = time() + bigintval($_SESSION['lifetime']);
+ $newl = time() + bigintval(get_session('lifetime'));
// Recheck if logged in
if (!IS_LOGGED_IN()) return false;
@@ -639,7 +622,7 @@ function UPDATE_LOGIN_DATA ($UPDATE=true) {
// Maybe first login time?
if (empty($mod)) $mod = "login";
- 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)) {
+ if (set_session("userid", $GLOBALS['userid'], $newl, COOKIE_PATH) && set_session("u_hash", SQL_ESCAPE(get_session('u_hash')), $newl, COOKIE_PATH) && set_session("lifetime", bigintval(get_session('lifetime')), $newl, COOKIE_PATH)) {
// This will be displayed on welcome page! :-)
if (empty($LAST['module'])) {
$LAST['module'] = $mod; $LAST['online'] = $onl;
@@ -652,13 +635,11 @@ function UPDATE_LOGIN_DATA ($UPDATE=true) {
$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET last_module='%s', last_online=UNIX_TIMESTAMP() WHERE userid=%d LIMIT 1",
array($GLOBALS['what'], $GLOBALS['userid']), __FILE__, __LINE__);
}
- }
- else
- {
+ } else {
// Destroy session, we cannot update!
- set_session("userid", "", time() - 3600, COOKIE_PATH);
- set_session("u_hash", "", time() - 3600, COOKIE_PATH);
- set_session("lifetime", "", time() - 3600, COOKIE_PATH);
+ set_session("userid", "");
+ set_session("u_hash", "");
+ set_session("lifetime", "");
}
}
//
@@ -736,11 +717,11 @@ function SEND_MODE_MAILS($mod, $modes)
list($hashDB) = SQL_FETCHROW($result_main);
// Extract salt from cookie
- $salt = substr($_SESSION['u_hash'], 0, -40);
+ $salt = substr(get_session('u_hash'), 0, -40);
// Now let's compare passwords
$hash = generatePassString($hashDB);
- if (($hash == $_SESSION['u_hash']) || ($_POST['pass1'] == $_POST['pass2'])) {
+ if (($hash == get_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__);
@@ -1190,10 +1171,9 @@ function UPDATE_ONLINE_LIST($SID, $mod, $act, $wht)
// Is administrator
$ADMIN = 'Y';
}
- if (!empty($_SESSION['refid']))
- {
+ if (isSessionVariableSet('refid')) {
// Check cookie
- if ($_SESSION['refid'] > 0) $rid = $GLOBALS['refid'];
+ if (get_session('refid') > 0) $rid = $GLOBALS['refid'];
}
// Now Read data
@@ -1508,7 +1488,7 @@ function SUB_JACKPOT($points)
}
//
function IS_DEMO() {
- return ((EXT_IS_ACTIVE("demo")) && ($_SESSION['admin_login'] == "demo"));
+ return ((EXT_IS_ACTIVE("demo")) && (get_session('admin_login') == "demo"));
}
//
function LOAD_CONFIG($no="0")