Added more wrapper, commented out another noisy debug line

[mailer.git] / inc / session.php

diff --git a/inc/session.php b/inc/session.php
index 71e6eca53dd032accfae3f948e07d1aef4cb96f6..e8b9e2331719b5404bb4632c1fae971f8aeee82a 100644 (file)
--- 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 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * 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,13 +37,13 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } // END - if
 
 // 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') != '') {
+       if ((isConfigEntrySet('session_save_path')) && (getConfig('session_save_path') != '')) {
                // Please make sure this valid!
                session_save_path(getConfig('session_save_path'));
        } // END - if
@@ -53,29 +52,11 @@ if (isExtensionInstalledAndNewer('sql_patches', '0.5.3')) {
 // Is a session id there?
 if (session_id() == '') {
        // Start the session
-       session_start();
+       $GLOBALS['valid_session'] = session_start();
 } // END - if
 
 // Load language file(s)
 loadLanguageFile();
 
-// Determine and set referal id
-determineReferalId();
-
-// Transfer userid from session and validate it
-if (isSessionVariableSet('userid')) {
-       // Get it secured from session
-       setUserId(getSession('userid'));
-
-       // Is it valid?
-       if (!isMember()) {
-               // Then destroy the user id
-               destroyUserSession();
-
-               // Kill userid
-               setUserId(0);
-       } // END - if
-} // END - if
-
 // [EOF]
 ?>