X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=f6fbbb1cc6ccc1ce3d72d67d3ebb296802b37c9c;hp=30106b29732fc3060fd16093aff4da1ed3ce91fc;hb=0e899620c7a065952d6787c236fb2b33ae337d6a;hpb=121dafd40be4c4b3e41f37a943b86cf2cb48a224

diff --git a/inc/functions.php b/inc/functions.php
index 30106b2973..f6fbbb1cc6 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -638,15 +638,11 @@ function TRANSLATE_STATUS($status)
 	return $ret;
 }
 //
-function GET_LANGUAGE()
-{
-	if (!empty($_GET['mx_lang']))
-	{
+function GET_LANGUAGE() {
+	if (!empty($_GET['mx_lang'])) {
 		// Accept only first 2 chars
 		$lang = substr($_GET['mx_lang'], 0, 2);
-	}
-	 else
-	{
+	} else {
 		// Do nothing
 		$lang = "";
 	}
@@ -655,25 +651,20 @@ function GET_LANGUAGE()
 	$ret = DEFAULT_LANG;
 
 	// Check GET variable and cookie
-	if (!empty($lang))
-	{
+	if (!empty($lang)) {
 		// Check if main language file does exist
-		if (file_exists(PATH."inc/language/".$lang.".php"))
-		{
+		if (file_exists(PATH."inc/language/".$lang.".php")) {
 			// Okay found, so let's update cookies
 			SET_LANGUAGE($lang);
 		}
-	}
-	 elseif (!empty($_SESSION['mx_lang']))
-	{
+	} elseif (!isSessionVariableSet('mx_lang')) {
 		// Return stored value from cookie
-		$ret = $_SESSION['mx_lang'];
+		$ret = get_session('mx_lang');
 	}
 	return $ret;
 }
 //
-function SET_LANGUAGE($lang)
-{
+function SET_LANGUAGE($lang) {
 	global $_CONFIG;
 
 	// Accept only first 2 chars!
@@ -681,9 +672,6 @@ function SET_LANGUAGE($lang)
 
 	// Set cookie
 	set_session("mx_lang", $lang);
-
-	// Set array
-	$_SESSION['mx_lang'] = $lang;
 }
 //
 function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0")
@@ -699,11 +687,10 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0")
 	$HTTP_USER_AGENT  = getenv('HTTP_USER_AGENT');
 
 	$ADMIN = MAIN_TITLE;
-	if (!empty($_SESSION['admin_login']))
-	{
+	if (isSessionVariableSet('admin_login')) {
 		// Load Admin data
 		$result = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
-			array(SQL_ESCAPE($_SESSION['admin_login'])), __FILE__, __LINE__);
+			array(SQL_ESCAPE(get_session('admin_login'))), __FILE__, __LINE__);
 		list($ADMIN) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 	}
@@ -1221,12 +1208,12 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="")
 	$data   = $code.":".$uid.":".$DATA;
 
 	// Add more additional data
-	if (isset($_SESSION['u_hash']))         $data .= ":".$_SESSION['u_hash'];
-	if (isset($GLOBALS['userid']))         $data .= ":".$GLOBALS['userid'];
-	if (isset($_SESSION['lifetime']))       $data .= ":".$_SESSION['lifetime'];
-	if (isset($_SESSION['mxchange_theme'])) $data .= ":".$_SESSION['mxchange_theme'];
-	if (isset($_SESSION['mx_lang']))        $data .= ":".$_SESSION['mx_lang'];
-	if (isset($GLOBALS['refid']))          $data .= ":".$GLOBALS['refid'];
+	if (isSessionVariableSet('u_hash'))			$data .= ":".get_session('u_hash');
+	if (isset($GLOBALS['userid']))				$data .= ":".$GLOBALS['userid'];
+	if (isSessionVariableSet('lifetime'))		$data .= ":".get_session('lifetime');
+	if (isSessionVariableSet('mxchange_theme'))	$data .= ":".get_session('mxchange_theme');
+	if (isSessionVariableSet('mx_lang'))		$data .= ":".GET_LANGUAGE();
+	if (isset($GLOBALS['refid']))				$data .= ":".$GLOBALS['refid'];
 
 	// Calculate number for generating the code
 	$a = $code + _ADD - 1;
@@ -2036,8 +2023,8 @@ function FIX_DELETED_COOKIES ($cookies) {
 		// Then check all cookies if they are marked as deleted!
 		foreach ($cookies as $cookieName) {
 			// Is the cookie set to "deleted"?
-			if ((isset($_SESSION[$cookieName])) && ($_SESSION[$cookieName] == "deleted")) {
-				unset($_SESSION[$cookieName]);
+			if (get_session($cookieName) == "deleted") {
+				set_session($cookieName, "");
 			}
 		}
 	}
@@ -2095,12 +2082,12 @@ function set_session ($var, $value) {
 	$var = trim(SQL_ESCAPE($var)); $value = trim($value);
 
 	// Is the session variable set?
-	if (("".$value."" == "") && (isset($_SESSION[$var]))) {
+	if (("".$value."" == "") && (isSessionVariableSet($var))) {
 		// Remove the session
-		//* DEBUG: */ echo "UNSET:".$var."=".$_SESSION[$var]."<br />\n";
+		//* DEBUG: */ echo "UNSET:".$var."=".get_session($var)."<br />\n";
 		unset($_SESSION[$var]);
 		return session_unregister($var);
-	} elseif (("".$value."" != "") && (!isset($_SESSION[$var]))) {
+	} elseif (("".$value."" != "") && (!isSessionVariableSet($var))) {
 		// Set session
 		//* DEBUG: */ echo "SET:".$var."=".$value."<br />\n";
 		$_SESSION[$var] =  $value;
@@ -2120,6 +2107,28 @@ function isBooleanConstantAndTrue($constname) { // : Boolean
 	return($res);
 }
 
+// Check wether a session variable is set
+function isSessionVariableSet($var) {
+	return (isset($_SESSION[$var]));
+}
+
+// Returns wether the value of the session variable or NULL if not set
+function get_session($var) {
+	if (!isset($_SESSION)) session_start();
+
+	// Default is not found! ;-)
+	$value = null;
+
+	// Is the variable there?
+	if (isSessionVariableSet($var)) {
+		// Then  get it secured!
+		$value = SQL_ESCAPE($_SESSION[$var]);
+	}
+
+	// Return the value
+	return $value;
+}
+
 //
 //////////////////////////////////////////////
 //                                          //