Correctly update cached message flags in ALL places when they are changed by the...

[squirrelmail.git] / functions / strings.php

diff --git a/functions/strings.php b/functions/strings.php
index 68ffbe1ed784c64250046c014ccf9d86459632dd..eff1ba661af8900a0782cdc0dcbbdd5779b749c9 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-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -792,7 +792,8 @@ function quoteimap($str) {
  * @since 1.4.2
  */
 function makeComposeLink($url, $text = null, $target='') {
-    global $compose_new_win,$javascript_on, $compose_width, $compose_height;
+    global $compose_new_win, $compose_width, 
+           $compose_height, $oTemplate;
 
     if(!$text) {
         $text = _("Compose");
@@ -808,10 +809,11 @@ function makeComposeLink($url, $text = null, $target='') {
 
 
     // if javascript is on, use onclick event to handle it
-    if($javascript_on) {
+    if(checkForJavascript()) {
         sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
         $compuri = SM_BASE_URI.$url;
-        return "<a href=\"javascript:void(0)\" onclick=\"comp_in_new('$compuri','$compose_width','$compose_height')\">$text</a>";
+
+        return create_hyperlink('javascript:void(0)', $text, '', "comp_in_new('$compuri','$compose_width','$compose_height')");
     }
 
     // otherwise, just open new window using regular HTML
@@ -1136,15 +1138,32 @@ 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
+    static $charset_auto, $bUse_mb;
+
     if ($charset=='auto') {
-        global $default_charset, $squirrelmail_language;
-        set_my_charset();
-        $charset=$default_charset;
-        if ($squirrelmail_language=='ja_JP') $charset='euc-jp';
+        if (!isset($charset_auto)) {
+            global $default_charset, $squirrelmail_language;
+            set_my_charset();
+            $charset=$default_charset;
+            if ($squirrelmail_language=='ja_JP') $charset='euc-jp';
+            $charset_auto = $charset;
+        } else {
+            $charset = $charset_auto;
+        }
     }
     $charset = strtolower($charset);
-    if (function_exists('mb_internal_encoding') &&
-        in_array($charset,sq_mb_list_encodings())) {
+
+    // in_array call is expensive => do it once and use a static var for
+    // storing the results
+    if (!isset($bUse_mb)) {
+        if (in_array($charset,sq_mb_list_encodings())) {
+            $bUse_mb = true;
+        } else {
+            $bUse_mb = false;
+        }
+    }
+
+    if ($bUse_mb) {
         return mb_substr($string,$start,$length,$charset);
     }
     // TODO: add mbstring independent code
@@ -1167,15 +1186,31 @@ 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
+    static $charset_auto, $bUse_mb;
+
     if ($charset=='auto') {
-        global $default_charset, $squirrelmail_language;
-        set_my_charset();
-        $charset=$default_charset;
-        if ($squirrelmail_language=='ja_JP') $charset='euc-jp';
+        if (!isset($charset_auto)) {
+            global $default_charset, $squirrelmail_language;
+            set_my_charset();
+            $charset=$default_charset;
+            if ($squirrelmail_language=='ja_JP') $charset='euc-jp';
+            $charset_auto = $charset;
+        } else {
+            $charset = $charset_auto;
+        }
     }
     $charset = strtolower($charset);
-    if (function_exists('mb_internal_encoding') &&
-        in_array($charset,sq_mb_list_encodings())) {
+
+    // in_array call is expensive => do it once and use a static var for
+    // storing the results
+    if (!isset($bUse_mb)) {
+        if (in_array($charset,sq_mb_list_encodings())) {
+            $bUse_mb = true;
+        } else {
+            $bUse_mb = false;
+        }
+    }
+    if ($bUse_mb) {
         return mb_strpos($haystack,$needle,$offset,$charset);
     }
     // TODO: add mbstring independent code
@@ -1196,15 +1231,33 @@ function sq_strpos($haystack,$needle,$offset,$charset='auto') {
  */
 function sq_strtoupper($string,$charset='auto') {
     // use automatic charset detection, if function call asks for it
+    static $charset_auto, $bUse_mb;
+
     if ($charset=='auto') {
-        global $default_charset,$squirrelmail_language;
-        set_my_charset();
-        $charset=$default_charset;
-        if ($squirrelmail_language=='ja_JP') $charset='euc-jp';
+        if (!isset($charset_auto)) {
+            global $default_charset, $squirrelmail_language;
+            set_my_charset();
+            $charset=$default_charset;
+            if ($squirrelmail_language=='ja_JP') $charset='euc-jp';
+            $charset_auto = $charset;
+        } else {
+            $charset = $charset_auto;
+        }
     }
     $charset = strtolower($charset);
-    if (function_exists('mb_strtoupper') &&
-        in_array($charset,sq_mb_list_encodings())) {
+
+    // in_array call is expensive => do it once and use a static var for
+    // storing the results
+    if (!isset($bUse_mb)) {
+        if (function_exists('mb_strtoupper') &&
+            in_array($charset,sq_mb_list_encodings())) {
+            $bUse_mb = true;
+        } else {
+            $bUse_mb = false;
+        }
+    }
+
+    if ($bUse_mb) {
         return mb_strtoupper($string,$charset);
     }
     // TODO: add mbstring independent code