X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fstrings.php;h=ed1224e6d43f6642b61049651d49c94ec29d6574;hb=0c40b2689f10919b37ebaa5c4ec2143f3eb3663f;hp=5a8405e12ae0ec2d60366d89907e880c170d303b;hpb=fd0a282af990a40969f2d96c5d3a191ad3fb8055;p=squirrelmail.git

diff --git a/functions/strings.php b/functions/strings.php
index 5a8405e1..ed1224e6 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) == " " ||
@@ -106,6 +117,7 @@
    
 
    /** Returns an array of email addresses **/
+   /* Be cautious of "user@host.com" */
    function parseAddrs($text) {
       if (trim($text) == "")
          return;
@@ -134,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";
@@ -181,7 +194,7 @@
    }
 
    /* SquirrelMail version number -- DO NOT CHANGE */
-   $version = "1.0pre1 (cvs)";
+   $version = "1.0pre3 [cvs]";
 
 
    function find_mailbox_name ($mailbox) {
@@ -229,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://";
       }
    
@@ -248,7 +261,8 @@
       if (! strstr($host, ':'))
       {
           if (isset($SERVER_PORT)) {
-              if ($SERVER_PORT != 80) {
+              if (($SERVER_PORT != 80 && $proto == "http://")
+                      || ($SERVER_PORT != 443 && $proto == "https://")) {
                   $port = sprintf(':%d', $SERVER_PORT);
               }
           }
@@ -272,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]));
       }
@@ -280,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++) {
@@ -374,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,