Changeset 4789 for trunk/expressoMail1_2/inc/class.ScriptS.inc.php

Timestamp:

07/19/11 09:00:57 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #1820 - Aplicada correção para cirar filtros com acentuação. r4641

File:

• trunk/expressoMail1_2/inc/class.ScriptS.inc.php (modified) (3 diffs)

trunk/expressoMail1_2/inc/class.ScriptS.inc.php

@@ -215 +215 @@
 
     function convert_specialchar($input) {
-        $special_char = false;
-        for ($i = 0; $i < strlen($input); $i++) {
-            if (preg_match('/[^a-z0-9.@~_+=&\'*^\ \-\[\]]/i', $input[$i])) {
-                $special_char = true;
-                $input = preg_replace('/\\' . $input[$i] . '/', '=' . bin2hex($input[$i]), $input);
-            }
-        }
-
-        if ($special_char) {
-            /*             *
-             * When using arrays with pattern and replacement, 
-             * the keys are processed in the order they appear in the array. 
-             * See preg_replace in php.net/preg_replace 
-             * */
-            $patterns[0] = '/=c3/i';
-            $patterns[1] = '/ /';
-            $replacements[1] = '';
-            $replacements[0] = '_';
-            $input = preg_replace($patterns, $replacements, $input);
-        }
-
-        return($input);
+        $temp_input = $input;  
+        $temp_input = imap_8bit($temp_input); 
+                 
+        $patterns[0] = '/ /'; 
+        $replacements[0] = '_';  
+        $temp_input = preg_replace($patterns, $replacements, $temp_input);  
+        return ($temp_input);
     }
 
@@ -267 +252 @@
             $rule['to']         = $this->convert_specialchar($tmp1[4]);
             $tmpSubject         = $tmp1[5];
-            $rule['subject']    = $this->convert_specialchar($tmp1[5]);
+            $rule['subject']    = $rule['subject'] = " [\"" . $this->convert_specialchar($tmp1[5]) . "\", \"" . base64_encode($tmp1[5]) . "\"]";
             $rule['action']     = $tmp1[6];
             $rule['action_arg'] = utf8_encode(preg_replace("/\\r\\n/", "\r\n", $tmp1[7]));
@@ -361 +346 @@
                             $match = ':regex';
                         $newruletext .= "header " . $match . " \"subject\"";
-                        $newruletext .= " \"" . $rule['subject'] . "\"";
+                        $newruletext .= "" . $rule['subject'] . "";
                         $started = 1;
                     }