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

Timestamp:

01/05/09 17:20:41 (15 years ago)

Author:

niltonneto

Message:

resolve #381

File:

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

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

@@ -13 +13 @@
         var $rules;                                             // Regras do sieve;
         var $errstr;                                    // Erros retornados;
-        var $size;                                              // var tamanho;
-        var $so;                                                // para verificar se a regra foi criada por outro tipo serviço de filtros;
+        var $size;                                              // Tamanho;
+        var $so;                                                // Verifica se a regra foi criada por outro tipo serviço de filtros;
         var $continuebit;
         var $sizebit;
@@ -22 +22 @@
         var $newrules = array();
         var $newout;
+        var $teste;
+        var $EmailVoip;
+        var $EmailExpresso;
         
         function ScriptS(){
@@ -42 +45 @@
         $this->keepbit          = 8;
         $this->regexbit         = 128;
+        
+        $this->EmailVoip = trim($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['voip_email_redirect']);
+        $this->EmailExpresso = trim($_SESSION['phpgw_info']['expressomail']['user']['email']);
         
         }
@@ -189 +195 @@
                         return "Ok";
                 }else{
-                        return "Problemas na criação do arquivo!";
+                        return "Problemas na criação do arquivo!\n" . $this->teste;
                 }
         }
 
-        function convert_specialchar($input){
-                  $special_char = false;
-                  for ( $i = 0; $i < strlen($input); $i++ )
-                      if ( preg_match('/[ÁáÉéÍíÓóÚúÀàÈèÌìÒòÙùÇçÃãÕõÂâÊêÔô®©§ªºÐ¹²³°¢¿Æ£µøæß«»Ø÷±¬]/', $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 */
+    function convert_specialchar($input)
+    {
+      $special_char = false;
+          for ( $i = 0; $i < strlen($input); $i++ )
+          {
+              if ( preg_match('/[ÁáÉéÍíÓóÚúÀàÈèÌìÒòÙùüÇçÃãÕõÂâÊêÔô®©§ªºÐ¹²³°¢¿Æ£µøæß«»Ø÷±¬]/', $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] = '/ /';
@@ -210 +223 @@
                    $replacements[0] = '_';
                    $input = preg_replace($patterns, $replacements, $input);
-                   }
-                //   if (($input{0}) && (!eregi('^[a-zA-Z0-9=\-@&\.#\$!?%:\+_<>\(\)\"\ ]+$',$input)))
-                //              return false;   
-                //      else
-                        return($input);
-        }
+           }
+       
+       return($input);
+    }
 
         // Grava a nova regra;
@@ -227 +238 @@
                 $regexused = 0;
                 $rejectused = 0;
+                $notify = 0;
                 $newscriptbody = "";
         $continue = 1;
+        $tmpSubject = "";
         
                 // Recebe os valores das regras;
@@ -237 +250 @@
           $rule['from']              = $this->convert_specialchar($tmp1[3]);
           $rule['to']            = $this->convert_specialchar($tmp1[4]);
-                  $rule['subject'] = $this->convert_specialchar($tmp1[5]);
+                  $tmpSubject                    = $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]));
@@ -337 +351 @@
                 if (!$rule['unconditional']) $newruletext .= ") {\n\t";
         
-                if (preg_match("/folder/i",$rule['action'])) {
+                if (preg_match("/folder/i",$rule['action']))
+                {
                     $newruletext .= "fileinto \"" . $rule['action_arg'] . "\";";
                 }
-                if (preg_match("/reject/i",$rule['action'])) {
+                
+                if (preg_match("/reject/i",$rule['action']))
+                {
                     $newruletext .= "reject text: \n" . $rule['action_arg'] . "\n.\n;";
                     $rejectused = 1;
                 }
-                if (preg_match("/address/i",$rule['action'])) {
+                
+                if (preg_match("/address/i",$rule['action']))
+                {
                     $newruletext .= "redirect \"" . $rule['action_arg'] . "\";";
                 }
+                
+                if (preg_match("/notify/i",$rule['action']))
+                {
+                                $newruletext .= "notify :method \"mailto\" :options [\"".$this->EmailVoip ."\"]:" .
+                                                                "message \"<expressovoip><from>". $this->EmailExpresso."</from>".
+                                                                "<br/><Subject>".utf8_encode($tmpSubject)."</Subject></expressovoip>\";";
+                                $notify = 1;                                                    
+                }
+                
                 if (preg_match("/discard/i",$rule['action'])) {
                     $newruletext .= "discard;";
@@ -362 +390 @@
               }
                 }// Fim do Foreach;
-                
+                $this->teste = $newscriptbody;          
                 // Para a regras fora do escritorio;
         unset($tmp);
@@ -389 +417 @@
             if ($activerules) {
                 $newscripthead .= "require [\"fileinto\"";
+                
+                if($notify){
+                        $newscripthead .= ",\"notify\"";                        
+                }
                 if($regexused){
                         $newscripthead .= ",\"regex\"";
@@ -405 +437 @@
             }
                 
-                //preg_replace("/[\\n\\r]/","", $p);            
-                
-  
             // Cria o rodapé do arquivo;
             $newscriptfoot  = "";