X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fsession-functions.php;h=9b9aa1f6d411a8bbc4daf6efe0f692da66f9624b;hb=ba48cd57aabc0e3ee47b19756c4035be129d85de;hp=5433011dc4517729f25d38d709d3c65b1e624eab;hpb=ae798f7e416793adf24a3b87024df1027e520ce2;p=mailer.git
diff --git a/inc/session-functions.php b/inc/session-functions.php
index 5433011dc4..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,64 +38,55 @@
// 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 set_session ($var, $value) {
+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."=".get_session($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
-function get_session ($var) {
+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
@@ -103,21 +94,21 @@ function get_session ($var) {
}
// Destroy user session
-function destroy_user_session () {
+function destroyUserSession () {
// Reset userid
setUserId(0);
// Remove all user data from session
- return ((set_session('userid', "")) && (set_session('u_hash', "")));
+ return ((setSession('userid', '')) && (setSession('u_hash', '')));
}
// Destroys the admin session
function destroyAdminSession ($destroy = true) {
// Kill maybe existing session variables including array elements
- set_session('admin_login', "");
- set_session('admin_md5' , "");
- set_session('admin_last' , "");
- set_session('admin_to' , "");
+ setSession('admin_login', '');
+ setSession('admin_md5' , '');
+ setSession('admin_last' , '');
+ setSession('admin_to' , '');
// Destroy session and return status
if ($destroy) {