- Fix MagicHTML fix with respect to parsing of u\rl in IE.

[squirrelmail.git] / functions / strings.php

diff --git a/functions/strings.php b/functions/strings.php
index 5817ad593ca8b7a96195ead75fd4bfd18bbf715c..a830024fc0a06f66bbfcf0be2ac5e663d57da32a 100644 (file)
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -6,7 +6,7 @@
  * This code provides various string manipulation functions that are
  * used by the rest of the SquirrelMail code.
  *
- * @copyright © 1999-2005 The SquirrelMail Project Team
+ * @copyright © 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -19,14 +19,14 @@ if (!defined('SM_PATH')) define('SM_PATH','../');
  * SquirrelMail version number -- DO NOT CHANGE
  */
 global $version;
-$version = '1.5.1 [CVS]';
+$version = '1.5.2 [CVS]';
 
 /**
  * SquirrelMail internal version number -- DO NOT CHANGE
  * $sm_internal_version = array (release, major, minor)
  */
 global $SQM_INTERNAL_VERSION;
-$SQM_INTERNAL_VERSION = array(1,5,1);
+$SQM_INTERNAL_VERSION = array(1,5,2);
 
 /**
  * There can be a circular issue with includes, where the $version string is
@@ -35,6 +35,12 @@ $SQM_INTERNAL_VERSION = array(1,5,1);
  */
 include_once(SM_PATH . 'functions/global.php');
 
+/**
+ * Include Compatibility plugin if available.
+ */
+if (file_exists(SM_PATH . 'plugins/compatibility/functions.php'))
+    include_once(SM_PATH . 'plugins/compatibility/functions.php');
+
 /**
  * Appends citation markers to the string.
  * Also appends a trailing space.
@@ -477,6 +483,29 @@ function readShortMailboxName($haystack, $needle) {
     return( $elem );
 }
 
+/**
+ * Find out where SquirrelMail lives and try to be smart about it.
+ * The only problem would be when SquirrelMail lives in directories
+ * called "src", "functions", or "plugins", but people who do that need
+ * to be beaten with a steel pipe anyway.
+ *
+ * @return string the base uri of SquirrelMail installation.
+ * @since 1.2.6
+ */
+function sqm_baseuri(){
+    global $base_uri, $PHP_SELF;
+    /**
+     * If it is in the session, just return it.
+     */
+    if (isset($base_uri)){
+        return $base_uri;
+    }
+    $dirs = array('|src/.*|', '|plugins/.*|', '|functions/.*|');
+    $repl = array('', '', '');
+    $base_uri = preg_replace($dirs, $repl, $PHP_SELF);
+    return $base_uri;
+}
+
 /**
  * get_location
  *
@@ -1047,7 +1076,7 @@ function sq_is8bit($string,$charset='') {
  * If you want to test all mbstring encodings - fill $list_of_encodings
  * array.
  * @return array list of encodings supported by php mbstring extension
- * @since 1.5.1
+ * @since 1.5.1 and 1.4.6
  */
 function sq_mb_list_encodings() {
     if (! function_exists('mb_internal_encoding'))
@@ -1117,7 +1146,7 @@ function sq_mb_list_encodings() {
  * Callback function used to lowercase array values.
  * @param string $val array value
  * @param mixed $key array key
- * @since 1.5.1
+ * @since 1.5.1 and 1.4.6
  */
 function sq_lowercase_array_vals(&$val,$key) {
     $val = strtolower($val);
@@ -1133,7 +1162,7 @@ function sq_lowercase_array_vals(&$val,$key) {
  * vanilla string length function is used.
  * @param string $str string
  * @param string $charset charset
- * @since 1.5.1
+ * @since 1.5.1 and 1.4.6
  * @return integer number of characters in string
  */
 function sq_strlen($str, $charset=null){
@@ -1145,9 +1174,10 @@ function sq_strlen($str, $charset=null){
 
     // use automatic charset detection, if function call asks for it
     if ($charset=='auto') {
-        global $default_charset;
+        global $default_charset, $squirrelmail_language;
         set_my_charset();
         $charset=$default_charset;
+        if ($squirrelmail_language=='ja_JP') $charset='euc-jp';
     }
 
     // Use mbstring only with listed charsets
@@ -1212,9 +1242,10 @@ function sq_str_pad($string, $width, $pad, $padtype, $charset='') {
 function sq_substr($string,$start,$length,$charset='auto') {
     // use automatic charset detection, if function call asks for it
     if ($charset=='auto') {
-        global $default_charset;
+        global $default_charset, $squirrelmail_language;
         set_my_charset();
         $charset=$default_charset;
+        if ($squirrelmail_language=='ja_JP') $charset='euc-jp';
     }
     $charset = strtolower($charset);
     if (function_exists('mb_internal_encoding') &&
@@ -1242,9 +1273,10 @@ function sq_substr($string,$start,$length,$charset='auto') {
 function sq_strpos($haystack,$needle,$offset,$charset='auto') {
     // use automatic charset detection, if function call asks for it
     if ($charset=='auto') {
-        global $default_charset;
+        global $default_charset, $squirrelmail_language;
         set_my_charset();
         $charset=$default_charset;
+        if ($squirrelmail_language=='ja_JP') $charset='euc-jp';
     }
     $charset = strtolower($charset);
     if (function_exists('mb_internal_encoding') &&
@@ -1270,9 +1302,10 @@ function sq_strpos($haystack,$needle,$offset,$charset='auto') {
 function sq_strtoupper($string,$charset='auto') {
     // use automatic charset detection, if function call asks for it
     if ($charset=='auto') {
-        global $default_charset;
+        global $default_charset,$squirrelmail_language;
         set_my_charset();
         $charset=$default_charset;
+        if ($squirrelmail_language=='ja_JP') $charset='euc-jp';
     }
     $charset = strtolower($charset);
     if (function_exists('mb_strtoupper') &&
@@ -1298,4 +1331,4 @@ function sq_count8bit($string) {
     return $count;
 }
 
-?>
\ No newline at end of file
+?>