X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fstrings.php;h=fc466528e902e0805844f777bd16c457e0af6620;hb=7379b349cb00371a0f1f3c74846cc8ec5bc9bea7;hp=459eeb7093437778300e4ed19054967e0d237c54;hpb=a7f3c40d541b7c780b28ba45a9f46a8460ebab6c;p=squirrelmail.git

diff --git a/functions/strings.php b/functions/strings.php
index 459eeb70..fc466528 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -15,11 +15,22 @@
    //    of the $haystack is reached.  $needle is a single character
    //*************************************************************************
    function readShortMailboxName($haystack, $needle) {
+      if ($needle == "") return $haystack;
       if ($needle == ".") $needle = "\.";
       ereg("([^$needle]+)$needle?$", $haystack, $regs);
       return $regs[1];
    }
 
+   //*************************************************************************
+   // Read from the back of $haystack until $needle is found, or the begining
+   //    of the $haystack is reached.  $needle is a single character
+   //*************************************************************************
+   function readMailboxParent($haystack, $needle) {
+      if ($needle == ".") $needle = "\.";
+      ereg("^(.+)$needle([^$needle]+)$needle?$", $haystack, $regs);
+      return $regs[1];
+   }
+
    // Searches for the next position in a string minus white space
    function next_pos_minus_white ($haystack, $pos) {
       while (substr($haystack, $pos, 1) == " " ||
@@ -135,6 +146,7 @@
 
    function translateText(&$body, $wrap_at, $charset) {
       global $where, $what; // from searching
+		global $url_parser_php;
 
       if (!isset($url_parser_php)) {
          include "../functions/url_parser.php";
@@ -182,7 +194,7 @@
    }
 
    /* SquirrelMail version number -- DO NOT CHANGE */
-   $version = "1.0pre1 (cvs)";
+   $version = "1.0pre2 (cvs)";
 
 
    function find_mailbox_name ($mailbox) {