Fixes for stripped HTML tags, and false warnings in debug log

[mailer.git] / inc / session.php

diff --git a/inc/session.php b/inc/session.php
index d3fee5875a73773b35167ef5c355a9570a27c9c5..7cf0c603734e7d0e5a45a7b55bb0bb2355348b64 100644 (file)
--- a/inc/session.php
+++ b/inc/session.php
@@ -46,51 +46,22 @@ if (empty($VIEW))  $VIEW  = 0;
 if (($VIEW == 1) && ($_SERVER['PHP_SELF'])) return;
 
 // Set session save path if set
-if (!empty($_CONFIG['session_save_path'])) {
+if (getConfig('session_save_path') != "") {
        // Please make sure this valid!
-       @session_save_path($_CONFIG['session_save_path']);
+       session_save_path(getConfig('session_save_path'));
 } // END - if
 
 // Start the session
-@session_start();
-global $PHPSESSID;
-$PHPSESSID = @session_id();
-
-// Load extensions here
-require_once(PATH."inc/load_extensions.php");
+session_start();
 
 // Load language system
-require_once(PATH."inc/language.php");
+LOAD_INC_ONCE("inc/language.php");
 
-// Check if refid is set
-if ((!empty($_GET['user'])) && ($CLICK == 1) && (basename($_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']);
-} 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'])) {
-       // Get referral id from variable refid (so I hope this makes my script more compatible to other scripts)
-       $GLOBALS['refid'] = SQL_ESCAPE(strip_tags($_GET['refid']));
-} elseif (!empty($_GET['ref'])) {
-       // Set refid=ref (the referral link uses such variable)
-       $GLOBALS['refid'] = SQL_ESCAPE(strip_tags($_GET['ref']));
-} 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'] = bigintval($_CONFIG['def_refid']);
-} else {
-       // No default ID when sql_patches is not installed
-       $GLOBALS['refid'] = 0;
-}
+// Load extensions here
+LOAD_INC_ONCE("inc/load_extensions.php");
 
-// Set cookie when default refid > 0
-if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((get_session('refid') == "0") && ($_CONFIG['def_refid'] > 0))) {
-       // Set cookie
-       set_session('refid', $GLOBALS['refid']);
-} // END - if
+// Determine and set referal id
+DETERMINE_REFID();
 
 // Transfer userid from session and validate it
 if (isset($_SESSION['userid'])) {
@@ -108,7 +79,7 @@ if (isset($_SESSION['userid'])) {
 } // END - if
 
 // 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 ((basename($_SERVER['PHP_SELF']) == "index.php") || (basename($_SERVER['PHP_SELF']) == "modules.php") || (isInstalling())) {
        if (count($_SESSION) > 0) {
                // Session variables accepted!
                define('__COOKIES', true);