X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fsession-functions.php;h=226cad91342fc000fc493412ac9e01470582469c;hb=277625bc84b603b2e0b81a7d78e8c4c8bf340385;hp=9b9aa1f6d411a8bbc4daf6efe0f692da66f9624b;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e;p=mailer.git

diff --git a/inc/session-functions.php b/inc/session-functions.php
index 9b9aa1f6d4..226cad9134 100644
--- a/inc/session-functions.php
+++ b/inc/session-functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 02/28/2009 *
- * ===============                              Last change: 02/28/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 02/28/2009 *
+ * ===================                          Last change: 02/28/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : session-functions.php                            *
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * 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,31 +43,43 @@ 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(SQL_ESCAPE($var)); $value = trim($value);
+	$var = trim(secureString($var)); $value = trim($value);
 
 	// Is the session variable set?
-	if ((''.$value.'' == '') && (isSessionVariableSet($var))) {
+	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);
-	} elseif (("".$value."" != '') && (!isSessionVariableSet($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;
 	}
 
 	// Ignored (but valid)
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "IGNORED:".$var.'='.$value);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'IGNORED:' . $var . '=' . $value);
 	return true;
 }
 
@@ -90,13 +101,14 @@ function getSession ($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', '')));
@@ -105,10 +117,9 @@ function destroyUserSession () {
 // 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_to'   , '');
+	setSession('admin_id'  , '');
+	setSession('admin_md5' , '');
+	setSession('admin_last', '');
 
 	// Destroy session and return status
 	if ($destroy) {