From 434d41148acadee1282a3a085d04e3ba399aaa36 Mon Sep 17 00:00:00 2001
From: tokul <tokul@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 19 Mar 2006 13:47:26 +0000
Subject: [PATCH] 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
---
 src/login.php    | 5 +----
 src/redirect.php | 3 ---
 src/webmail.php  | 5 +----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/login.php b/src/login.php
index 974d6a30..a9dbd436 100644
--- 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 1ac1bc02..d43c8aa4 100644
--- 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 7deb64b4..86ac2654 100644
--- 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();
-- 
2.25.1