X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fstrings.php;h=70bf69a1a93f388d42df945e1c1d731cea6bdb65;hb=9374671f3056dc99d53f3a10927ae9ebc8a39eb5;hp=0a5699a8ed9870f755609426923e2645b4969dc8;hpb=23fd3c8ebf96b73c2d4d09e80c04d5031fb8fc13;p=squirrelmail.git diff --git a/functions/strings.php b/functions/strings.php index 0a5699a8..70bf69a1 100644 --- a/functions/strings.php +++ b/functions/strings.php @@ -1,15 +1,19 @@ = strlen($haystack)) return -1; $pos++; - } - return $pos; + } + return $pos; } // Wraps text at $wrap characters @@ -52,48 +65,48 @@ // 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); + ereg("^([\t >]*)([^\t >].*)?$", $line, $regs); $beginning_spaces = $regs[1]; - if (isset($regs[2])) { + if (isset($regs[2])) { $words = explode(' ', $regs[2]); } else { $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]); + 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])) + if (isset($words[$i])) $line_len += strlen($words[$i]) + 1; - else - $line_len += 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 + // Go to the next line if we have more to process if ($i < count($words)) { - $line .= "\n$beginning_spaces"; + $line .= "\n" . $beginning_spaces; } } } - - + + // Does the opposite of sqWordWrap() function sqUnWordWrap(&$body) { @@ -102,9 +115,9 @@ $PreviousSpaces = ""; for ($i = 0; $i < count($lines); $i ++) { - preg_match("/^([\s>]*)([^\s>].*)?$/", $lines[$i], $regs); + ereg("^([\t >]*)([^\t >].*)?$", $lines[$i], $regs); $CurrentSpaces = $regs[1]; - if (isset($regs[2])) + if (isset($regs[2])) $CurrentRest = $regs[2]; if ($i == 0) { @@ -125,7 +138,7 @@ } $body .= "\n"; } - + /** Returns an array of email addresses **/ /* Be cautious of "user@host.com" */ @@ -134,13 +147,13 @@ return array(); $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++) { - $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; } @@ -148,33 +161,35 @@ function getLineOfAddrs($array) { if (is_array($array)) { $to_line = implode(', ', $array); - $to_line = trim(ereg_replace(',,+', ',', $to_line)); + $to_line = trim(ereg_replace(', (, )+', ', ', $to_line)); } else { $to_line = ''; } - return $to_line; + + if( substr( $to_line, -1 ) == ',' ) + $to_line = substr( $to_line, 0, strlen( $to_line ) - 1 ); + + return( $to_line ); } function translateText(&$body, $wrap_at, $charset) { global $where, $what; // from searching - global $url_parser_php; + global $color; // color theme + + require_once('../functions/url_parser.php'); - if (!isset($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]; if (strlen($line) - 2 >= $wrap_at) { - sqWordWrap($line, $wrap_at); + sqWordWrap($line, $wrap_at); } $line = charset_decode($charset, $line); $line = str_replace("\t", ' ', $line); - + parseUrl ($line); - + $Quotes = 0; $pos = 0; while (1) @@ -193,11 +208,16 @@ break; } } - - 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; } @@ -205,22 +225,11 @@ } /* SquirrelMail version number -- DO NOT CHANGE */ - $version = '1.0.1 [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); @@ -228,35 +237,35 @@ } - 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 - # you (although it should), you can remove all this + # you (although it should), you can remove all this # code except the last two lines, and change the header() # function to look something like this, customized to # the location of SquirrelMail on your server: # # 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) && !strcasecmp($HTTPS, 'on') ) { + // 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 = ''; if (isset($HTTP_HOST) && !empty($HTTP_HOST)) @@ -267,7 +276,7 @@ { $host = $SERVER_NAME; } - + $port = ''; if (! strstr($host, ':')) { @@ -278,20 +287,13 @@ } } } - + 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. - return $path; - } - - function sqStripSlashes($string) { - if (get_magic_quotes_gpc()) { - $string = stripslashes($string); - } - return $string; + return $path; } @@ -301,7 +303,7 @@ $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); @@ -312,7 +314,7 @@ $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; @@ -328,7 +330,7 @@ // 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')) @@ -365,8 +367,8 @@ 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. @@ -374,37 +376,41 @@ { global $REMOTE_PORT, $REMOTE_ADDR, $UNIQUE_ID; static $randomized; - + if ($randomized) return; - - // Global + + // Global sq_mt_seed((int)((double) microtime() * 1000000)); sq_mt_seed(md5($REMOTE_PORT . $REMOTE_ADDR . getmypid())); - + // getrusage if (function_exists('getrusage')) { - $dat = getrusage(); - $Str = ''; - foreach ($dat as $k => $v) + // Avoid warnings with Win32 + $dat = @getrusage(); + if (isset($dat) && is_array($dat)) { - $Str .= "$k = $v\n"; + $Str = ''; + foreach ($dat as $k => $v) + { + $Str .= $k . $v; + } + sq_mt_seed(md5($Str)); } - sq_mt_seed(md5($Str)); } - + // Apache-specific sq_mt_seed(md5($UNIQUE_ID)); - + $randomized = 1; } - + 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 base64_encode($pad); @@ -418,19 +424,19 @@ 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; - + 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; + // Compare major version if($vmajor < $major) return false; if($vmajor > $major) return true; @@ -438,34 +444,34 @@ // 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; + 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; } - + /* 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; @@ -474,7 +480,7 @@ } else settype($bytes, 'integer'); - + return $bytes . ' ' . $type . ''; } @@ -485,7 +491,7 @@ * 2 = add uppercase A-Z to $chars * 4 = add numbers 0-9 to $chars */ - + function GenerateRandomString($size, $chars, $flags = 0) { if ($flags & 0x1) @@ -494,18 +500,23 @@ $chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; if ($flags & 0x4) $chars .= '0123456789'; - + if ($size < 1 || strlen($chars) < 1) return ''; - + sq_mt_randomize(); // Initialize the random number generator - - $String = ""; + + $String = ""; while (strlen($String) < $size) { $String .= $chars[mt_rand(0, strlen($chars))]; } - + return $String; } -?> + function quoteIMAP($str) + { + return ereg_replace('(["\\])', '\\\\1', $str); + } + +?> \ No newline at end of file