X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fstrings.php;h=459eeb7093437778300e4ed19054967e0d237c54;hb=a7f3c40d541b7c780b28ba45a9f46a8460ebab6c;hp=6d82b88d2cbd8379afc5fbf8d6eb0c6379125d38;hpb=30f64711d64877207bebea50f406d3456f630d7e;p=squirrelmail.git
diff --git a/functions/strings.php b/functions/strings.php
index 6d82b88d..459eeb70 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -6,29 +6,18 @@
// Count the number of occurances of $needle are in $haystack.
//*************************************************************************
function countCharInString($haystack, $needle) {
- $len = strlen($haystack);
- for ($i = 0; $i < $len; $i++) {
- if ($haystack[$i] == $needle)
- $count++;
- }
- return $count;
+ $haystack = ereg_replace("[^$needle]","",$haystack);
+ return strlen($haystack);
}
//*************************************************************************
// Read from the back of $haystack until $needle is found, or the begining
- // of the $haystack is reached.
+ // of the $haystack is reached. $needle is a single character
//*************************************************************************
function readShortMailboxName($haystack, $needle) {
- if (substr($haystack, -1) == $needle)
- $haystack = substr($haystack, 0, strlen($haystack) - 1);
-
- if (strrpos($haystack, $needle)) {
- $pos = strrpos($haystack, $needle) + 1;
- $data = substr($haystack, $pos, strlen($haystack));
- } else {
- $data = $haystack;
- }
- return $data;
+ if ($needle == ".") $needle = "\.";
+ ereg("([^$needle]+)$needle?$", $haystack, $regs);
+ return $regs[1];
}
// Searches for the next position in a string minus white space
@@ -48,51 +37,82 @@
// 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);
+ 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 += strlen($words[$i]) + 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 ++;
- // Skip spaces if they are the first thing on a continued line
- while (!$words[$i] && $i < count($words))
- {
- $i ++;
- }
+ // Add more words (as long as they fit)
+ while ($line_len < $wrap && $i < count($words)) {
+ $line .= ' ' . $words[$i];
+ $i++;
+ $line_len += strlen($words[$i]) + 1;
+ }
- if ($i < count($words)) {
- $line .= "\n$beginning_spaces";
- }
+ // Skip spaces if they are the first thing on a continued line
+ while (!$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];
}
}
+
+
+ // 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];
+ $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) == "") {
+ if (trim($text) == "")
return;
- }
$text = str_replace(" ", "", $text);
- $text = ereg_replace( '"[^"]*"', "", $text);
+ $text = ereg_replace('"[^"]*"', "", $text);
+ $text = ereg_replace("\([^\)]*\)", "", $text);
$text = str_replace(",", ";", $text);
$array = explode(";", $text);
for ($i = 0; $i < count ($array); $i++) {
@@ -121,6 +141,7 @@
}
$body_ary = explode("\n", $body);
+ $PriorQuotes = 0;
for ($i=0; $i < count($body_ary); $i++) {
$line = $body_ary[$i];
if (strlen($line) - 2 >= $wrap_at) {
@@ -129,18 +150,15 @@
$line = charset_decode($charset, $line);
$line = str_replace("\t", ' ', $line);
- $line = str_replace(' ', ' ', $line);
- $line = nl2br($line);
-
parseUrl ($line);
$Quotes = 0;
$pos = 0;
while (1)
{
- if (strpos($line, ' ', $pos) === $pos)
+ if ($line[$pos] == ' ')
{
- $pos += 6;
+ $pos ++;
}
else if (strpos($line, '>', $pos) === $pos)
{
@@ -153,27 +171,22 @@
}
}
- if ($Quotes > 1) {
- $line = "$line\n";
- } else if ($Quotes) {
- $line = "$line\n";
- }
-
- if ($line)
- {
- $line = '' . $line . '';
- }
+ if ($Quotes > 1)
+ $line = "$line";
+ elseif ($Quotes)
+ $line = "$line";
- $body_ary[$i] = $line . '
';
+ $body_ary[$i] = $line;
}
- $body = implode("\n", $body_ary);
+ $body = "" . implode("\n", $body_ary) . "";
}
/* SquirrelMail version number -- DO NOT CHANGE */
- $version = "0.6pre1 (cvs)";
+ $version = "1.0pre1 (cvs)";
function find_mailbox_name ($mailbox) {
+/*
$mailbox = trim($mailbox);
if (substr($mailbox, strlen($mailbox)-1, strlen($mailbox)) == "\"") {
$mailbox = substr($mailbox, 0, strlen($mailbox) - 1);
@@ -183,6 +196,13 @@
$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) {
@@ -214,24 +234,34 @@
$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.
+ $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) {
@@ -392,5 +422,58 @@
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
+
+ while (strlen($String) < $size) {
+ $String .= $chars[mt_rand(0, strlen($chars))];
+ }
+
+ return $String;
+ }
?>