mailer project continued:

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

diff --git a/inc/session-functions.php b/inc/session-functions.php
index 95d26340ba0295bcf7cb22d5c3a75bb6263e0804..706a483c1c71f8e841a26ea005427ed2b524a99a 100644 (file)
--- 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 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -38,12 +38,14 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
        die();
-}
+} // END - if
 
 // Unset/set session variables
 function setSession ($var, $value) {
        // Abort in CSS mode here
-       if (isCssOutputMode()) return true;
+       if (isCssOutputMode()) {
+               return true;
+       } // END - if
 
        // Trim value and session variable
        $var   = trim(secureString($var));
@@ -54,22 +56,22 @@ function setSession ($var, $value) {
                // Remove the session
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UNSET:' . $var . '=' . getSession($var));
                unset($GLOBALS['_SESSION'][$var]);
-               if (phpversion() >= '5.3.1') {
-                       // session_unregister() is deprecated as of 5.3.1
+               if (isPhpVersionEqualNewer('5.3.0')) {
+                       // session_unregister() is deprecated as of 5.3.0
                        return true;
                } else {
-                       // PHP version < 5.3.1
+                       // 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;
-               if (phpversion() >= '5.3.1') {
-                       // session_unregister() is deprecated as of 5.3.1
+               if (isPhpVersionEqualNewer('5.3.0')) {
+                       // session_unregister() is deprecated as of 5.3.0
                        return true;
                } else {
-                       // PHP version < 5.3.1
+                       // PHP version < 5.3.0
                        return session_register($var);
                }
        } elseif (!empty($value)) {
@@ -84,13 +86,13 @@ 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 . ' set in session');
+       // 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;
@@ -106,6 +108,12 @@ function getSession ($var) {
        return $value;
 }
 
+// Get whole session array
+function getSessionArray () {
+       // Simply return it
+       return $GLOBALS['_SESSION'];
+}
+
 // Destroy user session
 function destroyMemberSession () {
        // Reset userid