Ticket #1056: sieve_filters.diff

inc/class.ScriptS.inc.php

@@ -60 +60 @@
         
                         $aux = $this->SieveS->putscript($this->scriptfile, $this->createScript());
                         if(!$aux){
-                                // Caso de erro, grava dentro da variável errstr;
-                                $this->errstr = "O arquivo não foi criado";
+                                $this->errstr = "Error: file not created";
+                                return $this->errstr;
                         }
                         // Mata a variavel;
                         unset($aux);
@@ -69 +69 @@
                         $aux = $this->SieveS->activatescript($this->scriptfile);
                         
                         if(!$aux){
-                                // Caso de erro, grava dentro da variavel errstr;
-                                $this->errstr = "O arquivo não foi ativado";
+                                $this->errstr = "Error: error to activate file";
+                                return $this->errstr;
                         }
                         else{
                                 $this->reply = $this->SieveS->getscript();
@@ -83 +83 @@
                 //Fecha a conexao
                 $this->SieveS->close();
                         
-                if($this->rules){               
+                if($this->rules)
                         return $this->rules;
-                }else{
-                        return $this->errstr;
-                }
                         
         }
         
@@ -98 +95 @@
                 $newr3  = array();
         
                 $var_decode = rawurldecode($params['arfilter']);
+                $var_decode = preg_replace('/\n\./', '.', $var_decode);
                 
                 $narray  = explode("_end_",$var_decode);
 

js/filter.js

@@ -10 +10 @@
 
         function cfilter(){
 
+                this.criticalError = false;
                 this.mode_in   = "";
                 this.rulest              = new Array;
                 this.rulesVoip   = new Array;
@@ -45 +46 @@
                 var _this = this;
                 var cont1 = parseInt(0);
                 var cont2 = parseInt(0);
-                                
+        
                 if( _this.rulest.length == 0 )
                 {
                         var handler_sieve = function(data)
                         {
+                                if (data.indexOf('Error:') == 0)
+                                {
+                                        _this.criticalError = true;
+                                        alert(data);
+                                }
+                                else
+                                try{
                                 if(data.rule.length > 0){
                                         for(var i=0 ; i < data.rule.length; i++)
                                         {
@@ -63 +71 @@
                                 _this.out_officeR = data.vacation[0];
                                 _this.out_officeR = _this.out_officeR ? trim(_this.out_officeR.toString().replace("\n","")) : "";
                                 if(data.mode.length > 0){_this.mode_in = data.mode[0];}
+                                }
+                                catch(e){
+                                        _this.criticalError = true;
+                                        alert("Expresso:"+e.description);
+                                }
                         }
                         if(Element('form_status') != null)
                                 Element('form_status').innerHTML = "<span style='background:#cc4444;'>&nbsp;&nbsp;<font color='WHITE'>Aguarde...</font>&nbsp;</span>";
@@ -746 +759 @@
                 }
                 var args   = "$this.ScriptS.rec_rules";
                 var params = "arfilter="+aux_rul;
-                cExecute(args,h_filter,params);
+                if(!_this.criticalError)
+                        cExecute(args,h_filter,params);
         }
 
 // build object