Changeset 5977

Timestamp:

04/19/12 17:54:45 (12 years ago)

Author:

adriano

Message:

Ticket #2633 - correcao nos interceptors de consistencia para a funcionalidade de sinalizadores

Location:

trunk

Files:

• expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)
• prototype/modules/mail/interceptors/Helpers.php (modified) (7 diffs)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -198 +198 @@
                             } 
                                                         
-                                                        $filter = array('AND', array('=', 'folderName', $folder), array('IN','messageNumber', $sort_array_msg[0]));
+                                                        $filter = array('AND', array('=', 'folderName', $folder), array('IN','messageNumber', $sort_array_msg));
                                                         $followupflagged = Controller::find(
                                                                 array('concept' => 'followupflagged'),

trunk/prototype/modules/mail/interceptors/Helpers.php

@@ -66 +66 @@
                         else
                                 $criteria['filter'] =  $filter;
+                }
+        }
+        
+        //label:before.create
+        public function verifyNameLabel(&$uri , &$params , &$criteria , $original){
+                $nameLabel = $params['name'];
+                $Labels = Controller::find(array('concept' => 'label'), false, array('filter' => array('i=', 'name', $nameLabel) ));
+                if($Labels){
+                        Throw new Exception('Já existe um marcador com esse nome.');
                 }
         }
@@ -127 +136 @@
 
                         $imap_result = Controller::find( 
-                                array('concept' => 'followupflagged'), 
+                                array('concept' => 'message'), 
                                 array('messageId'), 
                                 array('filter' => $filter)
                         );
-                        
+
                         if($imap_result) {
                                 $params['messageId'] = $imap_result['messageId'];
@@ -139 +148 @@
                 $filter = array('=', 'messageId', $params['messageId']);
                 Controller::delete(array('concept' => 'followupflagged', 'service' => 'PostgreSQL'), null, $filter);
+
         }
         
@@ -232 +242 @@
                 $imap_uri = $uri;
                 $imap_uri['service'] = 'Imap';
-                $imap_result = Controller::find($imap_uri, false, $original['criteria']);
+                $imap_criteria = $original['criteria'];
+                
+                if (self::in_arrayr('alarmDeadline', $original['criteria']) || self::in_arrayr('doneDeadline', $original['criteria'])) {
+                        if (empty($result)) return $reult;
+                        
+                        $idList = array();
+                        foreach($result as $r) {
+                                $idList[] = $r['messageId'];
+                        }
+                        
+                        $imap_criteria['filter'] = array('IN', 'messageId', $idList);
+                }
+                $imap_result = Controller::find($imap_uri, false, $imap_criteria);
 
                 /**
@@ -241 +263 @@
                 
                         foreach($result as $k => $r) {
+                        
                                 if ($r['messageId'] == $ir['messageId']) {
                                         $merge_result[] = $r + $ir;
+                                        
                                         unset($result[$k]);
+                                        unset($imap_result[$j]);
+                                        
                                         break;
                                 }
                         }
-                        
-                        unset($imap_result[$j]);
                 }
                 
@@ -272 +296 @@
                                 $n['backgroundColor'] = '#FF2016';
                                 $n['id'] = Controller::create(array('concept' => 'followupflagged'), $n);
-                                $merge_result[] = $ir + $n;
-                        }
-                }
-                        
+                                $merge_result[] = $n;
+                        }
+                }
+
                 return $merge_result;
         }
@@ -298 +322 @@
         }       
 
-        //label:before.create
-        public function validateLabel(&$uri , &$params , &$criteria , $original){
-
-                if( !!Controller::find( array('concept' => 'label'), false, array('filter' => array('i=', 'name', $params['name'])) ) )
-                {
-                    throw new Exception('Já existe um marcador com esse nome.');
-                }
-
-                $used = Controller::service('PostgreSQL')->execSql( 'SELECT count(slot) as used from expressomail_label where user_id = '.Config::me('uidNumber'), true );
-
-                if( $used['used'] === '0' )
-                {
-                    $params['id'] = '1';
-                    return;
-                }
-
-                $slot = Controller::service('PostgreSQL')->execSql( 'SELECT label.slot + 1 as id FROM expressomail_label as label, phpgw_config as config WHERE label.user_id = '.Config::me('uidNumber').' AND config.config_name = \'expressoMail_limit_labels\' AND label.slot <= config.config_value::integer AND ( SELECT count(slot) FROM expressomail_label WHERE slot = label.slot + 1 AND user_id = '.Config::me('uidNumber').' ) = 0 limit 1', true );
-
-                if( empty( $slot ) )
-                {
-                    throw new Exception('Nenhum slot disponivel.');
-                }
-
-                $params['id'] = $slot['id'];
-        }
 }