Fixes for broken order page and themes

[mailer.git] / inc / session.php

diff --git a/inc/session.php b/inc/session.php
index af8eb7c050f9aaec5fe282c789c8fdcf6c0cd142..591cb1c4eea7cd076606943e592528ff1ecc8ae8 100644 (file)
--- a/inc/session.php
+++ b/inc/session.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Sitzungs-Management                              *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -32,82 +37,41 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
+if (!defined('__SECURITY')) {
+       die();
 }
 
-// Check if view.php nor click.php was called
-// If not set variables to default
-if (empty($CLICK)) $CLICK = 0;
-if (empty($VIEW))  $VIEW  = 0;
-
-// Skip updating of cookies when viewing a banner
-if (($VIEW == 1) && ($_SERVER['PHP_SELF'])) return;
-
-// Start the session
-@session_start();
-$PHPSESSID = @session_id();
+// 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
 
-// Store language code in cookie
-set_session("mx_lang", $mx_lang);
+if (session_id() == '') {
+       // Start the session
+       session_start();
+} // END - if
 
-// Load extensions here
-require_once(PATH."inc/load_extensions.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']);
-} 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 language file(s)
+loadLanguageFile();
 
-// 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']);
-}
+// Determine and set referal id
+determineReferalId();
 
 // Transfer userid from session and validate it
-if (isset($_SESSION['userid'])) {
+if (isSessionVariableSet('userid')) {
        // Get it secured from session
-       $GLOBALS['userid'] = bigintval($_SESSION['userid']);
+       setUserId(getSession('userid'));
 
        // Is it valid?
-       if (!IS_LOGGED_IN()) {
+       if (!isMember()) {
                // Then destroy the user id
-               destroy_user_session();
-       } // END - if
-}
+               destroyUserSession();
 
-// 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 {
-               // Cookies rejected!
-               define('__COOKIES', false);
-       }
-}
-//* DEBUG: */ print("<pre>".print_r($_SESSION, true)."</pre>");
+               // Kill userid
+               setUserId(0);
+       } // END - if
+} // END - if
 
-//
+// [EOF]
 ?>