remove obsolate sqm_baseuri tests. function is moved to functions/strings.php

load functions/global.php before strings.php first.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10997 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/login.php b/src/login.php
index 974d6a30ce4950a4cbd2120f7f1c912f475ccf97..a9dbd436136a6f255084c978415d6cee3ec17875 100644 (file)
--- a/src/login.php
+++ b/src/login.php
@@ -19,6 +19,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
+require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'config/config.php');
 require_once(SM_PATH . 'functions/i18n.php');
@@ -26,7 +27,6 @@ require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/constants.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'functions/html.php');
-require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/imap_general.php');
 require_once(SM_PATH . 'functions/forms.php');
 
@@ -39,9 +39,6 @@ set_up_language($squirrelmail_language, TRUE, TRUE);
 /**
  * Find out the base URI to set cookies.
  */
-if (!function_exists('sqm_baseuri')){
-    require_once(SM_PATH . 'functions/display_messages.php');
-}
 $base_uri = sqm_baseuri();
 
 /*

diff --git a/src/redirect.php b/src/redirect.php
index 1ac1bc02bb38e3f3b85ff34d1608e124b2911c38..d43c8aa49e052d0392e6820c67de9cfd8c524777 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -30,9 +30,6 @@ require_once(SM_PATH . 'functions/page_header.php');
 
 /* Before starting the session, the base URI must be known. Assuming */
 /* that this file is in the src/ subdirectory (or something).        */
-if (!function_exists('sqm_baseuri')){
-    require_once(SM_PATH . 'functions/display_messages.php');
-}
 $base_uri = sqm_baseuri();
 
 header('Pragma: no-cache');

diff --git a/src/webmail.php b/src/webmail.php
index 7deb64b4f0d3743048ebd2a5fe6301c9e1c32172..86ac26545285f96b3590bcab58dc3a1c6497abb5 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -20,6 +20,7 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
+require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/strings.php');
 require_once(SM_PATH . 'config/config.php');
 require_once(SM_PATH . 'functions/prefs.php');
@@ -27,11 +28,7 @@ require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/i18n.php');
 require_once(SM_PATH . 'functions/auth.php');
-require_once(SM_PATH . 'functions/global.php');
 
-if (!function_exists('sqm_baseuri')){
-    require_once(SM_PATH . 'functions/display_messages.php');
-}
 $base_uri = sqm_baseuri();
 
 sqsession_is_active();