Changeset 3849

Timestamp:

03/03/11 15:49:26 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #1650 - Filtros de tamanho de mensagem maior que zero nao sao criados.

File:

• branches/2.2/expressoMail1_2/inc/class.ScriptS.inc.php (modified) (2 diffs)

branches/2.2/expressoMail1_2/inc/class.ScriptS.inc.php

@@ -287 +287 @@
           $rule['unconditional']   = 0;
                   
-                  if (!$rule['from'] && !$rule['to'] && !$rule['subject'] && !$rule['field'] && empty($rule['size']) && $rule['action']){
-                         $rule['unconditional'] = 1;
+                  if (!$rule['from'] && !$rule['to'] && !$rule['subject'] && !$rule['field'] && empty($rule['size']) && $rule['action'])
+                  {
+                        $rule['unconditional'] = 1;
+                        
+                        if( $rule['unconditional'] && ($rule['size'] == "0" || $rule['size'] == 0 ) )
+                                $rule['unconditional'] = 0;
                   }
                   unset($tmp1);
@@ -360 +364 @@
                         $started = 1;
                     }
-                    if (!empty($rule['size']) && $rule['size'] >= 0) {
+                    
+                    if ( $rule['size'] >= 0 ) {
                         $xthan = " :under ";
                         if ($rule['gthan']) $xthan = " :over ";
                         if ($started) $newruletext .= ", ";
-                        $newruletext .= "size " . $xthan . $rule['size'] . "K";
+                                        
+                                        if($rule['size'] != 0 && $rule['size'] != "0")
+                                                $newruletext .= "size " . $xthan . $rule['size'] ."K";
+                                        else
+                                                $newruletext .= "size " . $xthan . "0K";
+                                                
                         $started = 1;
                     }