X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fstrings.php;h=9b7371deb2dd7504132066adbd34cec68460a75d;hb=0bb7ad5eb668cfbcb9d958899075129a2182bcda;hp=fa455664d023938a249559f2238efbf244dedf9b;hpb=2af48301fe853190f6904637a530f638a5b6cfb6;p=squirrelmail.git
diff --git a/functions/strings.php b/functions/strings.php
index fa455664..9b7371de 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -1,4 +1,6 @@
", $passed);
-
- preg_match("/^(\s|>)+/", $passed, $regs);
- $beginning_spaces = $regs[0];
-
- $words = explode(" ", $passed);
- $i = -1;
- $line_len = strlen($words[0])+1;
- $line = "";
- if (count($words) > 1) {
- 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 (strlen($beginning_spaces) +2 >= $wrap)
- $beginning_spaces = "";
- if ($i < count($words)) { // don't
the last line
- $line = "$line\n$beginning_spaces";
- }
- $line = "$line$words[$i] ";
- $line_len = strlen($beginning_spaces) + strlen($words[$i]) + 1;
- } 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
";
- }
- */
- if (strlen($line) > $wrap)
- $line = "$line\n$words[$i]";
- else
- $line = "$line$words[$i]";
- $line_len = strlen($words[$i]);
- }
- }
+ // 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) {
+ preg_match('/^([\\s>]*)([^\\s>].*)?$/', $line, $regs);
+ $beginning_spaces = $regs[1];
+ if (isset($regs[2])) {
+ $words = explode(' ', $regs[2]);
} else {
- $line = $words[0];
- }
+ $words = "";
+ }
+
+ $i = 0;
+ $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 ++;
+ }
- $line = str_replace(">", ">", $line);
- $line = str_replace("<", "<", $line);
- return $line;
+ // Go to the next line if we have more to process
+ if ($i < count($words)) {
+ $line .= "\n" . $beginning_spaces;
+ }
+ }
}
+
+
+ // Does the opposite of sqWordWrap()
+ function sqUnWordWrap(&$body)
+ {
+ $lines = explode("\n", $body);
+ $body = "";
+ $PreviousSpaces = "";
+ for ($i = 0; $i < count($lines); $i ++)
+ {
+ preg_match('/^([\\s>]*)([^\\s>].*)?$/', $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 **/
+ /* 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);
+ 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]);
+ $array[$i] = eregi_replace ("^.*[<]", '', $array[$i]);
+ $array[$i] = eregi_replace ("[>].*$", '', $array[$i]);
}
return $array;
}
@@ -117,80 +147,81 @@
/** Returns a line of comma separated email addresses from an array **/
function getLineOfAddrs($array) {
if (is_array($array)) {
- $to_line = implode(", ", $array);
- $to_line = trim(ereg_replace(",,+", ",", $to_line));
+ $to_line = implode(', ', $array);
+ $to_line = trim(ereg_replace(',,+', ',', $to_line));
} else {
- $to_line = "";
+ $to_line = '';
}
return $to_line;
}
- function translateText($body, $wrap_at, $charset) {
+ 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";
+ include '../functions/url_parser.php';
}
$body_ary = explode("\n", $body);
+ $PriorQuotes = 0;
for ($i=0; $i < count($body_ary); $i++) {
$line = $body_ary[$i];
- $line = charset_decode($charset, $line);
- $line = str_replace("\t", ' ', $line);
-
if (strlen($line) - 2 >= $wrap_at) {
- $line = sqWordWrap($line, $wrap_at);
+ sqWordWrap($line, $wrap_at);
}
+ $line = charset_decode($charset, $line);
+ $line = str_replace("\t", ' ', $line);
- $line = str_replace(' ', ' ', $line);
- $line = nl2br($line);
-
- // Removed parseEmail and integrated it into parseUrl
- // This line is no longer needed.
- // $line = parseEmail ($line);
- $line = parseUrl ($line);
+ parseUrl ($line);
- $test_line = str_replace(' ', '', $line);
- if (strpos($test_line, '>>') === 0) {
- $line = "$line\n";
- } else if (strpos($test_line, '>') === 0) {
- $line = "$line\n";
- }
-
- if ($line)
+ $Quotes = 0;
+ $pos = 0;
+ while (1)
{
- $line = '' . $line . '';
+ if ($line[$pos] == ' ')
+ {
+ $pos ++;
+ }
+ else if (strpos($line, '>', $pos) === $pos)
+ {
+ $pos += 4;
+ $Quotes ++;
+ }
+ else
+ {
+ break;
+ }
}
+
+ if ($Quotes > 1)
+ $line = ''.$line.'';
+ elseif ($Quotes)
+ $line = ''.$line.'';
- $body_ary[$i] = $line . '
';
+ $body_ary[$i] = $line;
}
- $body = implode("\n", $body_ary);
-
- return $body;
+ $body = '
' . implode("\n", $body_ary) . ''; } /* SquirrelMail version number -- DO NOT CHANGE */ - $version = "0.5"; + $version = '1.0.1 [cvs]'; function find_mailbox_name ($mailbox) { - $mailbox = trim($mailbox); - if (substr($mailbox, strlen($mailbox)-1, strlen($mailbox)) == "\"") { - $mailbox = substr($mailbox, 0, strlen($mailbox) - 1); - $pos = strrpos ($mailbox, "\"")+1; - $box = substr($mailbox, $pos); - } else { - $box = substr($mailbox, strrpos($mailbox, " ")+1, strlen($mailbox)); - } - return $box; + if (ereg(" *\"([^\r\n\"]*)\"[ \r\n]*$", $mailbox, $regs)) + return $regs[1]; + ereg(" *([^ \r\n\"]*)[ \r\n]*$",$mailbox,$regs); + return $regs[1]; + } function replace_spaces ($string) { - return str_replace(" ", " ", $string); + return str_replace(' ', ' ', $string); } function replace_escaped_spaces ($string) { - return str_replace(" ", " ", $string); + return str_replace(' ', ' ', $string); } function get_location () { @@ -203,34 +234,45 @@ # # http://www.myhost.com/squirrelmail/src/login.php - global $PHP_SELF, $SERVER_NAME, $HTTPS, $HTTP_HOST, $HTTP_SERVER_VARS; + global $PHP_SELF, $SERVER_NAME, $HTTPS, $HTTP_HOST, $SERVER_PORT; // 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://"; + $proto = 'http://'; + if(isset($HTTPS) && !strcasecmp($HTTPS, 'on') ) { + $proto = 'https://'; } - if ($HTTP_SERVER_VARS['SERVER_PORT']) { - if ($HTTP_SERVER_VARS['SERVER_PORT'] != 80) { - $port = ':' . $HTTP_SERVER_VARS['SERVER_PORT']; - } - } - // Get the hostname from the Host header or server config. + $host = ''; + if (isset($HTTP_HOST) && !empty($HTTP_HOST)) + { + $host = $HTTP_HOST; + } + else if (isset($SERVER_NAME) && !empty($SERVER_NAME)) + { + $host = $SERVER_NAME; + } + + $port = ''; + if (! strstr($host, ':')) + { + if (isset($SERVER_PORT)) { + if (($SERVER_PORT != 80 && $proto == 'http://') + || ($SERVER_PORT != 443 && $proto == 'https://')) { + $port = sprintf(':%d', $SERVER_PORT); + } + } + } + + if ($host) + return $proto . $host . $port . $path; + // 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 . $port . $path; - } else if(isset($SERVER_NAME) && !empty($SERVER_NAME)) { - $location = $proto . $SERVER_NAME . $port . $path; - } else { - $location = $path; - } - return $location; + return $path; } function sqStripSlashes($string) { @@ -243,7 +285,9 @@ // 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); + $encrypted = ''; for ($i = 0; $i < strlen ($string); $i++) { $encrypted .= chr (ord($string[$i]) ^ ord($pad[$i])); } @@ -251,9 +295,10 @@ return base64_encode($encrypted); } - function OneTimePadDecrypt ($string, $pad) { + function OneTimePadDecrypt ($string, $epad) { + $pad = base64_decode($epad); $encrypted = base64_decode ($string); - + $decrypted = ''; for ($i = 0; $i < strlen ($encrypted); $i++) { $decrypted .= chr (ord($encrypted[$i]) ^ ord($pad[$i])); } @@ -274,7 +319,7 @@ if (! is_int($Val)) { - if (function_exists("crc32")) + if (function_exists('crc32')) { $Val = crc32($Val); } @@ -326,10 +371,14 @@ sq_mt_seed(md5($REMOTE_PORT . $REMOTE_ADDR . getmypid())); // getrusage - if (function_exists("getrusage")) { + if (function_exists('getrusage')) { $dat = getrusage(); - sq_mt_seed(md5($dat["ru_nswap"] . $dat["ru_majflt"] . - $dat["ru_utime.tv_sec"] . $dat["ru_utime.tv_usec"])); + $Str = ''; + foreach ($dat as $k => $v) + { + $Str .= $k . $v; + } + sq_mt_seed(md5($Str)); } // Apache-specific @@ -340,12 +389,13 @@ function OneTimePadCreate ($length=100) { sq_mt_randomize(); - + + $pad = ''; for ($i = 0; $i < $length; $i++) { $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, @@ -356,7 +406,7 @@ function sqCheckPHPVersion($major, $minor, $release) { $ver = phpversion(); - eregi("^([0-9]+)\.([0-9]+)(.*)", $ver, $regs); + eregi('^([0-9]+)\\.([0-9]+)(.*)', $ver, $regs); // Parse the version string $vmajor = strval($regs[1]); @@ -364,9 +414,9 @@ $vrel = $regs[3]; if($vrel[0] == ".") $vrel = strval(substr($vrel, 1)); - if($vrel[0] == "b" || $vrel[0] == "B") + if($vrel[0] == 'b' || $vrel[0] == 'B') $vrel = - strval(substr($vrel, 1)); - if($vrel[0] == "r" || $vrel[0] == "R") + if($vrel[0] == 'r' || $vrel[0] == 'R') $vrel = - strval(substr($vrel, 2))/10; // Compare major version @@ -391,5 +441,59 @@ return true; } + + /* Returns a string showing the size of the message/attachment */ + function show_readable_size($bytes) + { + $bytes /= 1024; + $type = 'k'; + + if ($bytes / 1024 > 1) + { + $bytes /= 1024; + $type = 'm'; + } + + if ($bytes < 10) + { + $bytes *= 10; + settype($bytes, 'integer'); + $bytes /= 10; + } + else + settype($bytes, 'integer'); + + return $bytes . ' ' . $type . ''; + } + + /* Generates a random string from the caracter set you pass in + * + * Flags: + * 1 = add lowercase a-z to $chars + * 2 = add uppercase A-Z to $chars + * 4 = add numbers 0-9 to $chars + */ + + function GenerateRandomString($size, $chars, $flags = 0) + { + if ($flags & 0x1) + $chars .= 'abcdefghijklmnopqrstuvwxyz'; + if ($flags & 0x2) + $chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; + if ($flags & 0x4) + $chars .= '0123456789'; + + if ($size < 1 || strlen($chars) < 1) + return ''; + + sq_mt_randomize(); // Initialize the random number generator + + $String = ""; + while (strlen($String) < $size) { + $String .= $chars[mt_rand(0, strlen($chars))]; + } + + return $String; + } ?>