X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fsession.php;h=591cb1c4eea7cd076606943e592528ff1ecc8ae8;hb=57816b30385d5b3c3af2e2d8c8c3d353e8a06ce2;hp=d48a53441934e718a1f5621de945c718947550dc;hpb=7b0f17cd637e388049d2167811e4332cec1e979b;p=mailer.git

diff --git a/inc/session.php b/inc/session.php
index d48a534419..591cb1c4ee 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,8 +38,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+	die();
 }
 
 // Set session save path if set
@@ -48,25 +47,24 @@ if (getConfig('session_save_path') != '') {
 	session_save_path(getConfig('session_save_path'));
 } // END - if
 
-// Start the session
-session_start();
-
-// Load language system
-loadIncludeOnce('inc/language.php');
+if (session_id() == '') {
+	// Start the session
+	session_start();
+} // END - if
 
-// Load extensions here
-loadIncludeOnce('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
 		destroyUserSession();
 
@@ -75,18 +73,5 @@ if (isSessionVariableSet('userid')) {
 	} // 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]
 ?>