X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fsession-functions.php;h=9b9aa1f6d411a8bbc4daf6efe0f692da66f9624b;hb=5f2dc5ad7c29069b55f17400e6c1c63bb89f7286;hp=a2d1e8c22bc8b2f623b35ee4b26cd1f485c47c2d;hpb=7b0f17cd637e388049d2167811e4332cec1e979b;p=mailer.git
diff --git a/inc/session-functions.php b/inc/session-functions.php
index a2d1e8c22b..9b9aa1f6d4 100644
--- a/inc/session-functions.php
+++ b/inc/session-functions.php
@@ -17,7 +17,7 @@
* Needs to be in all Files and every File needs "svn propset *
* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder *
+ * Copyright (c) 2003 - 2009 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -38,45 +38,44 @@
// Some security stuff...
if (!defined('__SECURITY')) {
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
- require($INC);
+ die();
}
// Unset/set session variables
function setSession ($var, $value) {
// Abort in CSS mode here
- if ($GLOBALS['output_mode'] == 1) return true;
+ if (getOutputMode() == 1) return true;
// Trim value and session variable
$var = trim(SQL_ESCAPE($var)); $value = trim($value);
// Is the session variable set?
- if (("".$value."" == '') && (isSessionVariableSet($var))) {
+ if ((''.$value.'' == '') && (isSessionVariableSet($var))) {
// Remove the session
- //* DEBUG: */ echo "UNSET:".$var.'='.getSession($var)."
\n";
- unset($_SESSION[$var]);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UNSET:".$var.'='.getSession($var));
+ unset($GLOBALS['_SESSION'][$var]);
return session_unregister($var);
} elseif (("".$value."" != '') && (!isSessionVariableSet($var))) {
// Set session
- //* DEBUG: */ echo "SET:".$var.'='.$value."
\n";
- $_SESSION[$var] = $value;
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "SET:".$var.'='.$value);
+ $GLOBALS['_SESSION'][$var] = $value;
return session_register($var);
} elseif (!empty($value)) {
// Update session
- //* DEBUG: */ echo "UPDATE:".$var.'='.$value."
\n";
- $_SESSION[$var] = $value;
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UPDATE:".$var.'='.$value);
+ $GLOBALS['_SESSION'][$var] = $value;
return true;
}
// Ignored (but valid)
- //* DEBUG: */ echo "IGNORED:".$var.'='.$value."
\n";
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "IGNORED:".$var.'='.$value);
return true;
}
// Check wether a session variable is set
function isSessionVariableSet ($var) {
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."):var={$var}
\n";
- return (isset($_SESSION[$var]));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "var={$var}");
+ return (isset($GLOBALS['_SESSION'][$var]));
}
// Returns wether the value of the session variable or NULL if not set
@@ -84,18 +83,10 @@ function getSession ($var) {
// Default is not found! ;-)
$value = null;
- // Is the variable there or cached values?
- if (isset($GLOBALS['cache_array']['session'][$var])) {
- // Get cached value (skips a lot SQL_ESCAPE() calles!
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."): ".$var."-CACHE!
\n";
- $value = $GLOBALS['cache_array']['session'][$var];
- } elseif (isSessionVariableSet($var)) {
+ // Is the variable there?
+ if (isSessionVariableSet($var)) {
// Then get it secured!
- //* DEBUG: */ print __FUNCTION__."(".__LINE__."): ".$var."-RESOLVE!
\n";
- $value = SQL_ESCAPE($_SESSION[$var]);
-
- // Cache the value
- $GLOBALS['cache_array']['session'][$var] = $value;
+ $value = SQL_ESCAPE($GLOBALS['_SESSION'][$var]);
} // END - if
// Return the value