Some more glitches fixed away...

[mailer.git] / inc / session.php

diff --git a/inc/session.php b/inc/session.php
index af8eb7c050f9aaec5fe282c789c8fdcf6c0cd142..7d609e44eeedfd985d77fc5440ee477cf55b11c8 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);
 }
@@ -47,6 +47,7 @@ if (($VIEW == 1) && ($_SERVER['PHP_SELF'])) return;
 
 // Start the session
 @session_start();
+global $PHPSESSID;
 $PHPSESSID = @session_id();
 
 // Store language code in cookie
@@ -56,7 +57,7 @@ set_session("mx_lang", $mx_lang);
 require_once(PATH."inc/load_extensions.php");
 
 // Check if refid is set
-if ((!empty($_GET['user'])) && ($CLICK == 1) && ($_SERVER['PHP_SELF'] == "click.php")) {
+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'])) {
@@ -82,8 +83,8 @@ if ((!empty($_GET['user'])) && ($CLICK == 1) && ($_SERVER['PHP_SELF'] == "click.
 // 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']);
-}
+       set_session('refid', $GLOBALS['refid']);
+} // END - if
 
 // Transfer userid from session and validate it
 if (isset($_SESSION['userid'])) {
@@ -91,11 +92,14 @@ if (isset($_SESSION['userid'])) {
        $GLOBALS['userid'] = bigintval($_SESSION['userid']);
 
        // Is it valid?
-       if (!IS_LOGGED_IN()) {
+       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'))) {
@@ -106,7 +110,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>");
 
 //