Code from inc/language.php moved to function loadLanguageFile(), the include is now...

[mailer.git] / inc / session.php

diff --git a/inc/session.php b/inc/session.php
index d48a53441934e718a1f5621de945c718947550dc..ec9dff751e796fd1591ca9d9f989ae0e0b0f8fca 100644 (file)
--- a/inc/session.php
+++ b/inc/session.php
@@ -51,8 +51,8 @@ if (getConfig('session_save_path') != '') {
 // Start the session
 session_start();
 
-// Load language system
-loadIncludeOnce('inc/language.php');
+// Load language file(s)
+loadLanguageFile();
 
 // Load extensions here
 loadIncludeOnce('inc/load_extensions.php');
@@ -63,7 +63,7 @@ DETERMINE_REFID();
 // 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()) {
@@ -75,17 +75,6 @@ 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>');
 
 //