X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fsession-functions.php;h=dc6c3ff8728f7d906250b2f601822c25a2e4020f;hb=c15eee48f9da1469cf3cdca3a48ba2d3c382a7c9;hp=f7d86451ed999498b2694b6fb08edea27a2ee1f6;hpb=98e44adab9035e30efe78181b76d78c6e13ba574;p=mailer.git

diff --git a/inc/session-functions.php b/inc/session-functions.php
index f7d86451ed..dc6c3ff872 100644
--- a/inc/session-functions.php
+++ b/inc/session-functions.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -38,12 +38,14 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-}
+} // END - if
 
 // Unset/set session variables
 function setSession ($var, $value) {
 	// Abort in CSS mode here
-	if (isCssOutputMode()) return true;
+	if (isCssOutputMode()) {
+		return true;
+	} // END - if
 
 	// Trim value and session variable
 	$var   = trim(secureString($var));
@@ -54,22 +56,22 @@ function setSession ($var, $value) {
 		// Remove the session
 		//* 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
+		if (isPhpVersionEqualNewer('5.3.0')) {
+			// session_unregister() is deprecated as of 5.3.0
 			return true;
 		} else {
-			// PHP version < 5.3.1
+			// PHP version < 5.3.0
 			return session_unregister($var);
 		}
 	} elseif (('' . $value . '' != '') && (!isSessionVariableSet($var))) {
 		// Set session
 		//* 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
+		if (isPhpVersionEqualNewer('5.3.0')) {
+			// session_unregister() is deprecated as of 5.3.0
 			return true;
 		} else {
-			// PHP version < 5.3.1
+			// PHP version < 5.3.0
 			return session_register($var);
 		}
 	} elseif (!empty($value)) {
@@ -84,16 +86,16 @@ function setSession ($var, $value) {
 	return true;
 }
 
-// Check wether a session variable is set
+// Check whether a session variable is set
 function isSessionVariableSet ($var) {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'var=' . $var . ' set in session');
+	// 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
+// Returns whether the value of the session variable or NULL if not set
 function getSession ($var) {
 	// Default is not found ;-)
-	$value = null;
+	$value = NULL;
 
 	// Is the variable there?
 	if (isSessionVariableSet($var)) {
@@ -106,13 +108,24 @@ function getSession ($var) {
 	return $value;
 }
 
+// Get whole session array
+function getSessionArray () {
+	// Simply return it
+	return $GLOBALS['_SESSION'];
+}
+
 // Destroy user session
-function destroyMemberSession () {
+function destroyMemberSession ($destroy = false) {
 	// Reset userid
 	initMemberId();
 
 	// Remove all user data from session
-	return ((setSession('userid', '')) && (setSession('u_hash', '')));
+	if ($destroy === true) {
+		// Destroy whole session
+		return session_destroy();
+	} else {
+		return ((setSession('userid', '')) && (setSession('u_hash', '')));
+	}
 }
 
 // Destroys the admin session