X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fsession.php;h=1849e2f9a8016f3e9d5729d232f2a0178e227a55;hb=6ab597cf6eeb82241f57ca7d13871338dbb9bcaa;hp=a1405c70812df977fc02df9140c5bf7c4300df86;hpb=fb7120ffa230b62b54895bcf95952e1cf30f8594;p=mailer.git

diff --git a/inc/session.php b/inc/session.php
index a1405c7081..1849e2f9a8 100644
--- 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                                      *
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -38,63 +37,27 @@
 
 // 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'));
+	exit();
 } // 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 ((isConfigEntrySet('session_save_path')) && (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 (!isSessionValid()) {
+	// Start the session
+	$GLOBALS['valid_session']  = session_start();
+	$GLOBALS['isSessionValid'] = TRUE;
 } // END - if
 
-//* DEBUG: */ print("<pre>".print_r($_SESSION, true)."</pre>");
+// Load language file(s)
+loadLanguageFile();
 
-//
+// [EOF]
 ?>