Removed the count_chars funtion (not in use, and exists in PHP4.0b4)

[squirrelmail.git] / functions / strings.php

diff --git a/functions/strings.php b/functions/strings.php
index 11e30f924563c2007b22128f77caeb6fb72f89e2..44f1d12265a22808a31384c9bc5d3c844a2eabd4 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -1,5 +1,7 @@
 <?
 
+   $strings_php = true;
+
    //*************************************************************************
    // Count the number of occurances of $needle are in $haystack.
    //*************************************************************************
@@ -20,7 +22,7 @@
       if (substr($haystack, -1) == $needle)
          $haystack = substr($haystack, 0, strlen($haystack) - 1);
 
-      if (strpos($haystack, $needle)) {
+      if (strrpos($haystack, $needle)) {
          $pos = strrpos($haystack, $needle) + 1;
          $data = substr($haystack, $pos, strlen($haystack));
       } else {
@@ -89,7 +91,7 @@
       return $to_line;
    }
 
-   function translateText($body, $wrap_at) {
+   function translateText($body, $wrap_at, $charset) {
       /** Add any parsing you want to in here */
       $body = trim($body);
       $body_ary = explode("\n", $body);
@@ -98,12 +100,15 @@
          $line = $body_ary[$i];
          $line = "^^$line";
 
-         $line = str_replace(">", "&gt;", $line);
-         $line = str_replace("<", "&lt;", $line);
+         //$line = str_replace(">", "&gt;", $line);
+         //$line = str_replace("<", "&lt;", $line);
+         //$line = htmlspecialchars($line);
 
          if (strlen($line) >= $wrap_at) // -2 because of the ^^ at the beginning
             $line = wordWrap($line, $wrap_at);
 
+         $line = charset_decode($charset, $line);
+
          $line = str_replace(" ", "&nbsp;", $line);
          $line = str_replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;", $line);
          $line = nl2br($line);
@@ -126,5 +131,26 @@
    }
 
    /* SquirrelMail version number -- DO NOT CHANGE */
-   $version = "0.3pre1";
+   $version = "0.4pre1";
+
+
+   function find_mailbox_name ($mailbox) {
+      $mailbox = trim($mailbox);
+      if (substr($mailbox, strlen($mailbox)-1, strlen($mailbox)) == "\"") {
+         $mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
+         $pos = strrpos ($mailbox, "\"")+1;
+         $box = substr($mailbox, $pos);
+      } else {
+         $box = substr($mailbox, strrpos($mailbox, " ")+1, strlen($mailbox));
+      }
+      return $box;
+   }
+
+   function replace_spaces ($string) {
+      return str_replace(" ", "&nbsp;", $string);
+   }
+
+   function replace_escaped_spaces ($string) {
+      return str_replace("&nbsp;", " ", $string);
+   }
 ?>