Changeset 6754 for branches/2.4/prototype/modules/filters/interceptors/FilterMapping.php

Timestamp:

07/11/12 11:45:10 (12 years ago)

Author:

niltonneto

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.1.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• prototype/modules/filters/interceptors/FilterMapping.php (modified) (7 diffs)

branches/2.4/prototype/modules/filters/interceptors/FilterMapping.php

@@ -41 +41 @@
 */
 
-use prototype\api\Config as Config; 
+use prototype\api\Config as Config;
 
 /**
@@ -224 +224 @@
                         $script_criteria .= ")"; 
 
-                        $script_action = " {\r\n ";
+                        //$script_action = " {\r\n ";
+                        /* Somente para controlar que o addFlag virá antes de qualquer ação. Modificar isso depois */
+                        $action_addFlag = '';
                         
                         if( is_array($action) )
@@ -230 +232 @@
                         {
                                 switch ($action[$k]['type']) {
+                                        case 'setflag':
+                                                $require_flag = true;
+                                                $action[$k]['parameter'] = "\\\\" . $action[$k]['parameter'];
+                                                break;
+                                        case 'addflag': 
+                                                $require_flag = true;
+                                                $action_addFlag = "addflag \"" . $action[$k]['parameter'] . "\";\r\n ";
+                                                break;
                                         case 'redirect':
                                                 break;
@@ -245 +255 @@
                                                 $vacation = true;
                                                 continue;
-                                        case 'setflag':
-                                                $require_flag = true;
-                                                $action[$k]['parameter'] = "\\\\" . $action[$k]['parameter'];
-                                                break;
                                         case 'discard':
                                                 break;
                                 }
-                                if ($vacation == false) $script_action .= $action[$k]['type'] . " \"" . $action[$k]['parameter'] . "\";\r\n ";
+                                if ($vacation == false && $action[$k]['type'] != 'addflag') $script_action .= $action[$k]['type'] . " \"" . $action[$k]['parameter'] . "\";\r\n ";
                         }
-                        $script_action .= "}";
                         
+                        /* ATENÇÃO: Colocar sempre o comando addflag antes de qualquer outro no caso de ações compostas no Sieve */
+                        if ($action_addFlag != '') $script_action = $action_addFlag . $script_action; 
+                        
+                        $script_action = "{\r\n " . $script_action . "}";
+                        $action_addFlag = '';
                         if($vacation == false)
                                 $script_rules .= $script_match . $script_criteria . $script_action . "\r\n";
@@ -263 +273 @@
                         $script_match = "";
                         $script_criteria = "";  
+                        $script_action = "";
                         $data['applyMessages'] = "";                                                    
                 }
@@ -295 +306 @@
 
                 $content = $script_begin . $script_header . $script_rules . "\r\n\r\n#PseudoScript#" . "\r\n#" . $json_data;
-                
+
                 return( $content );
         }
@@ -697 +708 @@
                 return( $return );
         }
+
+        /** 
+         * Método que insere no ldap as informações do vacation 
+         * 
+         * @license    http://www.gnu.org/copyleft/gpl.html GPL 
+         * @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br) 
+         * @sponsor     Caixa Econômica Federal 
+         * @author     Cristiano Corrêa Schmidt 
+         * @param      <$uri> 
+         * @param      <$result> 
+         * @param      <$criteria> 
+         * @param      <$original> 
+         * @return     <void> 
+         * @access     public 
+         */ 
+        public function verifyVacationRule( &$uri , &$params , &$criteria , $original  ) 
+        { 
+            if( $original['properties']['id'] === 'vacation' ) 
+            { 
+
+                $user = Controller::read(array('concept' => 'user' , 'id' => config::me('uidNumber') , 'service' => 'OpenLDAP')); 
+                $ldapConf = Config::service('OpenLDAP', 'config'); 
+                $con = ldap_connect( $ldapConf['host'] ); 
+                ldap_set_option( $con,LDAP_OPT_PROTOCOL_VERSION, 3 ); 
+                ldap_bind( $con, $ldapConf['user'], $ldapConf['password']); 
+
+                $info = array(); 
+                if(!in_array('Vacation', $user['objectClass'])) 
+                        $info['objectClass'] = 'Vacation'; 
+
+                $info['vacationActive'] = strtoupper($original['properties']['enabled']); 
+
+                if(isset($original['properties']['actions']) && isset($original['properties']['actions'][0]['parameter'])) 
+                        $info['vacationInfo']   = $original['properties']['actions'][0]['parameter']; 
+                else if( !isset($user['vacationInfo']) ) 
+                { 
+                    $rules = $this->getRules(); 
+                    if(is_array($rules)) 
+                        foreach ($rules as $rule) 
+                        if($rule['id'] === 'vacation') 
+                                $info['vacationInfo'] = $rule['actions'][0]['parameter']; 
+                } 
+
+                if(!in_array('Vacation', $user['objectClass'])) 
+                        ldap_mod_add ( $con , $user['dn'] ,  $info ); 
+                else 
+                        ldap_modify ( $con , $user['dn'] ,  $info ); 
+
+
+                ldap_close($con); 
+
+            } 
+         
+        }
+
+        /** 
+         * Método que remove do ldap as informações do vacation 
+         * 
+         * @license    http://www.gnu.org/copyleft/gpl.html GPL 
+         * @author     Consórcio Expresso Livre - 4Linux (www.4linux.com.br) e Prognus Software Livre (www.prognus.com.br) 
+         * @sponsor     Caixa Econômica Federal 
+         * @author     Cristiano Corrêa Schmidt 
+         * @param      <$uri> 
+         * @param      <$result> 
+         * @param      <$criteria> 
+         * @param      <$original> 
+         * @return     <void> 
+         * @access     public 
+         */ 
+        public function deleteVacationRule( &$uri , &$params , &$criteria , $original  ) 
+        {         
+            if( $original['URI']['id'] === 'vacation' ) 
+            { 
+                $user = Controller::read(array('concept' => 'user' , 'id' => config::me('uidNumber') , 'service' => 'OpenLDAP')); 
+                $ldapConf = Config::service('OpenLDAP', 'config'); 
+                $con = ldap_connect( $ldapConf['host'] ); 
+                ldap_set_option( $con,LDAP_OPT_PROTOCOL_VERSION, 3 ); 
+                ldap_bind( $con, $ldapConf['user'], $ldapConf['password']); 
+                $info = array(); 
+                $info['vacationActive'] = 'FALSE'; 
+                $info['vacationInfo'] = ""; 
+                ldap_modify ( $con , $user['dn'] ,  $info ); 
+                ldap_close($con); 
+            } 
+        }
 }