Rewrote 'we' word a little, rewrote mail order to use SQL_INSERTID() instead of anoth...

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

diff --git a/inc/session-functions.php b/inc/session-functions.php
index ce329769dce456e9cbb588edd375e40fe40398bd..706a483c1c71f8e841a26ea005427ed2b524a99a 100644 (file)
--- 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,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -39,27 +38,42 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 // Unset/set session variables
 function setSession ($var, $value) {
        // Abort in CSS mode here
-       if (getOutputMode() == 1) return true;
+       if (isCssOutputMode()) {
+               return true;
+       } // END - if
 
        // 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))) {
                // Remove the session
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UNSET:' . $var . '=' . getSession($var));
                unset($GLOBALS['_SESSION'][$var]);
-               return session_unregister($var);
+               if (isPhpVersionEqualNewer('5.3.0')) {
+                       // session_unregister() is deprecated as of 5.3.0
+                       return true;
+               } else {
+                       // PHP version < 5.3.0
+                       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 (isPhpVersionEqualNewer('5.3.0')) {
+                       // session_unregister() is deprecated as of 5.3.0
+                       return true;
+               } else {
+                       // PHP version < 5.3.0
+                       return session_register($var);
+               }
        } elseif (!empty($value)) {
                // Update session
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UPDATE:' . $var . '=' . $value);
@@ -72,16 +86,16 @@ function setSession ($var, $value) {
        return true;
 }
 
-// Check wether a session variable is set
+// Check whether a session variable is set
 function isSessionVariableSet ($var) {
-       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "var={$var}");
+       // Warning: DO NOT call logDebugMessage() from here, this will cause an endless loop
        return (isset($GLOBALS['_SESSION'][$var]));
 }
 
-// Returns wether the value of the session variable or NULL if not set
+// Returns whether the value of the session variable or NULL if not set
 function getSession ($var) {
-       // Default is not found! ;-)
-       $value = null;
+       // Default is not found ;-)
+       $value = NULL;
 
        // Is the variable there?
        if (isSessionVariableSet($var)) {
@@ -90,9 +104,16 @@ function getSession ($var) {
        } // END - if
 
        // Return the value
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $var . '=' . $value);
        return $value;
 }
 
+// Get whole session array
+function getSessionArray () {
+       // Simply return it
+       return $GLOBALS['_SESSION'];
+}
+
 // Destroy user session
 function destroyMemberSession () {
        // Reset userid
@@ -105,13 +126,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' , '');
-       setSession('admin_to'   , '');
+       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