X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fsession.php;h=aa22eacdc545458fc46da54dd343a9890c333e52;hb=da5c63bacddced77a951cbe7b223f314885a6c87;hp=3e3ec38bbaa51d417b28545bb9705098290efca9;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac;p=mailer.git

diff --git a/inc/session.php b/inc/session.php
index 3e3ec38bba..aa22eacdc5 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 - 2013 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,55 +37,27 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-}
-
-// 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]
 ?>