X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fsession.php;h=71e6eca53dd032accfae3f948e07d1aef4cb96f6;hb=16ec3c0b28ff8ac1b1e626cca9cc934433d2510f;hp=a1405c70812df977fc02df9140c5bf7c4300df86;hpb=fb7120ffa230b62b54895bcf95952e1cf30f8594;p=mailer.git

diff --git a/inc/session.php b/inc/session.php
index a1405c7081..71e6eca53d 100644
--- a/inc/session.php
+++ b/inc/session.php
@@ -17,7 +17,7 @@
  * 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 *
@@ -38,63 +38,44 @@
 
 // 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();
+// 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
 
-// Load language system
-LOAD_INC_ONCE("inc/language.php");
+// Is a session id there?
+if (session_id() == '') {
+	// Start the session
+	session_start();
+} // END - if
 
-// Load extensions here
-LOAD_INC_ONCE("inc/load_extensions.php");
+// Load language file(s)
+loadLanguageFile();
 
 // Determine and set referal id
-DETERMINE_REFID();
+determineReferalId();
 
 // Transfer userid from session and validate it
 if (isSessionVariableSet('userid')) {
 	// Get it secured from session
-	setUserId(GET_SESSION('userid'));
+	setUserId(getSession('userid'));
 
 	// Is it valid?
-	if (!IS_MEMBER()) {
+	if (!isMember()) {
 		// Then destroy the user id
-		destroy_user_session();
+		destroyUserSession();
 
 		// Kill userid
 		setUserId(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") || (isInstalling())) {
-	if (count($_SESSION) > 0) {
-		// Session variables accepted!
-		define('__COOKIES', true);
-	} else {
-		// Cookies rejected!
-		define('__COOKIES', false);
-	}
-} // END - if
-
-//* DEBUG: */ print("<pre>".print_r($_SESSION, true)."</pre>");
-
-//
+// [EOF]
 ?>