X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fstrings.php;h=96e8fb5ebf1473faa0aefd977bd568b8aafaa14b;hb=e5f1e71c936450344f86a6ce4126e5d8264b1d91;hp=60e20393509cda245f7c4a8b2876e816fc8d3e75;hpb=24d6ceca676306a3f12decf36ce21865acdf64df;p=squirrelmail.git diff --git a/functions/strings.php b/functions/strings.php index 60e20393..96e8fb5e 100644 --- a/functions/strings.php +++ b/functions/strings.php @@ -3,7 +3,7 @@ /** * strings.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Copyright (c) 1999-2003 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * * This code provides various string manipulation functions that are @@ -16,7 +16,15 @@ * SquirrelMail version number -- DO NOT CHANGE */ global $version; -$version = '1.3.0 [CVS-DEVEL]'; +$version = '1.4.0 [CVS-DEVEL]'; + +/** + * SquirrelMail internal version number -- DO NOT CHANGE + * $sm_internal_version = array (release, major, minor) + */ +global $SQM_INTERNAL_VERSION; +$SQM_INTERNAL_VERSION = array(1,4,0); + /** * Wraps text at $wrap characters @@ -69,6 +77,38 @@ function sqWordWrap(&$line, $wrap) { } } +/** + * Does the opposite of sqWordWrap() + */ +function sqUnWordWrap(&$body) { + $lines = explode("\n", $body); + $body = ''; + $PreviousSpaces = ''; + $cnt = count($lines); + for ($i = 0; $i < $cnt; $i ++) { + preg_match("/^([\t >]*)([^\t >].*)?$/", $lines[$i], $regs); + $CurrentSpaces = $regs[1]; + if (isset($regs[2])) { + $CurrentRest = $regs[2]; + } else { + $CurrentRest = ''; + } + + 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"; +} + /** * If $haystack is a full mailbox name and $needle is the mailbox * separator character, returns the last part of the mailbox name. @@ -124,17 +164,17 @@ function getLineOfAddrs($array) { } function php_self () { - global $PHP_SELF, $HTTP_SERVER_VARS; + global $PHP_SELF, $_SERVER; - if (isset($HTTP_SERVER_VARS['REQUEST_URI']) && !empty($HTTP_SERVER_VARS['REQUEST_URI']) ) { - return $HTTP_SERVER_VARS['REQUEST_URI']; + if (isset($_SERVER['REQUEST_URI']) && !empty($_SERVER['REQUEST_URI']) ) { + return $_SERVER['REQUEST_URI']; } if (isset($PHP_SELF) && !empty($PHP_SELF)) { return $PHP_SELF; - } else if (isset($HTTP_SERVER_VARS['PHP_SELF']) && - !empty($HTTP_SERVER_VARS['PHP_SELF'])) { - return $HTTP_SERVER_VARS['PHP_SELF']; + } else if (isset($_SERVER['PHP_SELF']) && + !empty($_SERVER['PHP_SELF'])) { + return $_SERVER['PHP_SELF']; } else { return ''; } @@ -152,8 +192,7 @@ function php_self () { */ function get_location () { - global $PHP_SELF, $SERVER_NAME, $HTTP_HOST, $SERVER_PORT, - $HTTP_SERVER_VARS; + global $_SERVER, $imap_server_type; /* Get the path, handle virtual directories */ $path = substr(php_self(), 0, strrpos(php_self(), '/')); @@ -163,39 +202,45 @@ function get_location () { /* * If you have 'SSLOptions +StdEnvVars' in your apache config - * OR if you have HTTPS in your HTTP_SERVER_VARS + * OR if you have HTTPS=on 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)) { + (isset($_SERVER['HTTPS']) && + !strcasecmp($_SERVER['HTTPS'], 'on')) || + (isset($_SERVER['SERVER_PORT']) && + $_SERVER['SERVER_PORT'] == 443)) { $proto = 'https://'; } /* 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; - } else if (isset($HTTP_SERVER_VARS['SERVER_NAME']) && - !empty($HTTP_SERVER_VARS['SERVER_NAME'])) { - $host = $HTTP_SERVER_VARS['SERVER_NAME']; + if (isset($_SERVER['HTTP_HOST']) && !empty($_SERVER['HTTP_HOST'])) { + $host = $_SERVER['HTTP_HOST']; + } else if (isset($_SERVER['SERVER_NAME']) && + !empty($_SERVER['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 (isset($_SERVER['SERVER_PORT'])) { + if (($_SERVER['SERVER_PORT'] != 80 && $proto == 'http://') + || ($_SERVER['SERVER_PORT'] != 443 && $proto == 'https://')) { + $port = sprintf(':%d', $_SERVER['SERVER_PORT']); } } } + /* this is a workaround for the weird macosx caching that + causes Apache to return 16080 as the port number, which causes + SM to bail */ + + if ($imap_server_type == 'macosx' && $port == ':16080') { + $port = ''; + } + /* Fallback is to omit the server name and use a relative */ /* URI, although this is not RFC 2616 compliant. */ return ($host ? $proto . $host . $port . $path : $path); @@ -239,24 +284,7 @@ function sq_mt_seed($Val) { $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) { @@ -277,7 +305,7 @@ function sq_mt_seed($Val) { * the same 'random' numbers twice in one session. */ function sq_mt_randomize() { - global $REMOTE_PORT, $REMOTE_ADDR, $UNIQUE_ID; + global $_SERVER; static $randomized; if ($randomized) { @@ -286,7 +314,7 @@ function sq_mt_randomize() { /* Global. */ sq_mt_seed((int)((double) microtime() * 1000000)); - sq_mt_seed(md5($REMOTE_PORT . $REMOTE_ADDR . getmypid())); + sq_mt_seed(md5($_SERVER['REMOTE_PORT'] . $_SERVER['REMOTE_ADDR'] . getmypid())); /* getrusage */ if (function_exists('getrusage')) { @@ -302,8 +330,9 @@ function sq_mt_randomize() { } } - /* Apache-specific */ - sq_mt_seed(md5($UNIQUE_ID)); + if(isset($_SERVER['UNIQUE_ID'])) { + sq_mt_seed(md5($_SERVER['UNIQUE_ID'])); + } $randomized = 1; } @@ -320,53 +349,11 @@ function OneTimePadCreate ($length=100) { } /** - * Check if we have a required PHP-version. Return TRUE if we do, - * or FALSE if we don't. - * - * To check for 4.0.1, use sqCheckPHPVersion(4,0,1) - * To check for 4.0b3, use sqCheckPHPVersion(4,0,-3) - * - * Does not handle betas like 4.0.1b1 or development versions + * Duplicate function: obsoleted. Use check_php_version. */ function sqCheckPHPVersion($major, $minor, $release) { - - $ver = phpversion(); - 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; - } - - /* 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; - } else if($vrel >= 0 && $release < 0) { /* This is not beta, required is beta */ - return true; - } else if($vrel < 0 && $release >= 0){ /* This is beta, require not beta */ - return false; - } else { /* Both are beta */ - if($vrel > $release) return false; - } - - return true; + + return check_php_version($major, $minor, $release); } /** @@ -378,7 +365,7 @@ function show_readable_size($bytes) { if ($bytes / 1024 > 1) { $bytes /= 1024; - $type = 'm'; + $type = 'M'; } if ($bytes < 10) {