X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fsession.php;h=6999d8c9d7aeadd313ee27ef07adb8430fa6e2f8;hp=4d8c9d60137ca66d5d0aa316ed12391a94a37059;hb=0a7e0faba4feaf17432cbdcaf17eb7d2f3812a1e;hpb=302284be34ec6342a279566e1167837033c6fd62

diff --git a/inc/session.php b/inc/session.php
index 4d8c9d6013..6999d8c9d7 100644
--- a/inc/session.php
+++ b/inc/session.php
@@ -52,13 +52,14 @@ $PHPSESSID = @session_id();
 // Store language code in cookie
 set_session("mx_lang", $mx_lang);
 
+// Load extensions here
+require_once(PATH."inc/load_extensions.php");
+
 // Check if refid is set
 if ((!empty($_GET['user'])) && ($CLICK == 1) && ($_SERVER['PHP_SELF'] == "click.php")) {
 	// The variable user comes from the click-counter script click.php and we only accept this here
 	$GLOBALS['refid'] = bigintval($_GET['user']);
-}
-
-if (!empty($_POST['refid'])) {
+} elseif (!empty($_POST['refid'])) {
 	// Get referral id from variable refid (so I hope this makes my script more compatible to other scripts)
 	$GLOBALS['refid'] = SQL_ESCAPE(strip_tags($_POST['refid']));
 } elseif (!empty($_GET['refid'])) {
@@ -67,9 +68,9 @@ if (!empty($_POST['refid'])) {
 } elseif (!empty($_GET['ref'])) {
 	// Set refid=ref (the referral link uses such variable)
 	$GLOBALS['refid'] = SQL_ESCAPE(strip_tags($_GET['ref']));
-} elseif (!empty($_SESSION['refid'])) {
+} elseif (isSessionVariableSet('refid')) {
 	// Set session refid als global
-	$GLOBALS['refid'] = bigintval($_SESSION['refid']);
+	$GLOBALS['refid'] = bigintval(get_session('refid'));
 } elseif (GET_EXT_VERSION("sql_patches") != "") {
 	// Set default refid as refid in URL
 	$GLOBALS['refid'] = bigintval($_CONFIG['def_refid']);
@@ -79,13 +80,13 @@ if (!empty($_POST['refid'])) {
 }
 
 // Set cookie when default refid > 0
-if (empty($_SESSION['refid']) || (!empty($GLOBALS['refid'])) || (($_SESSION['refid'] == "0") && ($_CONFIG['def_refid'] > 0))) {
+if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((get_session('refid') == "0") && ($_CONFIG['def_refid'] > 0))) {
 	// Set cookie
 	set_session("refid", $GLOBALS['refid']);
 }
 
 // Test session if index.php or modules.php is loaded
-if ((basename($_SERVER['PHP_SELF']) == "index.php") || (basename($_SERVER['PHP_SELF']) == "modules.php") || (mxchange_installing)) {
+if ((basename($_SERVER['PHP_SELF']) == "index.php") || (basename($_SERVER['PHP_SELF']) == "modules.php") || (isBooleanConstantAndTrue('mxchange_installing'))) {
 	if (count($_SESSION) > 0) {
 		// Session variables accepted!
 		define('__COOKIES', true);