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

Timestamp:

06/18/08 11:28:42 (16 years ago)

Author:

niltonneto

Message:

Versionamento 1.222
Ver changelog de alterações no Trac.

File:

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

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

@@ -96 +96 @@
                 
                 $narray  = explode("_end_",$var_decode);
-                
+
                 foreach($narray as $key=>$tmp){
                         if($tmp != ""){
@@ -196 +196 @@
                   $special_char = false;
                   for ( $i = 0; $i < strlen($input); $i++ )
-                      if ( preg_match('/[ÁáÉéÍíÓóÚúÀàÈèÌìÒòÙùÇçÃãÕõÂâÊêÔô]/', $input[$i]) )
+                      if ( preg_match('/[ÁáÉéÍíÓóÚúÀàÈèÌìÒòÙùÇçÃãÕõÂâÊêÔô®©§ªºÐ¹²³°¢¿Æ£µøæß«»Ø÷±¬]/', $input[$i]) )
                       {
                           $special_char = true;
                           $input = preg_replace('/'.$input[$i].'/', '=' . bin2hex($input[$i]), $input);
                       }
-                   if ( $special_char )
+                      
+           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 */
@@ -210 +211 @@
                    $input = preg_replace($patterns, $replacements, $input);
                    }
-                   return($input);
+                   if (($input{0}) && (!eregi('^[a-zA-Z0-9=-]+$',$input)))
+                                return false;   
+                        else
+                        return($input);
         }
 
@@ -233 +237 @@
           $rule['from']              = $this->convert_specialchar($tmp1[3]);
           $rule['to']            = $this->convert_specialchar($tmp1[4]);
-          $rule['subject'] = $this->convert_specialchar($tmp1[5]);
+                  $rule['subject'] = $this->convert_specialchar($tmp1[5]);
           $rule['action']            = $tmp1[6];
-          $rule['action_arg']    = utf8_encode(preg_replace("/\\r\\n/","\r\n",$tmp1[7]));
+                  $rule['action_arg']    = utf8_encode(preg_replace("/\\r\\n/","\r\n",$tmp1[7]));
           $rule['flg']               = $tmp1[8];   
           $rule['field']                 = $tmp1[9];