Bugfix

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

diff --git a/functions/strings.php b/functions/strings.php
index 7f8f5b0e635b63c5be8a8d163644bf24fe2e0075..f901eb48068ba21bba1e82fa49f1d3fb47e467d4 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -18,6 +18,57 @@
 global $version;
 $version = '1.2.6 [cvs]';
 
 global $version;
 $version = '1.2.6 [cvs]';
 

+/**
+ * Wraps text at $wrap characters
+ *
+ * Has a problem with special HTML characters, so call this before
+ * you do character translation.
+ *
+ * Specifically, &#039 comes up as 5 characters instead of 1.
+ * This should not add newlines to the end of lines.
+ */
+function sqWordWrap(&$line, $wrap) {
+    ereg("^([\t >]*)([^\t >].*)?$", $line, $regs);
+    $beginning_spaces = $regs[1];
+    if (isset($regs[2])) {
+        $words = explode(' ', $regs[2]);
+    } else {
+        $words = '';
+    }
+    
+    $i = 0;
+    $line = $beginning_spaces;
+    
+    while ($i < count($words)) {
+        /* Force one word to be on a line (minimum) */
+        $line .= $words[$i];
+        $line_len = strlen($beginning_spaces) + strlen($words[$i]) + 2;
+        if (isset($words[$i + 1]))
+            $line_len += strlen($words[$i + 1]);
+        $i ++;
+        
+        /* Add more words (as long as they fit) */
+        while ($line_len < $wrap && $i < count($words)) {
+            $line .= ' ' . $words[$i];
+            $i++;
+            if (isset($words[$i]))
+                $line_len += strlen($words[$i]) + 1;
+            else
+                $line_len += 1;
+        }
+        
+        /* Skip spaces if they are the first thing on a continued line */
+        while (!isset($words[$i]) && $i < count($words)) {
+            $i ++;
+        }
+        
+        /* Go to the next line if we have more to process */
+        if ($i < count($words)) {
+            $line .= "\n" . $beginning_spaces;
+        }
+    }
+}
+

 /**
  * If $haystack is a full mailbox name and $needle is the mailbox
  * separator character, returns the last part of the mailbox name.
 /**
  * If $haystack is a full mailbox name and $needle is the mailbox
  * separator character, returns the last part of the mailbox name.

diff --git a/src/compose.php b/src/compose.php
index 22935f9554cc715f87bce7fda6f304399d05dc52..d775eb22dbde02fe80b1d2ee1526750537f2fa94 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -27,56 +27,7 @@ require_once('../functions/plugin.php');
 
 /* --------------------- Specific Functions ------------------------------ */
 
 
 /* --------------------- Specific Functions ------------------------------ */
 

-/**
- * Wraps text at $wrap characters
- *
- * Has a problem with special HTML characters, so call this before
- * you do character translation.
- *
- * Specifically, &#039 comes up as 5 characters instead of 1.
- * This should not add newlines to the end of lines.
- */
-function sqWordWrap(&$line, $wrap) {
-    ereg("^([\t >]*)([^\t >].*)?$", $line, $regs);
-    $beginning_spaces = $regs[1];
-    if (isset($regs[2])) {
-        $words = explode(' ', $regs[2]);
-    } else {
-        $words = '';
-    }
-    
-    $i = 0;
-    $line = $beginning_spaces;
-    
-    while ($i < count($words)) {
-        /* Force one word to be on a line (minimum) */
-        $line .= $words[$i];
-        $line_len = strlen($beginning_spaces) + strlen($words[$i]) + 2;
-        if (isset($words[$i + 1]))
-            $line_len += strlen($words[$i + 1]);
-        $i ++;
-        
-        /* Add more words (as long as they fit) */
-        while ($line_len < $wrap && $i < count($words)) {
-            $line .= ' ' . $words[$i];
-            $i++;
-            if (isset($words[$i]))
-                $line_len += strlen($words[$i]) + 1;
-            else
-                $line_len += 1;
-        }
-        
-        /* Skip spaces if they are the first thing on a continued line */
-        while (!isset($words[$i]) && $i < count($words)) {
-            $i ++;
-        }
-        
-        /* Go to the next line if we have more to process */
-        if ($i < count($words)) {
-            $line .= "\n" . $beginning_spaces;
-        }
-    }
-}
+

 
 /**
  * Does the opposite of sqWordWrap()
 
 /**
  * Does the opposite of sqWordWrap()

diff --git a/src/redirect.php b/src/redirect.php
index 81373976b85224e343055e3dce10e83b45e7eab8..9342711f6b729fa9b85d10104f19d1308ff89b4a 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -25,10 +25,10 @@ require_once('../functions/page_header.php');
 if (get_magic_quotes_gpc()) {
     global $REQUEST_METHOD;
 
 if (get_magic_quotes_gpc()) {
     global $REQUEST_METHOD;
 

-    if ($REQUEST_METHOD == "POST") {
+    if ($REQUEST_METHOD == 'POST') {

         global $HTTP_POST_VARS;
         RemoveSlashes($HTTP_POST_VARS);
         global $HTTP_POST_VARS;
         RemoveSlashes($HTTP_POST_VARS);

-    } else if ($REQUEST_METHOD == "GET") {
+    } else if ($REQUEST_METHOD == 'GET') {

         global $HTTP_GET_VARS;
         RemoveSlashes($HTTP_GET_VARS);
     }
         global $HTTP_GET_VARS;
         RemoveSlashes($HTTP_GET_VARS);
     }


@@ -59,10 +59,10 @@ setcookie('squirrelmail_language', $squirrelmail_language, time()+2592000,$base_
 if (!isset($login_username)) {
     displayHtmlHeader( _("You must be logged in to access this page.") );
     echo "<BODY BGCOLOR=\"#ffffff\">\n" .
 if (!isset($login_username)) {
     displayHtmlHeader( _("You must be logged in to access this page.") );
     echo "<BODY BGCOLOR=\"#ffffff\">\n" .

-        "<BR>&nbsp;<BR>\n" .
+        "&nbsp;<p>\n" .

         "<CENTER>\n" .
         '<B>' . _("You must be logged in to access this page.") . "</B><BR>" .
         "<CENTER>\n" .
         '<B>' . _("You must be logged in to access this page.") . "</B><BR>" .

-        '<A HREF="../src/login.php">'  . _("Go to the login page") . "</A>\n" .
+        "<A HREF=\"$base_uri/src/login.php\">"  . _("Go to the login page") . "</A>\n" .

         "</CENTER>\n" .
         "</BODY></HTML>\n";
     exit;
         "</CENTER>\n" .
         "</BODY></HTML>\n";
     exit;