some more fixes to solve the vhost problem (icy cold here in the freeze)

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 8fb83291467a7e95d61e09fe055502bc268d496b..fadc568487e4fc8cb1825da675ee38534f7affae 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -12,6 +12,8 @@
  * $Id$
  */
 
+include_once('../functions/strings.php');
+
 define('PG_SEL_MAX', 10);  /* Default value for page_selector_max. */
 
 function printMessageInfo($imapConnection, $t, $i, $key, $mailbox, $sort, $start_msg, $where, $what) {

diff --git a/functions/mime.php b/functions/mime.php
index 278e5673f202a9a255e47322b19c8b16a1da5d16..4cc1ccaa11c9c72c3b3dc8a9b9b7b9f3eae4b65b 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -836,7 +836,7 @@ function encodeHeader ($string) {
 */
 function MagicHTML( $body, $id ) {
 
-    global $message, $PHP_SELF, $HTTP_SERVER_VARS, 
+    global $message, $HTTP_SERVER_VARS, 
            $attachment_common_show_images;
 
     $attachment_common_show_images =

diff --git a/functions/page_header.php b/functions/page_header.php
index 7463dc9f3b44127d45eb25c66623e2ec253beae4..637ba7f4924bedbacbd165404b3b3ed96d827da1 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -11,6 +11,8 @@
  * $Id$
  */
 
+include_once('../functions/strings.php');
+
 // Always set up the language before calling these functions
 function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) {
 
@@ -134,4 +136,4 @@ function checkForm() {
         "</TABLE>\n\n";
 }
 
-?>
\ No newline at end of file
+?>

diff --git a/functions/strings.php b/functions/strings.php
index d39df3e59660f1c4bbb174b4ee97a630a3cd2493..d4b5802af87bf478084cd464a065bcfd88152503 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -261,6 +261,20 @@ function find_mailbox_name ($mailbox) {
     
 }
 
+function php_self () {
+    global $PHP_SELF, $HTTP_SERVER_VARS;
+    
+    if (isset($PHP_SELF) && !empty($PHP_SELF)) {
+        return $PHP_SELF;
+    } else if (isset($HTTP_SERVER_VARS['PHP_SELF']) &&
+               !empty($HTTP_SERVER_VARS['PHP_SELF'])) {
+        return $HTTP_SERVER_VARS['PHP_SELF'];
+    } else {
+        return '';
+    }
+}
+
+
 /**
  * This determines the location to forward to relative to your server.
  * If this doesnt work correctly for you (although it should), you can
@@ -589,4 +603,6 @@ function RemoveSlashes(&$array) {
     }
 }
 
+$PHP_SELF = php_self();
+
 ?>

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 51d2b538e77d27c168dfe862c3e325363fa9f9a9..585680dc018a97fca25e5353d740929272afd36d 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -23,6 +23,7 @@ require_once('../functions/smtp.php');
 require_once('../functions/display_messages.php');
 require_once('../functions/addressbook.php');
 require_once('../functions/plugin.php');
+include_once('../functions/strings.php');
 
 /* Insert hidden data */
 function addr_insert_hidden() {

diff --git a/src/addressbook.php b/src/addressbook.php
index 18edc2616ee68a502e06729a4cf62dcb8568e86a..f32b85ab03e40e91e1cca5c6055fa8c9185b0ff2 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -15,6 +15,7 @@ require_once('../src/validate.php');
 require_once('../functions/array.php');
 require_once('../functions/display_messages.php');
 require_once('../functions/addressbook.php');
+include_once('../functions/strings.php');
 
 /* Make an input field */
 function adressbook_inp_field($label, $field, $name, $size, $values, $add) {

diff --git a/src/options.php b/src/options.php
index b89cf21f036f68ea57328904cf4d582875c36ac3..fe7a68afd6f45c0bbd499f71f38be5cb7b6f7e60 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -17,6 +17,7 @@ require_once('../functions/display_messages.php');
 require_once('../functions/imap.php');
 require_once('../functions/array.php');
 require_once('../functions/options.php');
+include_once('../functions/strings.php');
 
 /* Set the base uri. */
 ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);

diff --git a/src/options_highlight.php b/src/options_highlight.php
index 0775e2e848b5a24ca6607387ae79e5344b52c56e..edb6acd6e6ea3b66b7b1ed3b18910aed6e45a7fe 100644 (file)
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -16,6 +16,7 @@ require_once('../functions/display_messages.php');
 require_once('../functions/imap.php');
 require_once('../functions/array.php');
 require_once('../functions/plugin.php');
+include_once('../functions/strings.php');
 
 function oh_opt( $val, $sel, $tit ) {
     echo "<option value=\"$val\"";

diff --git a/src/search.php b/src/search.php
index b38d10b900506aca25656617af6a19528877c894..856f772414da987a6f86eda51eb79e5a16064a16 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -13,6 +13,7 @@ require_once('../src/validate.php');
 require_once('../functions/imap.php');
 require_once('../functions/imap_search.php');
 require_once('../functions/array.php');
+include_once('../functions/strings.php');
 
 function s_opt( $val, $sel, $tit ) {
     echo "            <option value=\"$val\"";
@@ -145,4 +146,4 @@ sqimap_logout ($imapConnection);
 
 echo '</body></html>';
 
-?>
\ No newline at end of file
+?>

diff --git a/src/signout.php b/src/signout.php
index 42dfed57dc322a81d1302867cefe2e5840fd9b84..75a36ccfa38e89f8a0f3cfe8d5e0f7138e58e84a 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -30,6 +30,7 @@
 require_once('../src/validate.php');
 require_once('../functions/prefs.php');
 require_once('../functions/plugin.php');
+include_once('../functions/strings.php');
 
    // Erase any lingering attachments
    if (! isset($attachments)) {

diff --git a/themes/darkness.php b/themes/darkness.php
index d0b9cfa1e4319b1ee3db7a99e0522ccdd997c4c8..3a08f545bc7e57c4842c0af17b9242020366673f 100755 (executable)
--- a/themes/darkness.php
+++ b/themes/darkness.php
@@ -6,6 +6,9 @@
        
    **/
 
+
+include_once('../functions/strings.php');
+
    // Note:  The text distance is actually pre-squared
    // Background range is from 24-64, all three colors are the same
    // Text range is from 196 to 255