Optimization:

[squirrelmail.git] / functions / strings.php

diff --git a/functions/strings.php b/functions/strings.php
index d8817608a06bb6b5bad1dee37283c7047fd8269b..9277354aa8a9d88521e6b5321e1882c7108b0c12 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -16,143 +16,26 @@
  * SquirrelMail version number -- DO NOT CHANGE
  */
 global $version;
-$version = '1.2.5';
+$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 == '') {
-        return $haystack;
-    }
-    $parts = explode($needle, $haystack);
-    $elem = array_pop($parts);
-    while ($elem == '' && count($parts)) {
-        $elem = array_pop($parts);
-    }
-    return $elem;
-}
-
-/**
- * If $haystack is a full mailbox name, and $needle is the mailbox
- * separator character, returns the second last part of the full
- * mailbox name (i.e. the mailbox's parent mailbox)
- */
-function readMailboxParent($haystack, $needle) {
-    if ($needle == '') return '';
-    $parts = explode($needle, $haystack);
-    $elem = array_pop($parts);
-    while ($elem == '' && count($parts)) {
-        $elem = array_pop($parts);
-    }
-    return join($needle, $parts);
-}
 
-/**
- * Returns the index of the first chunk of string $haystack that
- * starts with non-white-space character, starting at position $pos.
- * If there is no such chunk, returns -1.
- */
-function next_pos_minus_white ($haystack, $pos) {
-    $len = strlen($haystack);
-    while ($pos < $len) {
-        /* Get the next character. */
-        $c = substr($haystack, $pos, 1);
-        
-        /* Check the next character. */
-        if (($c != ' ') && ($c != "\t") && ($c != "\n") && ($c != "\r")) {
-            return $pos;
-        }
-
-        /* Increment position in string. */
-        ++$pos;
-    }
-    return -1;
-}
-
-/**
- * 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]);
+    if ($needle == '') {
+        $elem = $haystack;
     } 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;
-        }
+           $parts = explode($needle, $haystack);
+           $elem = array_pop($parts);
+           while ($elem == '' && count($parts)) {
+               $elem = array_pop($parts);
+           }
     }
+    return( $elem );
 }
 
-
-/**
- * Does the opposite of sqWordWrap()
- */
-function sqUnWordWrap(&$body) {
-    $lines = explode("\n", $body);
-    $body = '';
-    $PreviousSpaces = '';
-    for ($i = 0; $i < count($lines); $i ++) {
-        ereg("^([\t >]*)([^\t >].*)?$", $lines[$i], $regs);
-        $CurrentSpaces = $regs[1];
-        if (isset($regs[2])) {
-            $CurrentRest = $regs[2];
-        }
-        
-        if ($i == 0) {
-            $PreviousSpaces = $CurrentSpaces;
-            $body = $lines[$i];
-        } else if (($PreviousSpaces == $CurrentSpaces) /* Do the beginnings match */
-                   && (strlen($lines[$i - 1]) > 65)    /* Over 65 characters long */
-                   && strlen($CurrentRest)) {          /* and there's a line to continue with */
-            $body .= ' ' . $CurrentRest;
-        } else {
-            $body .= "\n" . $lines[$i];
-            $PreviousSpaces = $CurrentSpaces;
-        }
-    }
-    $body .= "\n";
-}
-
-
 /**
  * Returns an array of email addresses.
  * Be cautious of "user@host.com"
@@ -192,9 +75,9 @@ function getLineOfAddrs($array) {
 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++) {
@@ -209,7 +92,7 @@ function translateText(&$body, $wrap_at, $charset) {
 
         $Quotes = 0;
         $pos = 0;
-       $j = strlen( $line );
+        $j = strlen( $line );
 
         while ( $pos < $j ) {
             if ($line[$pos] == ' ') {
@@ -596,4 +479,4 @@ function RemoveSlashes(&$array) {
 
 $PHP_SELF = php_self();
 
-?>
+?>
\ No newline at end of file