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 306fd1cbf75cde5b984701552861d04977fd9885..7cf0c603734e7d0e5a45a7b55bb0bb2355348b64 100644 (file)
--- a/inc/session.php
+++ b/inc/session.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -45,47 +45,41 @@ if (empty($VIEW))  $VIEW  = 0;
 // Skip updating of cookies when viewing a banner
 if (($VIEW == 1) && ($_SERVER['PHP_SELF'])) return;
 
+// Set session save path if set
+if (getConfig('session_save_path') != "") {
+       // Please make sure this valid!
+       session_save_path(getConfig('session_save_path'));
+} // END - if
+
 // Start the session
-@session_start();
-$PHPSESSID = @session_id();
+session_start();
 
-// Store language code in cookie
-set_session("mx_lang", $mx_lang);
+// Load language system
+LOAD_INC_ONCE("inc/language.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']);
-}
+// Load extensions here
+LOAD_INC_ONCE("inc/load_extensions.php");
 
-if (!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;
-}
+// Determine and set referal id
+DETERMINE_REFID();
 
-// 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']);
-}
+// Transfer userid from session and validate it
+if (isset($_SESSION['userid'])) {
+       // Get it secured from session
+       $GLOBALS['userid'] = bigintval($_SESSION['userid']);
+
+       // Is it valid?
+       if (!IS_MEMBER()) {
+               // Then destroy the user id
+               destroy_user_session();
+
+               // Kill userid
+               $GLOBALS['userid'] = 0;
+       } // END - if
+} // 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);
@@ -93,7 +87,8 @@ if ((basename($_SERVER['PHP_SELF']) == "index.php") || (basename($_SERVER['PHP_S
                // Cookies rejected!
                define('__COOKIES', false);
        }
-}
+} // END - if
+
 //* DEBUG: */ print("<pre>".print_r($_SESSION, true)."</pre>");
 
 //