Fixes for broken installation routine

[mailer.git] / inc / session.php

diff --git a/inc/session.php b/inc/session.php
index 1e156d17e7174a386df97f29b8425f89374dd8ea..3944e24ebb81e5f1c525160de7bd6eb6e0ada5a2 100644 (file)
--- a/inc/session.php
+++ b/inc/session.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 }
 
 // Set session save path if set
-if (getConfig('session_save_path') != "") {
+if (getConfig('session_save_path') != '') {
        // Please make sure this valid!
        session_save_path(getConfig('session_save_path'));
 } // END - if
@@ -52,10 +52,10 @@ if (getConfig('session_save_path') != "") {
 session_start();
 
 // Load language system
-LOAD_INC_ONCE("inc/language.php");
+loadIncludeOnce('inc/language.php');
 
 // Load extensions here
-LOAD_INC_ONCE("inc/load_extensions.php");
+loadIncludeOnce('inc/load_extensions.php');
 
 // Determine and set referal id
 DETERMINE_REFID();
@@ -68,25 +68,14 @@ if (isSessionVariableSet('userid')) {
        // Is it valid?
        if (!IS_MEMBER()) {
                // 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>");
+//* DEBUG: */ print('<pre>'.print_r($_SESSION, true).'</pre>');
 
 //
 ?>