X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fstrings.php;h=dcef5bd0c11200de57a3626f18b4b0f020335fd8;hp=ff4b7c7b93b18eebb53edfdf2d14a6e167e78489;hb=9e0d6b0aded83550c1723746dc9a09f92fe22cb5;hpb=8ceb637a7043efb76fc7028be743da5a32f2a530 diff --git a/functions/strings.php b/functions/strings.php index ff4b7c7b..dcef5bd0 100644 --- a/functions/strings.php +++ b/functions/strings.php @@ -1,13 +1,19 @@ ]*)([^\s>].*)?$/", $line, $regs); + ereg("^([\t >]*)([^\t >].*)?$", $line, $regs); $beginning_spaces = $regs[1]; - $words = explode(" ", $regs[2]); + if (isset($regs[2])) { + $words = explode(' ', $regs[2]); + } else { + $words = ""; + } $i = 0; $line = $beginning_spaces; @@ -49,25 +79,29 @@ 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; + $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++; - $line_len += strlen($words[$i]) + 1; + 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 (!$words[$i] && $i < count($words)) { + 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"; + $line .= "\n" . $beginning_spaces; } } } @@ -81,9 +115,10 @@ $PreviousSpaces = ""; for ($i = 0; $i < count($lines); $i ++) { - preg_match("/^([\s>]*)([^\s>].*)?$/", $lines[$i], $regs); + ereg("^([\t >]*)([^\t >].*)?$", $lines[$i], $regs); $CurrentSpaces = $regs[1]; - $CurrentRest = $regs[2]; + if (isset($regs[2])) + $CurrentRest = $regs[2]; if ($i == 0) { $PreviousSpaces = $CurrentSpaces; @@ -106,38 +141,38 @@ /** 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 = ereg_replace("\([^\)]*\)", "", $text); - $text = str_replace(",", ";", $text); - $array = explode(";", $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; } /** 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) { global $where, $what; // from searching + global $color; // color theme - if (!isset($url_parser_php)) { - include "../functions/url_parser.php"; - } + include '../functions/url_parser.php'; $body_ary = explode("\n", $body); $PriorQuotes = 0; @@ -170,33 +205,27 @@ } } - if ($Quotes > 1) - $line = "$line"; - elseif ($Quotes) - $line = "$line"; + if ($Quotes > 1) { + if (! isset($color[14])) + $color[14] = '#FF0000'; + $line = '' . $line . ''; + } elseif ($Quotes) { + if (! isset($color[13])) + $color[13] = '#800000'; + $line = '' . $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)"; + global $version; + $version = '1.2.0 [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); @@ -204,14 +233,6 @@ } - function replace_spaces ($string) { - return str_replace(" ", " ", $string); - } - - function replace_escaped_spaces ($string) { - return str_replace(" ", " ", $string); - } - function get_location () { # This determines the location to forward to relative # to your server. If this doesnt work correctly for @@ -222,19 +243,27 @@ # # http://www.myhost.com/squirrelmail/src/login.php - global $PHP_SELF, $SERVER_NAME, $HTTPS, $HTTP_HOST, $SERVER_PORT; + global $PHP_SELF, $SERVER_NAME, $HTTP_HOST, $SERVER_PORT, + $HTTP_SERVER_VARS; // 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 you have 'SSLOptions +StdEnvVars' in your apache config + // OR if you have HTTPS in your HTTP_SERVER_VARS + // OR if you are on port 443 + $getEnvVar = getenv('HTTPS'); + if ((isset($getEnvVar) && !strcasecmp($getEnvVar, 'on')) || + (isset($HTTP_SERVER_VARS['HTTPS'])) || + (isset($HTTP_SERVER_VARS['SERVER_PORT']) && + $HTTP_SERVER_VARS['SERVER_PORT'] == 443)) { + $proto = 'https://'; } // Get the hostname from the Host header or server config. - $host = ""; + $host = ''; if (isset($HTTP_HOST) && !empty($HTTP_HOST)) { $host = $HTTP_HOST; @@ -248,7 +277,8 @@ if (! strstr($host, ':')) { if (isset($SERVER_PORT)) { - if ($SERVER_PORT != 80) { + if (($SERVER_PORT != 80 && $proto == 'http://') + || ($SERVER_PORT != 443 && $proto == 'https://')) { $port = sprintf(':%d', $SERVER_PORT); } } @@ -262,29 +292,25 @@ return $path; } - function sqStripSlashes($string) { - if (get_magic_quotes_gpc()) { - $string = stripslashes($string); - } - return $string; - } - // 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])); + $encrypted .= chr (ord($string[$i]) ^ ord($pad[$i])); } 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])); + $decrypted .= chr (ord($encrypted[$i]) ^ ord($pad[$i])); } return $decrypted; @@ -303,7 +329,7 @@ if (! is_int($Val)) { - if (function_exists("crc32")) + if (function_exists('crc32')) { $Val = crc32($Val); } @@ -355,10 +381,18 @@ 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"])); + if (function_exists('getrusage')) { + // Avoid warnings with Win32 + $dat = @getrusage(); + if (isset($dat) && is_array($dat)) + { + $Str = ''; + foreach ($dat as $k => $v) + { + $Str .= $k . $v; + } + sq_mt_seed(md5($Str)); + } } // Apache-specific @@ -369,12 +403,13 @@ function OneTimePadCreate ($length=100) { sq_mt_randomize(); - + + $pad = ''; for ($i = 0; $i < $length; $i++) { - $pad .= chr(mt_rand(0,255)); + $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, @@ -385,18 +420,18 @@ 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]); $vminor = strval($regs[2]); $vrel = $regs[3]; if($vrel[0] == ".") - $vrel = strval(substr($vrel, 1)); - if($vrel[0] == "b" || $vrel[0] == "B") - $vrel = - strval(substr($vrel, 1)); - if($vrel[0] == "r" || $vrel[0] == "R") - $vrel = - strval(substr($vrel, 2))/10; + $vrel = strval(substr($vrel, 1)); + if($vrel[0] == 'b' || $vrel[0] == 'B') + $vrel = - strval(substr($vrel, 1)); + if($vrel[0] == 'r' || $vrel[0] == 'R') + $vrel = - strval(substr($vrel, 2))/10; // Compare major version if($vmajor < $major) return false; @@ -409,13 +444,13 @@ // 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; + if($vrel < $release) return false; } else if($vrel >= 0 && $release < 0){ // This is not beta, required is beta - return true; + return true; } else if($vrel < 0 && $release >= 0){ // This is beta, require not beta - return false; + return false; } else { // Both are beta - if($vrel > $release) return false; + if($vrel > $release) return false; } return true; @@ -436,11 +471,11 @@ if ($bytes < 10) { $bytes *= 10; - settype($bytes, "integer"); + settype($bytes, 'integer'); $bytes /= 10; } else - settype($bytes, "integer"); + settype($bytes, 'integer'); return $bytes . ' ' . $type . ''; } @@ -463,15 +498,21 @@ $chars .= '0123456789'; if ($size < 1 || strlen($chars) < 1) - return ""; + return ''; sq_mt_randomize(); // Initialize the random number generator + $String = ""; while (strlen($String) < $size) { $String .= $chars[mt_rand(0, strlen($chars))]; } return $String; } + + function quoteIMAP($str) + { + return ereg_replace('(["\\])', '\\\\1', $str); + } ?>