Fixes for broken order page and themes

[mailer.git] / inc / session.php

diff --git a/inc/session.php b/inc/session.php
index 26e296685dcc2fb0cdc2164755e0013bb4149f69..591cb1c4eea7cd076606943e592528ff1ecc8ae8 100644 (file)
--- 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,17 +47,16 @@ 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')) {
@@ -66,7 +64,7 @@ if (isSessionVariableSet('userid')) {
        setUserId(getSession('userid'));
 
        // Is it valid?
-       if (!IS_MEMBER()) {
+       if (!isMember()) {
                // Then destroy the user id
                destroyUserSession();
 
@@ -75,7 +73,5 @@ if (isSessionVariableSet('userid')) {
        } // END - if
 } // END - if
 
-//* DEBUG: */ print('<pre>'.print_r($_SESSION, true).'</pre>');
-
-//
+// [EOF]
 ?>