X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fstrings.php;h=8f278b12c115aa25c94a5282f61ba241281c1798;hb=40f200abbb548b1eb40a437ce70b32ee7ae867bb;hp=b4d1a5406549c10609cc94438d52502f8db26a61;hpb=0795e24071b2d8d2a24ee7b75d5b1b6b36b123dc;p=squirrelmail.git diff --git a/functions/strings.php b/functions/strings.php index b4d1a540..8f278b12 100644 --- a/functions/strings.php +++ b/functions/strings.php @@ -12,19 +12,27 @@ * $Id$ */ + /** * SquirrelMail version number -- DO NOT CHANGE */ global $version; -$version = '1.4.0 [CVS-DEVEL]'; +$version = '1.5.0 [CVS]'; /** * 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); +$SQM_INTERNAL_VERSION = array(1,5,0); + +/** + * There can be a circular issue with includes, where the $version string is + * referenced by the include of global.php, etc. before it's defined. + * For that reason, bring in global.php AFTER we define the version strings. + */ +require_once(SM_PATH . 'functions/global.php'); /** * Wraps text at $wrap characters @@ -36,6 +44,16 @@ $SQM_INTERNAL_VERSION = array(1,4,0); * This should not add newlines to the end of lines. */ function sqWordWrap(&$line, $wrap) { + global $languages, $squirrelmail_language; + + if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && + function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { + if (mb_detect_encoding($line) != 'ASCII') { + $line = $languages[$squirrelmail_language]['XTRA_CODE']('wordwrap', $line, $wrap); + return; + } + } + ereg("^([\t >]*)([^\t >].*)?$", $line, $regs); $beginning_spaces = $regs[1]; if (isset($regs[2])) { @@ -81,6 +99,12 @@ function sqWordWrap(&$line, $wrap) { * Does the opposite of sqWordWrap() */ function sqUnWordWrap(&$body) { + global $squirrelmail_language; + + if ($squirrelmail_language == 'ja_JP') { + return; + } + $lines = explode("\n", $body); $body = ''; $PreviousSpaces = ''; @@ -164,20 +188,15 @@ function getLineOfAddrs($array) { } function php_self () { - global $PHP_SELF, $_SERVER; - - 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($_SERVER['PHP_SELF']) && - !empty($_SERVER['PHP_SELF'])) { - return $_SERVER['PHP_SELF']; - } else { - return ''; + if ( sqgetGlobalVar('REQUEST_URI', $req_uri, SQ_SERVER) && !empty($req_uri) ) { + return $req_uri; } + + if ( sqgetGlobalVar('PHP_SELF', $php_self, SQ_SERVER) && !empty($php_self) ) { + return $php_self; + } + + return ''; } @@ -192,11 +211,15 @@ function php_self () { */ function get_location () { - global $_SERVER, $imap_server_type; - + global $imap_server_type; + /* Get the path, handle virtual directories */ $path = substr(php_self(), 0, strrpos(php_self(), '/')); - + + if ( sqgetGlobalVar('sq_base_url', $full_url, SQ_SESSION) ) { + return $full_url . $path; + } + /* Check if this is a HTTPS or regular HTTP request. */ $proto = 'http://'; @@ -207,28 +230,24 @@ function get_location () { */ $getEnvVar = getenv('HTTPS'); if ((isset($getEnvVar) && !strcasecmp($getEnvVar, 'on')) || - (isset($_SERVER['HTTPS']) && - !strcasecmp($_SERVER['HTTPS'], 'on')) || - (isset($_SERVER['SERVER_PORT']) && - $_SERVER['SERVER_PORT'] == 443)) { + (sqgetGlobalVar('HTTPS', $https_on, SQ_SERVER) && !strcasecmp($https_on, 'on')) || + (sqgetGlobalVar('SERVER_PORT', $server_port, SQ_SERVER) && $server_port == 443)) { $proto = 'https://'; } /* Get the hostname from the Host header or server config. */ - $host = ''; - if (isset($_SERVER['HTTP_HOST']) && !empty($_SERVER['HTTP_HOST'])) { - $host = $_SERVER['HTTP_HOST']; - } else if (isset($_SERVER['SERVER_NAME']) && - !empty($_SERVER['SERVER_NAME'])) { + if ( !sqgetGlobalVar('HTTP_HOST', $host, SQ_SERVER) || empty($host) ) { + if ( !sqgetGlobalVar('SERVER_NAME', $host, SQ_SERVER) || empty($host) ) { + $host = ''; + } } - $port = ''; if (! strstr($host, ':')) { - if (isset($_SERVER['SERVER_PORT'])) { - if (($_SERVER['SERVER_PORT'] != 80 && $proto == 'http://') - || ($_SERVER['SERVER_PORT'] != 443 && $proto == 'https://')) { - $port = sprintf(':%d', $_SERVER['SERVER_PORT']); + if (sqgetGlobalVar('SERVER_PORT', $server_port, SQ_SERVER)) { + if (($server_port != 80 && $proto == 'http://') || + ($server_port != 443 && $proto == 'https://')) { + $port = sprintf(':%d', $server_port); } } } @@ -241,9 +260,11 @@ function get_location () { $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); + /* Fallback is to omit the server name and use a relative */ + /* URI, although this is not RFC 2616 compliant. */ + $full_url = ($host ? $proto . $host . $port : ''); + sqsession_register($full_url, 'sq_base_url'); + return $full_url . $path; } @@ -305,7 +326,6 @@ function sq_mt_seed($Val) { * the same 'random' numbers twice in one session. */ function sq_mt_randomize() { - global $_SERVER; static $randomized; if ($randomized) { @@ -313,8 +333,10 @@ function sq_mt_randomize() { } /* Global. */ + sqgetGlobalVar('REMOTE_PORT', $remote_port, SQ_SERVER); + sqgetGlobalVar('REMOTE_ADDR', $remote_addr, SQ_SERVER); sq_mt_seed((int)((double) microtime() * 1000000)); - sq_mt_seed(md5($_SERVER['REMOTE_PORT'] . $_SERVER['REMOTE_ADDR'] . getmypid())); + sq_mt_seed(md5($remote_port . $remote_addr . getmypid())); /* getrusage */ if (function_exists('getrusage')) { @@ -330,8 +352,8 @@ function sq_mt_randomize() { } } - if(isset($_SERVER['UNIQUE_ID'])) { - sq_mt_seed(md5($_SERVER['UNIQUE_ID'])); + if(sqgetGlobalVar('UNIQUE_ID', $unique_id, SQ_SERVER)) { + sq_mt_seed(md5($unique_id)); } $randomized = 1; @@ -348,56 +370,6 @@ function OneTimePadCreate ($length=100) { return base64_encode($pad); } -/** - * 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 - */ -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; -} - /** * Returns a string showing the size of the message/attachment. */ @@ -407,7 +379,7 @@ function show_readable_size($bytes) { if ($bytes / 1024 > 1) { $bytes /= 1024; - $type = 'm'; + $type = 'M'; } if ($bytes < 10) { @@ -456,7 +428,7 @@ function GenerateRandomString($size, $chars, $flags = 0) { return $String; } -function quoteIMAP($str) { +function quoteimap($str) { return ereg_replace('(["\\])', '\\\\1', $str); }