X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fstrings.php;h=dcef5bd0c11200de57a3626f18b4b0f020335fd8;hb=358f007e212ad7428914c505f44f9ac192465224;hp=f9f258507ba018dd512f7955641a03399a2ab381;hpb=68b6d237c4f3a0b1e7e8d3715d5f8a98c0bef501;p=squirrelmail.git
diff --git a/functions/strings.php b/functions/strings.php
index f9f25850..dcef5bd0 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -2,7 +2,10 @@
/* $Id$ */
- $strings_php = true;
+ if (defined('strings_php'))
+ return;
+ define('strings_php', true);
+
//*************************************************************************
// Count the number of occurances of $needle are in $haystack.
@@ -64,11 +67,11 @@
function sqWordWrap(&$line, $wrap) {
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;
@@ -77,18 +80,18 @@
// 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
@@ -114,7 +117,7 @@
{
ereg("^([\t >]*)([^\t >].*)?$", $lines[$i], $regs);
$CurrentSpaces = $regs[1];
- if (isset($regs[2]))
+ if (isset($regs[2]))
$CurrentRest = $regs[2];
if ($i == 0)
{
@@ -148,9 +151,9 @@
$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;
}
@@ -158,7 +161,7 @@
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 = '';
}
@@ -167,11 +170,9 @@
function translateText(&$body, $wrap_at, $charset) {
global $where, $what; // from searching
- global $url_parser_php;
+ global $color; // color theme
- if (!isset($url_parser_php)) {
- include '../functions/url_parser.php';
- }
+ include '../functions/url_parser.php';
$body_ary = explode("\n", $body);
$PriorQuotes = 0;
@@ -204,10 +205,15 @@
}
}
- 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;
}
@@ -215,7 +221,8 @@
}
/* SquirrelMail version number -- DO NOT CHANGE */
- $version = '1.0.2 [cvs]';
+ global $version;
+ $version = '1.2.0 [cvs]';
function find_mailbox_name ($mailbox) {
@@ -226,14 +233,6 @@
}
- 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
@@ -244,14 +243,22 @@
#
# 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://';
}
@@ -285,13 +292,6 @@
return $path;
}
- function sqStripSlashes($string) {
- if (get_magic_quotes_gpc()) {
- $string = stripslashes($string);
- }
- return $string;
- }
-
// These functions are used to encrypt the passowrd before it is
// stored in a cookie.
@@ -299,7 +299,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);
@@ -310,7 +310,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;
@@ -382,13 +382,17 @@
// 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;
+ $Str = '';
+ foreach ($dat as $k => $v)
+ {
+ $Str .= $k . $v;
+ }
+ sq_mt_seed(md5($Str));
}
- sq_mt_seed(md5($Str));
}
// Apache-specific
@@ -402,7 +406,7 @@
$pad = '';
for ($i = 0; $i < $length; $i++) {
- $pad .= chr(mt_rand(0,255));
+ $pad .= chr(mt_rand(0,255));
}
return base64_encode($pad);
@@ -423,11 +427,11 @@
$vminor = strval($regs[2]);
$vrel = $regs[3];
if($vrel[0] == ".")
- $vrel = strval(substr($vrel, 1));
+ $vrel = strval(substr($vrel, 1));
if($vrel[0] == 'b' || $vrel[0] == 'B')
- $vrel = - strval(substr($vrel, 1));
+ $vrel = - strval(substr($vrel, 1));
if($vrel[0] == 'r' || $vrel[0] == 'R')
- $vrel = - strval(substr($vrel, 2))/10;
+ $vrel = - strval(substr($vrel, 2))/10;
// Compare major version
if($vmajor < $major) return false;
@@ -440,13 +444,13 @@
// 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;
@@ -498,12 +502,17 @@
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);
+ }
?>