Reverted of changes in 1704, see ticket #160

[mailer.git] / inc / session.php

diff --git a/inc/session.php b/inc/session.php
index fd4c76aa85bec07a42b484d314727cd92ab99f45..dddced09072500fd9ee36f2aff970c23a1ce4bd3 100644 (file)
--- a/inc/session.php
+++ b/inc/session.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/16/2004 *
- * ===============                              Last change: 11/23/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/16/2004 *
+ * ===================                          Last change: 11/23/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : session.php                                      *
@@ -10,14 +10,15 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Sitzungs-Management                              *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
+ * $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                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,63 +39,29 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
-}
-
-// 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;
-
-// Set session save path if set
-if (getConfig('session_save_path') != "") {
-       // Please make sure this valid!
-       session_save_path(getConfig('session_save_path'));
+       die();
 } // END - if
 
-// Start the session
-session_start();
-
-// Load language system
-LOAD_INC_ONCE("inc/language.php");
-
-// Load extensions here
-LOAD_INC_ONCE("inc/load_extensions.php");
-
-// Determine and set referal id
-DETERMINE_REFID();
-
-// Transfer userid from session and validate it
-if (isSessionVariableSet('userid')) {
-       // Get it secured from session
-       setUserId(GET_SESSION('userid'));
-
-       // Is it valid?
-       if (!IS_MEMBER()) {
-               // Then destroy the user id
-               destroy_user_session();
-
-               // Kill userid
-               setUserId(0);
+// Is ext-sql_patches there and newer?
+if (isExtensionInstalledAndNewer('sql_patches', '0.5.3')) {
+       // 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
 } // 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") || (isInstalling())) {
-       if (count($_SESSION) > 0) {
-               // Session variables accepted!
-               define('__COOKIES', true);
-       } else {
-               // Cookies rejected!
-               define('__COOKIES', false);
-       }
+// Is a session id there?
+if (session_id() == '') {
+       // Start the session
+       $GLOBALS['valid_session'] = session_start();
 } // END - if
 
-//* DEBUG: */ print("<pre>".print_r($_SESSION, true)."</pre>");
+// Load language file(s)
+loadLanguageFile();
+
+// Determine and set referal id
+determineReferalId();
 
-//
+// [EOF]
 ?>