Should fix a missing config entry in install phase. Thanks to Piter01. :-)

[mailer.git] / inc / session.php

diff --git a/inc/session.php b/inc/session.php
index 7710e9bf6553a3f1629d824d1b17c893fc2bbb76..a4ed2cde4dffccf7fd6d42095537776a1d14673c 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,18 +45,25 @@ 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 (!empty($_CONFIG['session_save_path'])) {
+       // Please make sure this valid!
+       @session_save_path($_CONFIG['session_save_path']);
+} // END - if
+
 // Start the session
 @session_start();
+global $PHPSESSID;
 $PHPSESSID = @session_id();
 
-// Store language code in cookie
-set_session("mx_lang", $mx_lang);
-
 // Load extensions here
 require_once(PATH."inc/load_extensions.php");
 
+// Load language system
+require_once(PATH."inc/language.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'])) {
@@ -80,10 +87,10 @@ 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))) {
+if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((get_session('refid') == "0") && (isset($_CONFIG['def_refid'])) && ($_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'])) {
@@ -94,8 +101,11 @@ if (isset($_SESSION['userid'])) {
        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 +116,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>");
 
 //