X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fstrings.php;h=0230be1baf13a15a1d87ac918c332c7ddff6b403;hb=3f4c6c3b884fffd8a0cc64b006e1bdc0d13b06cf;hp=068691c010cad0aaecaefbf96e61010d966745da;hpb=76911253eb850bacde3d86c8cb7b4af072e67ebe;p=squirrelmail.git diff --git a/functions/strings.php b/functions/strings.php index 068691c0..0230be1b 100644 --- a/functions/strings.php +++ b/functions/strings.php @@ -12,11 +12,13 @@ * $Id$ */ +require_once(SM_PATH . 'functions/global.php'); + /** * SquirrelMail version number -- DO NOT CHANGE */ global $version; -$version = '1.4.0 RC1'; +$version = '1.4.0 [CVS-DEVEL]'; /** * SquirrelMail internal version number -- DO NOT CHANGE @@ -164,20 +166,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 +189,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 +208,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 +238,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; } @@ -284,24 +283,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) { @@ -322,7 +304,6 @@ function sq_mt_seed($Val) { * the same 'random' numbers twice in one session. */ function sq_mt_randomize() { - global $_SERVER; static $randomized; if ($randomized) { @@ -330,8 +311,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')) { @@ -347,8 +330,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; @@ -365,56 +348,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. */ @@ -424,7 +357,7 @@ function show_readable_size($bytes) { if ($bytes / 1024 > 1) { $bytes /= 1024; - $type = 'm'; + $type = 'M'; } if ($bytes < 10) { @@ -473,7 +406,7 @@ function GenerateRandomString($size, $chars, $flags = 0) { return $String; } -function quoteIMAP($str) { +function quoteimap($str) { return ereg_replace('(["\\])', '\\\\1', $str); }