Fixes for stripped HTML tags, and false warnings in debug log

[mailer.git] / inc / session.php

diff --git a/inc/session.php b/inc/session.php
index 89f370509a5f096617172ac9b74247dd037bd69f..7cf0c603734e7d0e5a45a7b55bb0bb2355348b64 100644 (file)
--- a/inc/session.php
+++ b/inc/session.php
@@ -48,19 +48,17 @@ if (($VIEW == 1) && ($_SERVER['PHP_SELF'])) return;
 // Set session save path if set
 if (getConfig('session_save_path') != "") {
        // Please make sure this valid!
-       @session_save_path(getConfig('session_save_path'));
+       session_save_path(getConfig('session_save_path'));
 } // END - if
 
 // Start the session
-@session_start();
-global $PHPSESSID;
-$PHPSESSID = @session_id();
+session_start();
 
 // Load language system
-require_once(PATH."inc/language.php");
+LOAD_INC_ONCE("inc/language.php");
 
 // Load extensions here
-require_once(PATH."inc/load_extensions.php");
+LOAD_INC_ONCE("inc/load_extensions.php");
 
 // Determine and set referal id
 DETERMINE_REFID();
@@ -81,7 +79,7 @@ if (isset($_SESSION['userid'])) {
 } // 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") || (isBooleanConstantAndTrue('mxchange_installing'))) {
+if ((basename($_SERVER['PHP_SELF']) == "index.php") || (basename($_SERVER['PHP_SELF']) == "modules.php") || (isInstalling())) {
        if (count($_SESSION) > 0) {
                // Session variables accepted!
                define('__COOKIES', true);