X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fstrings.php;h=291c52ed2d2fafc17581199a419c6d53d3913f66;hp=a11a6fabbf84c358530622d739e0349d98493849;hb=22edfb6fa547ae57c75624e0903b036e698b188a;hpb=d68a3926944cc2ecf743b0e9389fa5f463445910
diff --git a/functions/strings.php b/functions/strings.php
index a11a6fab..291c52ed 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -1,214 +1,573 @@
= strlen($haystack))
return -1;
$pos++;
- }
- return $pos;
+ }
+ return $pos;
}
- // Wraps text at $wrap characters
- function wordWrap($passed, $wrap) {
- $passed = str_replace(">", ">", $passed);
- $passed = str_replace("<", "<", $passed);
+ /**
+ * Wraps text at $wrap characters
+ *
+ * Has a problem with special HTML characters, so call this before
+ * you do character translation.
+ *
+ * Specifically, ' comes up as 5 characters instead of 1.
+ * This should not add newlines to the end of lines.
+ */
+ function sqWordWrap(&$line, $wrap) {
+ ereg("^([\t >]*)([^\t >].*)?$", $line, $regs);
+ $beginning_spaces = $regs[1];
+ if (isset($regs[2])) {
+ $words = explode(' ', $regs[2]);
+ } else {
+ $words = "";
+ }
- $words = explode(" ", trim($passed));
$i = 0;
- $line_len = strlen($words[$i])+1;
- $line = "";
- 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
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
";
- }
- $line = "$line$endline
";
- $i++;
- }
+ $line = $beginning_spaces;
+
+ while ($i < count($words)) {
+ // Force one word to be on a line (minimum)
+ $line .= $words[$i];
+ $line_len = strlen($beginning_spaces) + strlen($words[$i]) + 2;
+ if (isset($words[$i + 1]))
+ $line_len += strlen($words[$i + 1]);
+ $i ++;
+
+ // Add more words (as long as they fit)
+ while ($line_len < $wrap && $i < count($words)) {
+ $line .= ' ' . $words[$i];
+ $i++;
+ if (isset($words[$i]))
+ $line_len += strlen($words[$i]) + 1;
+ else
+ $line_len += 1;
+ }
+
+ // Skip spaces if they are the first thing on a continued line
+ while (!isset($words[$i]) && $i < count($words)) {
+ $i ++;
+ }
+
+ // Go to the next line if we have more to process
+ if ($i < count($words)) {
+ $line .= "\n" . $beginning_spaces;
}
- } else {
- $line = $words[0];
}
+ }
- $line = str_replace(">", ">", $line);
- $line = str_replace("<", "<", $line);
- return $line;
+
+ /**
+ * Does the opposite of sqWordWrap()
+ */
+ function sqUnWordWrap(&$body) {
+ $lines = explode("\n", $body);
+ $body = "";
+ $PreviousSpaces = "";
+ for ($i = 0; $i < count($lines); $i ++) {
+ ereg("^([\t >]*)([^\t >].*)?$", $lines[$i], $regs);
+ $CurrentSpaces = $regs[1];
+ if (isset($regs[2])) {
+ $CurrentRest = $regs[2];
+ }
+
+ if ($i == 0) {
+ $PreviousSpaces = $CurrentSpaces;
+ $body = $lines[$i];
+ } else if (($PreviousSpaces == $CurrentSpaces) // Do the beginnings match
+ && (strlen($lines[$i - 1]) > 65) // Over 65 characters long
+ && strlen($CurrentRest)) { // and there's a line to continue with
+ $body .= ' ' . $CurrentRest;
+ } else {
+ $body .= "\n" . $lines[$i];
+ $PreviousSpaces = $CurrentSpaces;
+ }
+ }
+ $body .= "\n";
}
- /** Returns an array of email addresses **/
+
+ /**
+ * Returns an array of email addresses.
+ * Be cautious of "user@host.com"
+ */
function parseAddrs($text) {
- if (trim($text) == "") {
- 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]);
- }
+ if (trim($text) == "")
+ return array();
+ $text = str_replace(' ', '', $text);
+ $text = ereg_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;
}
- /** Returns a line of comma separated email addresses from an array **/
+ /**
+ * Returns a line of comma separated email addresses from an array.
+ */
function getLineOfAddrs($array) {
- $to_line = "";
- for ($i = 0; $i < count($array); $i++) {
- if ($to_line)
- $to_line = "$to_line, $array[$i]";
- else
- $to_line = "$array[$i]";
+ if (is_array($array)) {
+ $to_line = implode(', ', $array);
+ $to_line = ereg_replace(', (, )+', ', ', $to_line);
+ $to_line = trim(ereg_replace('^, ', '', $to_line));
+ if( substr( $to_line, -1 ) == ',' )
+ $to_line = substr( $to_line, 0, -1 );
+ } else {
+ $to_line = '';
}
- return $to_line;
+
+ return( $to_line );
}
- function translateText($body, $wrap_at, $charset) {
- include ("../functions/url_parser.php");
- /** Add any parsing you want to in here */
- $body_ary = explode("\n", $body);
+ function translateText(&$body, $wrap_at, $charset) {
+ global $where, $what; // from searching
+ global $color; // color theme
- for ($i = 0; $i < count($body_ary); $i++) {
+ require_once('../functions/url_parser.php');
+
+ $body_ary = explode("\n", $body);
+ $PriorQuotes = 0;
+ for ($i=0; $i < count($body_ary); $i++) {
$line = $body_ary[$i];
- $line = "^^$line";
+ if (strlen($line) - 2 >= $wrap_at) {
+ sqWordWrap($line, $wrap_at);
+ }
+ $line = charset_decode($charset, $line);
+ $line = str_replace("\t", ' ', $line);
+
+ parseUrl ($line);
- //$line = str_replace(">", ">", $line);
- //$line = str_replace("<", "<", $line);
- //$line = htmlspecialchars($line);
+ $Quotes = 0;
+ $pos = 0;
+ while (1) {
+ if ($line[$pos] == ' ') {
+ $pos ++;
+ } else if (strpos($line, '>', $pos) === $pos) {
+ $pos += 4;
+ $Quotes ++;
+ } else {
+ break;
+ }
+ }
- if (strlen($line) >= $wrap_at) // -2 because of the ^^ at the beginning
- $line = wordWrap($line, $wrap_at);
+ if ($Quotes > 1) {
+ if (! isset($color[14])) {
+ $color[14] = '#FF0000';
+ }
+ $line = '' . $line . '';
+ } elseif ($Quotes) {
+ if (! isset($color[13])) {
+ $color[13] = '#800000';
+ }
+ $line = '' . $line . '';
+ }
- $line = charset_decode($charset, $line);
+ $body_ary[$i] = $line;
+ }
+ $body = '
' . implode("\n", $body_ary) . ''; + } - $line = str_replace(" ", " ", $line); - $line = str_replace("\t", " ", $line); - $line = nl2br($line); - - if (strpos(trim(str_replace(" ", "", $line)), ">>") == 2) { - $line = substr($line, 2, strlen($line)); - $line = "$line