Way more usage of EL code:

[mailer.git] / inc / session-functions.php

diff --git a/inc/session-functions.php b/inc/session-functions.php
index 4928f80f083a274e62e16d6d8c080b8570d7e105..f71f3e0796ce397b09ea685421ea66499b052321 100644 (file)
--- 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))) {
@@ -93,7 +92,7 @@ function isSessionVariableSet ($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_id'  , '');
-       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