X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fsession.php;h=f3b02711625248d411212863a9e373eda9a167b8;hb=0e500eb441c95d3128835dfabab1de1f528caed2;hp=268c2d4715fe818e0a2669a7c54652dc2ba04d3d;hpb=b5912168d72ae511eb623c3d92540c82d31b93c5;p=mailer.git

diff --git a/inc/session.php b/inc/session.php
index 268c2d4715..f3b0271162 100644
--- a/inc/session.php
+++ b/inc/session.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
@@ -57,9 +56,7 @@ set_session("mx_lang", $mx_lang);
 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'])) {
@@ -68,36 +65,34 @@ 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'])) {
-	// Simply reset cookie
-	$GLOBALS['refid'] = bigintval($_SESSION['refid']);
-} elseif (GET_EXT_VERSION("sql_patches") != "") {
+} elseif (isSessionVariableSet('refid')) {
+	// Set session refid als global
+	$GLOBALS['refid'] = bigintval(get_session('refid'));
+} elseif (GET_EXT_VERSION("sql_patches") != '') {
 	// Set default refid as refid in URL
-	$GLOBALS['refid'] = $_CONFIG['def_refid'];
+	$GLOBALS['refid'] = bigintval($_CONFIG['def_refid']);
 } else {
 	// No default ID when sql_patches is not installed
 	$GLOBALS['refid'] = 0;
 }
 
 // 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 cookies if index.php or modules.php is loaded
-if ((basename($_SERVER['PHP_SELF']) == "index.php") || (basename($_SERVER['PHP_SELF']) == "modules.php") || (mxchange_installing))
-{
-	if (count($_SESSION) > 0)
-	{
-		// Cookies accepted!
+// Test session if index.php or modules.php is loaded
+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);
-	}
-	 else
-	{
+	} else {
 		// Cookies rejected!
 		define('__COOKIES', false);
 	}
 }
+//* DEBUG: */ print("<pre>".print_r($_SESSION, true)."</pre>");
+
 //
 ?>