X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fsession-functions.php;h=f7d86451ed999498b2694b6fb08edea27a2ee1f6;hb=0fada672e2066043b76ed5d57f852f451a49a3a3;hp=735f634194ce190711377aab719df80ceab4a7a5;hpb=e995a896255f853ea731a602a6f4902878f16980;p=mailer.git

diff --git a/inc/session-functions.php b/inc/session-functions.php
index 735f634194..f7d86451ed 100644
--- a/inc/session-functions.php
+++ b/inc/session-functions.php
@@ -14,11 +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                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -45,10 +43,11 @@ 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);
+	$var   = trim(secureString($var));
+	$value = trim($value);
 
 	// Is the session variable set?
 	if (('' . $value . '' == '') && (isSessionVariableSet($var))) {
@@ -87,13 +86,13 @@ function setSession ($var, $value) {
 
 // Check wether a session variable is set
 function isSessionVariableSet ($var) {
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "var={$var}");
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'var=' . $var . ' set in session');
 	return (isset($GLOBALS['_SESSION'][$var]));
 }
 
 // Returns wether the value of the session variable or NULL if not set
 function getSession ($var) {
-	// Default is not found! ;-)
+	// Default is not found ;-)
 	$value = null;
 
 	// Is the variable there?
@@ -119,12 +118,12 @@ 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' , '');
+	setAdminId(0);
+	setAdminMd5('');
+	setAdminLast('');
 
-	// Destroy session and return status
-	if ($destroy) {
+	// Destroy session if requested and return status
+	if ($destroy === true) {
 		return session_destroy();
 	} // END - if