X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fsession-functions.php;h=4bd00ec494081aacd42a3b1fc5b20bdf67c0737b;hb=1956cbb7d551931f010097b2a22f184af4ac4616;hp=d1ee9408d96402b18ede928eaa0473e93b219693;hpb=c3f2beb3f1d47c9593d262d7f5dac47640b4aa52;p=mailer.git

diff --git a/inc/session-functions.php b/inc/session-functions.php
index d1ee9408d9..4bd00ec494 100644
--- a/inc/session-functions.php
+++ b/inc/session-functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,7 +45,7 @@ if (!defined('__SECURITY')) {
 // Unset/set session variables
 function setSession ($var, $value) {
 	// Abort in CSS mode here
-	if (getOutputMode() == 1) return true;
+	if (isCssOutputMode()) return true;
 
 	// Trim value and session variable
 	$var = trim(secureString($var)); $value = trim($value);
@@ -52,17 +53,29 @@ function setSession ($var, $value) {
 	// Is the session variable set?
 	if (('' . $value . '' == '') && (isSessionVariableSet($var))) {
 		// Remove the session
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UNSET:' . $var . '=' . getSession($var));
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UNSET:' . $var . '=' . getSession($var));
 		unset($GLOBALS['_SESSION'][$var]);
-		return session_unregister($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: */ logDebugMessage(__FUNCTION__, __LINE__, 'SET:' . $var . '=' . $value);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SET:' . $var . '=' . $value);
 		$GLOBALS['_SESSION'][$var] =  $value;
-		return session_register($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_register($var);
+		}
 	} elseif (!empty($value)) {
 		// Update session
-		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UPDATE:' . $var . '=' . $value);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UPDATE:' . $var . '=' . $value);
 		$GLOBALS['_SESSION'][$var] = $value;
 		return true;
 	}
@@ -90,6 +103,7 @@ function getSession ($var) {
 	} // END - if
 
 	// Return the value
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $var . '=' . $value);
 	return $value;
 }
 
@@ -105,9 +119,9 @@ function destroyMemberSession () {
 // Destroys the admin session
 function destroyAdminSession ($destroy = true) {
 	// Kill maybe existing session variables including array elements
-	setSession('admin_login', '');
-	setSession('admin_md5'  , '');
-	setSession('admin_last' , '');
+	setSession('admin_id'  , '');
+	setSession('admin_md5' , '');
+	setSession('admin_last', '');
 
 	// Destroy session and return status
 	if ($destroy) {