X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fstrings.php;h=0230be1baf13a15a1d87ac918c332c7ddff6b403;hb=2c86c02c16613d2e95d735e15b2b26d17c563453;hp=26f07d1aad48324de3cce821b66f52081da493fa;hpb=4deb32f170f1c79c56251663af848adc98cdfa0d;p=squirrelmail.git
diff --git a/functions/strings.php b/functions/strings.php
index 26f07d1a..0230be1b 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
@@ -12,64 +12,21 @@
* $Id$
*/
+require_once(SM_PATH . 'functions/global.php');
+
/**
* SquirrelMail version number -- DO NOT CHANGE
*/
global $version;
-$version = '1.2.5 [cvs]';
-
-/**
- * If $haystack is a full mailbox name and $needle is the mailbox
- * separator character, returns the last part of the mailbox name.
- */
-function readShortMailboxName($haystack, $needle) {
- if ($needle == '') {
- return $haystack;
- }
- $parts = explode($needle, $haystack);
- $elem = array_pop($parts);
- while ($elem == '' && count($parts)) {
- $elem = array_pop($parts);
- }
- return $elem;
-}
-
-/**
- * If $haystack is a full mailbox name, and $needle is the mailbox
- * separator character, returns the second last part of the full
- * mailbox name (i.e. the mailbox's parent mailbox)
- */
-function readMailboxParent($haystack, $needle) {
- if ($needle == '') return '';
- $parts = explode($needle, $haystack);
- $elem = array_pop($parts);
- while ($elem == '' && count($parts)) {
- $elem = array_pop($parts);
- }
- return join($needle, $parts);
-}
+$version = '1.4.0 [CVS-DEVEL]';
-/**
- * Returns the index of the first chunk of string $haystack that
- * starts with non-white-space character, starting at position $pos.
- * If there is no such chunk, returns -1.
+/**
+ * SquirrelMail internal version number -- DO NOT CHANGE
+ * $sm_internal_version = array (release, major, minor)
*/
-function next_pos_minus_white ($haystack, $pos) {
- $len = strlen($haystack);
- while ($pos < $len) {
- /* Get the next character. */
- $c = substr($haystack, $pos, 1);
-
- /* Check the next character. */
- if (($c != ' ') && ($c != "\t") && ($c != "\n") && ($c != "\r")) {
- return $pos;
- }
+global $SQM_INTERNAL_VERSION;
+$SQM_INTERNAL_VERSION = array(1,4,0);
- /* Increment position in string. */
- ++$pos;
- }
- return -1;
-}
/**
* Wraps text at $wrap characters
@@ -117,12 +74,11 @@ function sqWordWrap(&$line, $wrap) {
/* Go to the next line if we have more to process */
if ($i < count($words)) {
- $line .= "\n" . $beginning_spaces;
+ $line .= "\n";
}
}
}
-
/**
* Does the opposite of sqWordWrap()
*/
@@ -130,12 +86,15 @@ function sqUnWordWrap(&$body) {
$lines = explode("\n", $body);
$body = '';
$PreviousSpaces = '';
- for ($i = 0; $i < count($lines); $i ++) {
- ereg("^([\t >]*)([^\t >].*)?$", $lines[$i], $regs);
+ $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;
@@ -152,6 +111,23 @@ function sqUnWordWrap(&$body) {
$body .= "\n";
}
+/**
+ * If $haystack is a full mailbox name and $needle is the mailbox
+ * separator character, returns the last part of the mailbox name.
+ */
+function readShortMailboxName($haystack, $needle) {
+
+ if ($needle == '') {
+ $elem = $haystack;
+ } else {
+ $parts = explode($needle, $haystack);
+ $elem = array_pop($parts);
+ while ($elem == '' && count($parts)) {
+ $elem = array_pop($parts);
+ }
+ }
+ return( $elem );
+}
/**
* Returns an array of email addresses.
@@ -189,77 +165,16 @@ function getLineOfAddrs($array) {
return( $to_line );
}
-function translateText(&$body, $wrap_at, $charset) {
- global $where, $what; /* from searching */
- global $color; /* color theme */
-
- require_once('../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);
- }
- $line = charset_decode($charset, $line);
- $line = str_replace("\t", ' ', $line);
-
- parseUrl ($line);
-
- $Quotes = 0;
- $pos = 0;
- while (1) {
- if ($line[$pos] == ' ') {
- $pos ++;
- } else if (strpos($line, '>', $pos) === $pos) {
- $pos += 4;
- $Quotes ++;
- } else {
- break;
- }
- }
-
- 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) . '';
-}
-
-function find_mailbox_name ($mailbox) {
- if (ereg(" *\"([^\r\n\"]*)\"[ \r\n]*$", $mailbox, $regs))
- return $regs[1];
- ereg(" *([^ \r\n\"]*)[ \r\n]*$",$mailbox,$regs);
- return $regs[1];
-
-}
-
function php_self () {
- global $PHP_SELF, $HTTP_SERVER_VARS;
-
- if (isset($HTTP_SERVER_VARS['REQUEST_URI']) && !empty($HTTP_SERVER_VARS['REQUEST_URI']) ) {
- return $HTTP_SERVER_VARS['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 {
- 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 '';
}
@@ -274,53 +189,60 @@ function php_self () {
*/
function get_location () {
- global $PHP_SELF, $SERVER_NAME, $HTTP_HOST, $SERVER_PORT,
- $HTTP_SERVER_VARS;
-
+ 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://';
/*
* 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)) {
+ (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($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 ( !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_PORT)) {
- if (($SERVER_PORT != 80 && $proto == 'http://')
- || ($SERVER_PORT != 443 && $proto == 'https://')) {
- $port = sprintf(':%d', $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);
}
}
}
- /* 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);
+ /* 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. */
+ $full_url = ($host ? $proto . $host . $port : '');
+ sqsession_register($full_url, 'sq_base_url');
+ return $full_url . $path;
}
@@ -361,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) {
@@ -399,7 +304,6 @@ function sq_mt_seed($Val) {
* the same 'random' numbers twice in one session.
*/
function sq_mt_randomize() {
- global $REMOTE_PORT, $REMOTE_ADDR, $UNIQUE_ID;
static $randomized;
if ($randomized) {
@@ -407,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($REMOTE_PORT . $REMOTE_ADDR . getmypid()));
+ sq_mt_seed(md5($remote_port . $remote_addr . getmypid()));
/* getrusage */
if (function_exists('getrusage')) {
@@ -424,8 +330,9 @@ function sq_mt_randomize() {
}
}
- /* Apache-specific */
- sq_mt_seed(md5($UNIQUE_ID));
+ if(sqgetGlobalVar('UNIQUE_ID', $unique_id, SQ_SERVER)) {
+ sq_mt_seed(md5($unique_id));
+ }
$randomized = 1;
}
@@ -441,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.
*/
@@ -500,7 +357,7 @@ function show_readable_size($bytes) {
if ($bytes / 1024 > 1) {
$bytes /= 1024;
- $type = 'm';
+ $type = 'M';
}
if ($bytes < 10) {
@@ -537,18 +394,19 @@ function GenerateRandomString($size, $chars, $flags = 0) {
if (($size < 1) || (strlen($chars) < 1)) {
return '';
}
-
+
sq_mt_randomize(); /* Initialize the random number generator */
-
+
$String = '';
+ $j = strlen( $chars ) - 1;
while (strlen($String) < $size) {
- $String .= $chars[mt_rand(0, strlen($chars))];
+ $String .= $chars{mt_rand(0, $j)};
}
-
+
return $String;
}
-function quoteIMAP($str) {
+function quoteimap($str) {
return ereg_replace('(["\\])', '\\\\1', $str);
}