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

Timestamp:

11/03/11 13:24:28 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo ExpressoMail?.

File:

• trunk/expressoMail1_2/inc/class.ScriptS.inc.php (modified) (2 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] = '';
+        $temp_input = $input;  
+        $temp_input = imap_8bit($temp_input); 
+
+        $patterns[0] = '/ /'; 
             $replacements[0] = '_';
-            $input = preg_replace($patterns, $replacements, $input);
-        }
-
-        return($input);
+        $temp_input = preg_replace($patterns, $replacements, $temp_input);  
+        return ($temp_input);
     }
 
@@ -522 +507 @@
         // Lê as regras fora do escritório;
         if ($this->newout != "") {
-            $newscriptfoot .= preg_replace("/[\\n\\r]/", "%0A", $this->newout) . "\n";
+            $newscriptfoot .= preg_replace("/[\\n\\r]/", " ", $this->newout) . "\n";
         }
         $newscriptfoot .= "#mode&&basic\n";