X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fsession-functions.php;h=735f634194ce190711377aab719df80ceab4a7a5;hb=24f355e26804fae4e62c74bffc48b3eba81f9c03;hp=495c36625f5aebd49d607012538dc3847f472a5a;hpb=5c2fa5bcdb71881440947473ddef3612d9a2f2e1;p=mailer.git
diff --git a/inc/session-functions.php b/inc/session-functions.php
index 495c36625f..735f634194 100644
--- a/inc/session-functions.php
+++ b/inc/session-functions.php
@@ -1,7 +1,7 @@
\n";
- unset($_SESSION[$var]);
- return session_unregister($var);
- } elseif (("".$value."" != '') && (!isSessionVariableSet($var))) {
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UNSET:' . $var . '=' . getSession($var));
+ unset($GLOBALS['_SESSION'][$var]);
+ if (phpversion() >= '5.3.1') {
+ // session_unregister() is deprecated as of 5.3.1
+ return true;
+ } else {
+ // PHP version < 5.3.1
+ return session_unregister($var);
+ }
+ } elseif (('' . $value . '' != '') && (!isSessionVariableSet($var))) {
// Set session
- //* DEBUG: */ echo "SET:".$var.'='.$value."
\n";
- $_SESSION[$var] = $value;
- return session_register($var);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SET:' . $var . '=' . $value);
+ $GLOBALS['_SESSION'][$var] = $value;
+ if (phpversion() >= '5.3.1') {
+ // session_unregister() is deprecated as of 5.3.1
+ return true;
+ } else {
+ // PHP version < 5.3.1
+ return session_register($var);
+ }
} elseif (!empty($value)) {
// Update session
- //* DEBUG: */ echo "UPDATE:".$var.'='.$value."
\n";
- $_SESSION[$var] = $value;
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UPDATE:' . $var . '=' . $value);
+ $GLOBALS['_SESSION'][$var] = $value;
return true;
}
// Ignored (but valid)
- //* DEBUG: */ echo "IGNORED:".$var.'='.$value."
\n";
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'IGNORED:' . $var . '=' . $value);
return true;
}
// Check wether a session variable is set
function isSessionVariableSet ($var) {
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."):var={$var}
\n";
- return (isset($_SESSION[$var]));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "var={$var}");
+ return (isset($GLOBALS['_SESSION'][$var]));
}
// Returns wether the value of the session variable or NULL if not set
@@ -84,28 +96,21 @@ function getSession ($var) {
// Default is not found! ;-)
$value = null;
- // Is the variable there or cached values?
- if (isset($GLOBALS['cache_array']['session'][$var])) {
- // Get cached value (skips a lot SQL_ESCAPE() calles!
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."): ".$var."-CACHE!
\n";
- $value = $GLOBALS['cache_array']['session'][$var];
- } elseif (isSessionVariableSet($var)) {
+ // Is the variable there?
+ if (isSessionVariableSet($var)) {
// Then get it secured!
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."): ".$var."-RESOLVE!
\n";
- $value = SQL_ESCAPE($_SESSION[$var]);
-
- // Cache the value
- $GLOBALS['cache_array']['session'][$var] = $value;
+ $value = SQL_ESCAPE($GLOBALS['_SESSION'][$var]);
} // END - if
// Return the value
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $var . '=' . $value);
return $value;
}
// Destroy user session
-function destroyUserSession () {
+function destroyMemberSession () {
// Reset userid
- setUserId(0);
+ initMemberId();
// Remove all user data from session
return ((setSession('userid', '')) && (setSession('u_hash', '')));
@@ -117,7 +122,6 @@ function destroyAdminSession ($destroy = true) {
setSession('admin_login', '');
setSession('admin_md5' , '');
setSession('admin_last' , '');
- setSession('admin_to' , '');
// Destroy session and return status
if ($destroy) {