}
// Wraps text at $wrap characters
- function sqWordWrap($passed, $wrap) {
- $passed = str_replace("<", "<", $passed);
- $passed = str_replace(">", ">", $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] ";
+ // Has a problem with special HTML characters, so call this before
+ // you do character translation.
+ // Specifically, ' comes up as 5 characters instead of 1.
+ function sqWordWrap(&$line, $wrap) {
+ preg_match("/^([\s>]*)([^\s>].*)$/", $line, $regs);
+ $beginning_spaces = $regs[1];
+ $words = explode(" ", $regs[2]);
+
+ $i = 0;
+ $line = $beginning_spaces;
+
+ if (count($words) > 1) {
+ while ($i < count($words)) {
+ // Force one word to be on a line (minimum)
+ $line .= $words[$i];
+ $line_len = strlen($beginning_spaces) + strlen($words[$i]) +
+ strlen($words[$i + 1]) + 2;
+ $i ++;
+
+ // Add more words (as long as they fit)
+ while ($line_len < $wrap && $i < count($words)) {
+ $line .= ' ' . $words[$i];
$i++;
- $line_len = $line_len + strlen($words[$i]) + 1;
+ $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 <BR> 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<BR>";
- }
- */
- if (strlen($line) > $wrap)
- $line = "$line\n$words[$i]";
- else
- $line = "$line$words[$i]";
- $line_len = strlen($words[$i]);
+
+ // Skip spaces if they are the first thing on a continued line
+ while (!$words[$i] && $i < count($words))
+ {
+ $i ++;
+ }
+
+ if ($i < count($words)) {
+ $line .= "\n$beginning_spaces";
}
}
} else {
- $line = $words[0];
+ $line .= $words[0];
}
-
- $line = str_replace(">", ">", $line);
- $line = str_replace("<", "<", $line);
- return $line;
}
/** Returns an array of email addresses **/
return $to_line;
}
- function translateText($body, $wrap_at, $charset) {
+ function translateText(&$body, $wrap_at, $charset) {
global $where, $what; // from searching
if (!isset($url_parser_php)) {
$body_ary = explode("\n", $body);
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);
+
+ $Quotes = 0;
+ $pos = 0;
+ while (1)
+ {
+ if (strpos($line, ' ', $pos) === $pos)
+ {
+ $pos += 6;
+ }
+ else if (strpos($line, '>', $pos) === $pos)
+ {
+ $pos += 4;
+ $Quotes ++;
+ }
+ else
+ {
+ break;
+ }
+ }
- $test_line = str_replace(' ', '', $line);
- if (strpos($test_line, '>>') === 0) {
+ if ($Quotes > 1) {
$line = "<FONT COLOR=FF0000>$line</FONT>\n";
- } else if (strpos($test_line, '>') === 0) {
+ } else if ($Quotes) {
$line = "<FONT COLOR=800000>$line</FONT>\n";
}
$body_ary[$i] = $line . '<br>';
}
$body = implode("\n", $body_ary);
-
- return $body;
}
/* SquirrelMail version number -- DO NOT CHANGE */
- $version = "0.5";
+ $version = "0.6pre1 (cvs)";
function find_mailbox_name ($mailbox) {
#
# http://www.myhost.com/squirrelmail/src/login.php
- global $PHP_SELF, $SERVER_NAME, $HTTPS, $HTTP_HOST;
+ global $PHP_SELF, $SERVER_NAME, $HTTPS, $HTTP_HOST, $SERVER_PORT;
// Get the path
$path = substr($PHP_SELF, 0, strrpos($PHP_SELF, '/'));
$proto = "https://";
}
+ $port = "";
+ if (isset($SERVER_PORT)) {
+ if ($SERVER_PORT != 80) {
+ $port = sprintf(':%d', $SERVER_PORT);
+ }
+ }
+
// 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;
+ $location = $proto . $HTTP_HOST . $port . $path;
} else if(isset($SERVER_NAME) && !empty($SERVER_NAME)) {
- $location = $proto . $SERVER_NAME . $path;
+ $location = $proto . $SERVER_NAME . $port . $path;
} else {
$location = $path;
}
return $decrypted;
}
- function OneTimePadCreate ($length=100) {
- global $REMOTE_PORT, $REMOTE_IP, $UNIQUE_ID;
-
- // Entropy gathering
- if (function_exists("crc32")) {
- $seed1 = (double) microtime() * 1000000;
- $seed2 = md5($REMOTE_PORT . $REMOTE_IP . $UNIQUE_ID);
- if (function_exists("getrusage")) {
- $dat = getrusage();
- $seed3 = md5($dat["ru_nswap"].$dat["ru_majflt"].$dat["ru_utime.tv_sec"].$dat["ru_utime.tv_usec"].getmypid());
- } else {
- $seed3 = getmypid();
- }
-
- $seed = crc32($seed1)*1000000 + crc32($seed2)*10000 + crc32($seed3);
- } else {
- $seed = (double) microtime() * 1000000;
- }
- srand ($seed);
+ // Randomize the mt_rand() function. Toss this in strings or
+ // integers and it will seed the generator appropriately.
+ // With strings, it is better to get them long. Use md5() to
+ // lengthen smaller strings.
+ function sq_mt_seed($Val)
+ {
+ // if mt_getrandmax() does not return a 2^n - 1 number,
+ // this might not work well. This uses $Max as a bitmask.
+ $Max = mt_getrandmax();
+
+ if (! is_int($Val))
+ {
+ if (function_exists("crc32"))
+ {
+ $Val = crc32($Val);
+ }
+ else
+ {
+ $Str = $Val;
+ $Pos = 0;
+ $Val = 0;
+ $Mask = $Max / 2;
+ $HighBit = $Max ^ $Mask;
+ while ($Pos < strlen($Str))
+ {
+ if ($Val & $HighBit)
+ {
+ $Val = (($Val & $Mask) << 1) + 1;
+ }
+ else
+ {
+ $Val = ($Val & $Mask) << 1;
+ }
+ $Val ^= $Str[$Pos];
+ $Pos ++;
+ }
+ }
+ }
+
+ if ($Val < 0)
+ $Val *= -1;
+ if ($Val = 0)
+ return;
+
+ mt_srand(($Val ^ mt_rand(0, $Max)) & $Max);
+ }
+
+
+ // This function initializes the random number generator fairly well.
+ // It also only initializes it once, so you don't accidentally get
+ // the same 'random' numbers twice in one session.
+ function sq_mt_randomize()
+ {
+ global $REMOTE_PORT, $REMOTE_ADDR, $UNIQUE_ID;
+ static $randomized;
+
+ if ($randomized)
+ return;
+
+ // Global
+ sq_mt_seed((int)((double) microtime() * 1000000));
+ sq_mt_seed(md5($REMOTE_PORT . $REMOTE_ADDR . getmypid()));
+
+ // 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"]));
+ }
+
+ // Apache-specific
+ sq_mt_seed(md5($UNIQUE_ID));
+
+ $randomized = 1;
+ }
+
+ function OneTimePadCreate ($length=100) {
+ sq_mt_randomize();
for ($i = 0; $i < $length; $i++) {
- $pad .= chr(rand(0,255));
+ $pad .= chr(mt_rand(0,255));
}
return $pad;
if($vrel[0] == "r" || $vrel[0] == "R")
$vrel = - strval(substr($vrel, 2))/10;
- // Compare major and minor
+ // Compare major version
if($vmajor < $major) return false;
+ if($vmajor > $major) return true;
+
+ // Major is the same. Compare minor
if($vminor < $minor) return false;
+ if($vminor > $minor) return true;
+ // Major and minor is the same as the required one.
// Compare release
if($vrel >= 0 && $release >= 0) { // Neither are beta
if($vrel < $release) return false;
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 . '<small> ' . $type . '</small>';
+ }
?>
projects / squirrelmail.git / blobdiff