Fix

[squirrelmail.git] / functions / strings.php

diff --git a/functions/strings.php b/functions/strings.php
index 028c99c25c622a1765330d2e73d7407ff8feb4bb..6b6c4a74eb36f39c2fc52e32c1869cb733018c2d 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -16,25 +16,7 @@
  * SquirrelMail version number -- DO NOT CHANGE
  */
 global $version;
-$version = '1.2.6 [cvs]';
-
-/**
- * If $haystack is a full mailbox name and $needle is the mailbox
- * separator character, returns the last part of the mailbox name.
- */
-function readShortMailboxName($haystack, $needle) {
-
-    if ($needle == '') {
-        $elem = $haystack;
-    } else {
-           $parts = explode($needle, $haystack);
-           $elem = array_pop($parts);
-           while ($elem == '' && count($parts)) {
-               $elem = array_pop($parts);
-           }
-    }
-    return( $elem );
-}
+$version = '1.3.2 [CVS-DEVEL]';
 
 /**
  * Wraps text at $wrap characters
@@ -82,12 +64,11 @@ function sqWordWrap(&$line, $wrap) {
         
         /* Go to the next line if we have more to process */
         if ($i < count($words)) {
-            $line .= "\n" . $beginning_spaces;
+            $line .= "\n";
         }
     }
 }
 
-
 /**
  * Does the opposite of sqWordWrap()
  */
@@ -95,8 +76,9 @@ function sqUnWordWrap(&$body) {
     $lines = explode("\n", $body);
     $body = '';
     $PreviousSpaces = '';
-    for ($i = 0; $i < count($lines); $i ++) {
-        ereg("^([\t >]*)([^\t >].*)?$", $lines[$i], $regs);
+    $cnt = count($lines);
+    for ($i = 0; $i < $cnt; $i ++) {
+        preg_match("/^([\t >]*)([^\t >].*)?$/", $lines[$i], $regs);
         $CurrentSpaces = $regs[1];
         if (isset($regs[2])) {
             $CurrentRest = $regs[2];
@@ -117,6 +99,23 @@ function sqUnWordWrap(&$body) {
     $body .= "\n";
 }
 
+/**
+ * If $haystack is a full mailbox name and $needle is the mailbox
+ * separator character, returns the last part of the mailbox name.
+ */
+function readShortMailboxName($haystack, $needle) {
+
+    if ($needle == '') {
+        $elem = $haystack;
+    } else {
+           $parts = explode($needle, $haystack);
+           $elem = array_pop($parts);
+           while ($elem == '' && count($parts)) {
+               $elem = array_pop($parts);
+           }
+    }
+    return( $elem );
+}
 
 /**
  * Returns an array of email addresses.
@@ -154,64 +153,6 @@ function getLineOfAddrs($array) {
     return( $to_line );
 }
 
-function translateText(&$body, $wrap_at, $charset) {
-    global $where, $what; /* from searching */
-    global $color; /* color theme */
-
-    require_once('../functions/url_parser.php');
-
-    $body_ary = explode("\n", $body);
-    $PriorQuotes = 0;
-    for ($i=0; $i < count($body_ary); $i++) {
-        $line = $body_ary[$i];
-        if (strlen($line) - 2 >= $wrap_at) {
-            sqWordWrap($line, $wrap_at);
-        }
-        $line = charset_decode($charset, $line);
-        $line = str_replace("\t", '        ', $line);
-
-        parseUrl ($line);
-
-        $Quotes = 0;
-        $pos = 0;
-        $j = strlen( $line );
-
-        while ( $pos < $j ) {
-            if ($line[$pos] == ' ') {
-                $pos ++;
-            } else if (strpos($line, '&gt;', $pos) === $pos) {
-                $pos += 4;
-                $Quotes ++;
-            } else {
-                break;
-            }
-        }
-        
-        if ($Quotes > 1) {
-            if (! isset($color[14])) {
-                $color[14] = '#FF0000';
-            }
-            $line = '<FONT COLOR="' . $color[14] . '">' . $line . '</FONT>';
-        } elseif ($Quotes) {
-            if (! isset($color[13])) {
-                $color[13] = '#800000';
-            }
-            $line = '<FONT COLOR="' . $color[13] . '">' . $line . '</FONT>';
-        }
-        
-        $body_ary[$i] = $line;
-    }
-    $body = '<pre>' . implode("\n", $body_ary) . '</pre>';
-}
-
-function find_mailbox_name ($mailbox) {
-    if (ereg(" *\"([^\r\n\"]*)\"[ \r\n]*$", $mailbox, $regs))
-        return $regs[1];
-    ereg(" *([^ \r\n\"]*)[ \r\n]*$",$mailbox,$regs);
-    return $regs[1];
-    
-}
-
 function php_self () {
     global $PHP_SELF, $HTTP_SERVER_VARS;
     
@@ -242,7 +183,7 @@ function php_self () {
 function get_location () {
     
     global $PHP_SELF, $SERVER_NAME, $HTTP_HOST, $SERVER_PORT,
-        $HTTP_SERVER_VARS;
+        $HTTP_SERVER_VARS, $imap_server_type;
     
     /* Get the path, handle virtual directories */
     $path = substr(php_self(), 0, strrpos(php_self(), '/'));
@@ -285,6 +226,14 @@ function get_location () {
         }
     }
     
+   /* this is a workaround for the weird macosx caching that
+      causes Apache to return 16080 as the port number, which causes
+      SM to bail */
+      
+   if ($imap_server_type == 'macosx' && $port == ':16080') {
+        $port = '';
+   }
+   
     /* Fallback is to omit the server name and use a relative */
     /* URI, although this is not RFC 2616 compliant.          */
     return ($host ? $proto . $host . $port . $path : $path);
@@ -561,4 +510,4 @@ function RemoveSlashes(&$array) {
 
 $PHP_SELF = php_self();
 
-?>
\ No newline at end of file
+?>