X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fsession-functions.php;h=5421c1f013a55d2512f3c137b3675a4d17e51bb4;hb=33a76a20bc94ffe95e9f13906eb7dc5cf354948d;hp=cea985df62ed930f8e1859b54832534b3c5cc836;hpb=7052cc3bd3ca07281078acbbce6ce595d753def1;p=mailer.git

diff --git a/inc/session-functions.php b/inc/session-functions.php
index cea985df62..5421c1f013 100644
--- a/inc/session-functions.php
+++ b/inc/session-functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -66,7 +66,7 @@ function setSession ($var, $value) {
 	} elseif (('' . $value . '' != '') && (!isSessionVariableSet($var))) {
 		// Set session
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SET:' . $var . '=' . $value);
-		$GLOBALS['_SESSION'][$var] =  $value;
+		$GLOBALS['_SESSION'][$var] = $value;
 		if (isPhpVersionEqualNewer('5.3.0')) {
 			// session_unregister() is deprecated as of 5.3.0
 			return TRUE;
@@ -100,7 +100,7 @@ function getSession ($var) {
 	// Is the variable there?
 	if (isSessionVariableSet($var)) {
 		// Then  get it secured!
-		$value = SQL_ESCAPE($GLOBALS['_SESSION'][$var]);
+		$value = sqlEscapeString($GLOBALS['_SESSION'][$var]);
 	} // END - if
 
 	// Return the value
@@ -133,7 +133,7 @@ function destroyAdminSession ($destroy = FALSE) {
 	// Kill maybe existing session variables including array elements
 	setAdminId(0);
 	setAdminMd5('');
-	setAdminLast('');
+	setAdminLast(0);
 
 	// Set cache to FALSE
 	$GLOBALS['isAdmin'] = FALSE;
@@ -143,21 +143,21 @@ function destroyAdminSession ($destroy = FALSE) {
 		return destroySession();
 	} // END - if
 
-	// All fine if we shall not really destroy the session
+	// 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']);
+	unset($GLOBALS['isValidSession']);
 
 	// Destroy session
 	return session_destroy();
 }
 
 // Checks whether the session is valid
-function isSessionValid () {
+function isValidSession () {
 	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Then determine it
@@ -168,5 +168,20 @@ function isSessionValid () {
 	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]
 ?>