X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fsession-functions.php;h=ebee5cf6f13ce77965ae8a9b48b57d943bf2ff9d;hp=a3c2596626dd129e320fbdf9715b2ab884d59f46;hb=74b7fbc5030bb2938a9859020876da63e6d15c0b;hpb=452578b5bf17d14099ee44956deb4e4dc0832874
diff --git a/inc/session-functions.php b/inc/session-functions.php
index a3c2596626..ebee5cf6f1 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 (isPhpVersionEqualNewer('5.3.0')) {
+ // session_unregister() is deprecated as of 5.3.0
+ return TRUE;
+ } else {
+ // PHP version < 5.3.0
+ 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 (isPhpVersionEqualNewer('5.3.0')) {
+ // session_unregister() is deprecated as of 5.3.0
+ return TRUE;
+ } else {
+ // PHP version < 5.3.0
+ return session_register($var);
+ }
} elseif (!empty($value)) {
// Update session
- //* DEBUG: */ echo "UPDATE:".$var."=".$value."
\n";
- $_SESSION[$var] = $value;
- return true;
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UPDATE:' . $var . '=' . $value);
+ $GLOBALS['_SESSION'][$var] = $value;
+ return TRUE;
}
// Ignored (but valid)
- //* DEBUG: */ echo "IGNORED:".$var."=".$value."
\n";
- return true;
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'IGNORED:' . $var . '=' . $value);
+ return TRUE;
}
-// Check wether a session variable is set
+// Check whether a session variable is set
function isSessionVariableSet ($var) {
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."):var={$var}
\n";
- return (isset($_SESSION[$var]));
+ // Warning: DO NOT call logDebugMessage() from here, this will cause an endless loop
+ return (isset($GLOBALS['_SESSION'][$var]));
}
-// Returns wether the value of the session variable or NULL if not set
-function get_session ($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)) {
- // Then get it secured!
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."): ".$var."-RESOLVE!
\n";
- $value = SQL_ESCAPE($_SESSION[$var]);
+// Returns whether the value of the session variable or NULL if not set
+function getSession ($var) {
+ // Default is not found ;-)
+ $value = NULL;
- // Cache the value
- $GLOBALS['cache_array']['session'][$var] = $value;
+ // Is the variable there?
+ if (isSessionVariableSet($var)) {
+ // Then get it secured!
+ $value = SQL_ESCAPE($GLOBALS['_SESSION'][$var]);
} // END - if
// Return the value
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $var . '=' . $value);
return $value;
}
+// Get whole session array
+function getSessionArray () {
+ // Simply return it
+ return $GLOBALS['_SESSION'];
+}
+
// Destroy user session
-function destroy_user_session () {
+function destroyMemberSession ($destroy = FALSE) {
// Reset userid
- setUserId(0);
+ initMemberId();
// Remove all user data from session
- return ((set_session('userid', "")) && (set_session('u_hash', "")));
+ if ($destroy === TRUE) {
+ // Destroy whole session
+ return destroySession();
+ } else {
+ return ((setSession('userid', '')) && (setSession('u_hash', '')));
+ }
}
// Destroys the admin session
-function destroyAdminSession ($destroy = true) {
+function destroyAdminSession ($destroy = FALSE) {
// Kill maybe existing session variables including array elements
- set_session('admin_login', "");
- set_session('admin_md5' , "");
- set_session('admin_last' , "");
- set_session('admin_to' , "");
-
- // Destroy session and return status
- if ($destroy) {
- return session_destroy();
+ setAdminId(0);
+ setAdminMd5('');
+ setAdminLast('');
+
+ // Set cache to FALSE
+ $GLOBALS['isAdmin'] = FALSE;
+
+ // Destroy session if requested and return status
+ if ($destroy === TRUE) {
+ return destroySession();
+ } // END - if
+
+ // All fine if the session shall not really be destroyed
+ return TRUE;
+}
+
+// Destroys session and resets some "caches"
+function destroySession () {
+ // Unset "cache"
+ unset($GLOBALS['isSessionValid']);
+
+ // Destroy session
+ return session_destroy();
+}
+
+// Checks whether the session is valid
+function isSessionValid () {
+ // Is there cache?
+ if (!isset($GLOBALS[__FUNCTION__])) {
+ // Then determine it
+ $GLOBALS[__FUNCTION__] = ((isset($GLOBALS['valid_session'])) && ($GLOBALS['valid_session'] === TRUE) && (isset($_COOKIE[session_name()])));
} // END - if
- // All fine if we shall not really destroy the session
- return true;
+ // Return cache
+ return $GLOBALS[__FUNCTION__];
+}
+
+// Checks whether all given session data is set
+function isSessionDataSet ($sessionData) {
+ // Default is set
+ $isset = TRUE;
+
+ // Check all
+ foreach ($sessionData as $key) {
+ // Is this element set?
+ $isset = (($isset) && (isSessionVariableSet($key)));
+ } // END - foreach
+
+ // Return result
+ return $isset;
}
// [EOF]