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

Timestamp:

08/11/09 14:40:40 (15 years ago)

Author:

amuller

Message:

Ticket #615 - Resolv. problemas de criaçao de filtros, e criação de log

File:

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

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

@@ -177 +177 @@
                 // Escreve a nova regra;
                 $this->reply = $this->SieveS->getscript();
-                
+                /*
                 if($this->reply){
                         $this->errstr = $this->SieveS->deletescript($this->scriptfile);         
                 }
-
+                */
+
+                $error_log_file="/home/expressolivre/sieve_error.log";
                 //Escreve a(s) nova(s) regra(s);
-                $this->errstr = $this->SieveS->putscript($this->scriptfile,$this->write_rule());
+                $newrule = $this->write_rule();
+                if (strlen($newrule) > 0)
+                        $this->errstr = $this->SieveS->putscript($this->scriptfile,$newrule);
+                else
+                {
+                        if($_SESSION['phpgw_info']['server']['expressomail']['expressoMail_enable_log_messages'] == "True")
+                                error_log(date("D M j G:i:s T Y").": SieveError, Invalid rule for "
+                                        .$_SESSION['phpgw_info']['expressomail']['user']['userid']."=>"
+                                        .$this->teste."\nRule:"
+                                        .$var_decode."\n", 3, $error_log_file);
+                        return "Invalid rule\n" . $this->teste;
+                }
                 
                 //Ativa o script;
@@ -191 +204 @@
                 $this->SieveS->close();
                 
-                if($this->errstr){
+                if($this->errstr)
+                {
                         return "Ok";
-                }else{
+                }
+                else
+                {
+                        if($_SESSION['phpgw_info']['server']['expressomail']['expressoMail_enable_log_messages'] == "True")
+                        error_log(date("D M j G:i:s T Y")
+                        .": SieveError, Problem for "
+                        .$_SESSION['phpgw_info']['expressomail']['user']['userid']."=>"
+                        .$this->teste."\nRule:"
+                        .$var_decode."\n", 3, $error_log_file);
                         return "Problemas na criação do arquivo!\n" . $this->teste;
                 }
@@ -203 +225 @@
           for ( $i = 0; $i < strlen($input); $i++ )
           {
-              if ( preg_match('/[ÁáÉéÍíÓóÚúÀàÈèÌìÒòÙùüÇçÃãÕõÂâÊêÔô®©§ªºÐ¹²³°¢¿Æ£µøæß«»Ø÷±¬]/', $input[$i]) )
+                if ( preg_match('/[^a-z0-9.@~_+=&\'*^"-]/i', $input[$i]) )
               {
                   $special_char = true;
-                  $input = preg_replace('/'.$input[$i].'/', '=' . bin2hex($input[$i]), $input);
+                  $input = preg_replace('/\\'.$input[$i].'/', '=' . bin2hex($input[$i]), $input);
               }
           }   
@@ -227 +249 @@
     }
 
-        // Grava a nova regra;
+        // build the rule
         function write_rule(){
 
@@ -346 +368 @@
          
                 }
-         
-                // Ações
+                // Don't write half rule!
+                if (strlen($newruletext) == 0) 
+                        return false;
+                // Actions
                 if (!$rule['unconditional']) $newruletext .= ") {\n\t";