parseAddrs now always returns an array (expected behavior)

[squirrelmail.git] / functions / strings.php

diff --git a/functions/strings.php b/functions/strings.php
index 8cacea41f6c5c656ec2d649b5540982d9cbf4107..8903155f73f68e98e331b9d8d2b5e1a64b5e3b79 100644 (file)
--- 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) == " " ||
@@ -109,7 +120,7 @@
    /* Be cautious of "user@host.com" */
    function parseAddrs($text) {
       if (trim($text) == "")
-         return;
+         return array();
       $text = str_replace(" ", "", $text);
       $text = ereg_replace('"[^"]*"', "", $text);
       $text = ereg_replace("\([^\)]*\)", "", $text);
@@ -183,7 +194,7 @@
    }
 
    /* SquirrelMail version number -- DO NOT CHANGE */
-   $version = "1.0pre1 (cvs)";
+   $version = "1.0pre3 [cvs]";
 
 
    function find_mailbox_name ($mailbox) {
@@ -231,7 +242,7 @@
    
       // Check if this is a HTTPS or regular HTTP request
       $proto = "http://";
-      if(isset($HTTPS) && $HTTPS == 'on' ) {
+      if(isset($HTTPS) && !strcasecmp($HTTPS, 'on') ) {
         $proto = "https://";
       }
    
@@ -275,7 +286,8 @@
 
    // These functions are used to encrypt the passowrd before it is
    // stored in a cookie.
-   function OneTimePadEncrypt ($string, $pad) {
+   function OneTimePadEncrypt ($string, $epad) {
+      $pad = base64_decode($epad);
       for ($i = 0; $i < strlen ($string); $i++) {
         $encrypted .= chr (ord($string[$i]) ^ ord($pad[$i]));
       }
@@ -283,7 +295,8 @@
       return base64_encode($encrypted);
    }
 
-   function OneTimePadDecrypt ($string, $pad) {
+   function OneTimePadDecrypt ($string, $epad) {
+      $pad = base64_decode($epad);
       $encrypted = base64_decode ($string);
       
       for ($i = 0; $i < strlen ($encrypted); $i++) {
@@ -377,7 +390,7 @@
         $pad .= chr(mt_rand(0,255));
       }
 
-      return $pad;
+      return base64_encode($pad);
    }
 
    // Check if we have a required PHP-version. Return TRUE if we do,