Renamed function so it might be more understandable

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

diff --git a/inc/session-functions.php b/inc/session-functions.php
index 17eb30ed1d3ecf44c5e040970975aa50251fd70a..226cad91342fc000fc493412ac9e01470582469c 100644 (file)
--- a/inc/session-functions.php
+++ b/inc/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,7 +43,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);
@@ -54,12 +53,24 @@ function setSession ($var, $value) {
                // Remove the session
                //* 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);
                $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);
@@ -90,6 +101,7 @@ function getSession ($var) {
        } // END - if
 
        // Return the value
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $var . '=' . $value);
        return $value;
 }
 
@@ -105,9 +117,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) {