X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fstrings.php;h=00969df57dadfd64c1556553571229694a6d5d3a;hb=e842b215cc74203501fe50e52497f9f0329e721b;hp=b3c838103b556a77e53595977f6c9e7f71b949c7;hpb=c9e5c5695c7e138a83a5cbcdd63948da492e024a;p=squirrelmail.git

diff --git a/functions/strings.php b/functions/strings.php
index b3c83810..00969df5 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,11 +12,21 @@
  * $Id$
  */
 
+require_once(SM_PATH . 'functions/global.php');
+
 /**
  * SquirrelMail version number -- DO NOT CHANGE
  */
 global $version;
-$version = '1.3.1 [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
@@ -28,6 +38,16 @@ $version = '1.3.1 [CVS-DEVEL]';
  * 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])) {
@@ -73,6 +93,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 = '';
@@ -82,7 +108,9 @@ function sqUnWordWrap(&$body) {
         $CurrentSpaces = $regs[1];
         if (isset($regs[2])) {
             $CurrentRest = $regs[2];
-        }
+        } else {
+	    $CurrentRest = '';
+	}
         
         if ($i == 0) {
             $PreviousSpaces = $CurrentSpaces;
@@ -154,20 +182,15 @@ function getLineOfAddrs($array) {
 }
 
 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 '';
 }
 
 
@@ -182,46 +205,43 @@ function php_self () {
  */
 function get_location () {
     
-    global $PHP_SELF, $SERVER_NAME, $HTTP_HOST, $SERVER_PORT,
-        $HTTP_SERVER_VARS, $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://';
     
     /*
      * 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);
             }
         }
     }
@@ -234,9 +254,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;
 }
 
 
@@ -277,24 +299,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) {
@@ -315,7 +320,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) {
@@ -323,8 +327,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')) {
@@ -340,8 +346,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;
 }
@@ -357,56 +364,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.
  */
@@ -416,7 +373,7 @@ function show_readable_size($bytes) {
     
     if ($bytes / 1024 > 1) {
         $bytes /= 1024;
-        $type = 'm';
+        $type = 'M';
     }
     
     if ($bytes < 10) {
@@ -465,7 +422,7 @@ function GenerateRandomString($size, $chars, $flags = 0) {
     return $String;
 }
 
-function quoteIMAP($str) {
+function quoteimap($str) {
     return ereg_replace('(["\\])', '\\\\1', $str);
 }
 
@@ -510,4 +467,4 @@ function RemoveSlashes(&$array) {
 
 $PHP_SELF = php_self();
 
-?>
+?>
\ No newline at end of file