X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fstrings.php;h=05e155fb062d04db7bb1b1b3e3f8e6ef338ce90a;hb=35678c48e1ed84515f4ecaf22fbc3ae4cadcfc1f;hp=c9c6b9b29b32124d9343b43a6e998331e0f44804;hpb=175e7218bffd68523c8c32a7fae9bde6b5d5c952;p=squirrelmail.git

diff --git a/functions/strings.php b/functions/strings.php
index c9c6b9b2..05e155fb 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -1,4 +1,4 @@
-<?
+<?php
 
    $strings_php = true;
 
@@ -31,6 +31,19 @@
       return $data;
    }
 
+   // Searches for the next position in a string minus white space
+   function next_pos_minus_white ($haystack, $pos) {
+      while (substr($haystack, $pos, 1) == " " ||
+             substr($haystack, $pos, 1) == "\t" ||
+             substr($haystack, $pos, 1) == "\n" ||
+             substr($haystack, $pos, 1) == "\r") {
+         if ($pos >= strlen($haystack))
+            return -1;
+         $pos++;
+      }        
+      return $pos;        
+   }
+
    // Wraps text at $wrap characters
    function wordWrap($passed, $wrap) {
       $passed = str_replace("&gt;", ">", $passed);
@@ -40,27 +53,31 @@
       $i = 0;
       $line_len = strlen($words[$i])+1;
       $line = "";
-      while ($i < count($words)) {
-         while ($line_len < $wrap) {
-            $line = "$line$words[$i] ";
-            $i++;
-            $line_len = $line_len + strlen($words[$i])+1;
-         }
-         $line_len = strlen($words[$i])+1;
-         if ($line_len < $wrap) {
-            if ($i < count($words)) // don't <BR> the last line
-               $line = "$line\n";
-         } else {
-            $endline = $words[$i];
-            while ($line_len >= $wrap) {
-               $bigline = substr($endline, 0, $wrap);
-               $endline = substr($endline, $wrap, strlen($endline));
-               $line_len = strlen($endline);
-               $line = "$line$bigline<BR>";
+      if (count($words) > 1) {   
+         while ($i < count($words)-1) {
+            while ($line_len < $wrap) {
+               $line = "$line$words[$i] ";
+               $i++;
+               $line_len = $line_len + strlen($words[$i])+1;
+            }
+            $line_len = strlen($words[$i])+1;
+            if ($line_len < $wrap) {
+               if ($i < count($words)) // don't <BR> the last line
+                  $line = "$line\n";
+            } else {
+               $endline = $words[$i];
+               while ($line_len >= $wrap) {
+                  $bigline = substr($endline, 0, $wrap);
+                  $endline = substr($endline, $wrap, strlen($endline));
+                  $line_len = strlen($endline);
+                  $line = "$line$bigline<BR>";
+               }
+               $line = "$line$endline<BR>";
+               $i++;
             }
-            $line = "$line$endline<BR>";
-            $i++;
          }
+      } else {
+         $line = $words[0];
       }
 
       $line = str_replace(">", "&gt;", $line);
@@ -74,8 +91,13 @@
          return;
       }
       $text = str_replace(" ", "", $text);
+      $text = ereg_replace( '"[^"]*"', "", $text);
       $text = str_replace(",", ";", $text);
       $array = explode(";", $text);
+		for ($i = 0; $i < count ($array); $i++) {
+			$array[$i] = eregi_replace ("^.*\<", "", $array[$i]);
+			$array[$i] = eregi_replace ("\>.*$", "", $array[$i]);
+		}
       return $array;
    }
 
@@ -94,7 +116,6 @@
    function translateText($body, $wrap_at, $charset) {
       include ("../functions/url_parser.php");
       /** Add any parsing you want to in here */
-      $body = trim($body);
       $body_ary = explode("\n", $body);
 
       for ($i = 0; $i < count($body_ary); $i++) {
@@ -134,7 +155,7 @@
    }
 
    /* SquirrelMail version number -- DO NOT CHANGE */
-   $version = "0.4pre1";
+   $version = "0.5pre1";
 
 
    function find_mailbox_name ($mailbox) {
@@ -156,4 +177,38 @@
    function replace_escaped_spaces ($string) {
       return str_replace("&nbsp;", " ", $string);
    }
+
+   function get_location () {
+      # This determines the location to forward to relative
+      # to your server.  If this doesnt work correctly for
+      # you (although it should), you can remove all this 
+      # code except the last two lines, and change the header()
+      # function to look something like this, customized to
+      # the location of SquirrelMail on your server:
+      #
+      #   http://www.myhost.com/squirrelmail/src/login.php
+   
+      global $PHP_SELF, $SERVER_NAME, $HTTPS, $HTTP_HOST;
+
+      // Get the path
+      $path = substr($PHP_SELF, 0, strrpos($PHP_SELF, '/'));
+   
+      // Check if this is a HTTPS or regular HTTP request
+      $proto = "http://";
+      if(isset($HTTPS) && $HTTPS == 'on' ) {
+        $proto = "https://";
+      }
+   
+      // Get the hostname from the Host header or server config.
+      // Fallback is to omit the server name and use a relative URI,
+      // although this is not RFC 2616 compliant.
+      if(isset($HTTP_HOST) && !empty($HTTP_HOST)) {
+        $location = $proto . $HTTP_HOST . $path;
+      } else if(isset($SERVER_NAME) && !empty($SERVER_NAME)) {
+        $location = $proto . $SERVER_NAME . $path;
+      } else {
+        $location = $path;
+      }
+      return $location;
+   }   
 ?>