Fixed [ #500024 ] HREF is wrong on ssl server

base href didn't contain protocol.

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

diff --git a/functions/mime.php b/functions/mime.php
index 263d55fc54df47f47d770e406b8b5deb49352b3e..02e69fc5294e6a4e121d84e0b287471c0da1b481 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -411,6 +411,7 @@ function mime_fetch_body ($imap_stream, $id, $ent_id ) {
                 $k++;
             }
             if ( $base <> '' )
+                
                 $ret = "<base href=\"$base\">" . $ret;
         }
     } else if (ereg('"([^"]*)"', $topline, $regs)) {
@@ -1023,7 +1024,7 @@ function MagicHTML( $body, $id ) {
 return( "\n\n<!-- HTML Output ahead -->\n" .
         $ret .
         "\n<!-- END of HTML Output --><base href=\"".
-        $HTTP_SERVER_VARS["SERVER_NAME"] . substr( $PHP_SELF, 0, strlen( $PHP_SELF ) - 13 ) .
+        get_location() . '/'.
         "\">\n\n" );
 }