Changeset 5804 for trunk/prototype/modules/calendar/interceptors

Timestamp:

03/23/12 16:39:10 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Implementada funcionalidade de criacao de agenda para contas compartilhadas e imposicao de agendas

Location:

trunk/prototype/modules/calendar/interceptors

Files:

• DBMapping.php (modified) (2 diffs)
• LDAPMapping.php (modified) (1 diff)
• Notifications.php (modified) (4 diffs)

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -468 +468 @@
                         
                         foreach($newResult as $key => &$value){
-                                if($value['user']  != 0)
-                                        $value['user'] = Controller::read( array( 'concept' => 'user' , 'id' => $value['user'] ));
+                                if($value['user']  != 0){
+                                    $user = $value['user'];
+                                    $value['user'] = Controller::read( array( 'concept' => 'user' , 'id' => $user ));
+
+                                    if(!$value['user'])
+                                        $value['user'] = Controller::read( array( 'concept' => 'group' , 'id' => $user ));
+                                }
                         }
 
@@ -640 +645 @@
                 if(isset($v['calendar'])){
                     $result[$i]['calendar'] = Controller::read( array( 'concept' => 'calendar' , 'id' => $v['calendar']), false, false); 
-                                        $result[$i]['defaultAlarms'] = Controller::find( array( 'concept' => 'calendarSignatureAlarm' ) , false ,array( 'filter' => array('=', 'calendarSignature'  ,  $v['id']) ));    
-                                        //Caso não seja o dono da agenda retorna o objeto permission com as acls
-                                        if($result[$i]['isOwner'] == 0){
-                                                $permission = Controller::find( array( 'concept' => 'calendarToPermission'), false ,array( 'filter' => array('AND', array('=', 'calendar' ,  $v['calendar']), array('=', 'user', Config::me('uidNumber') ) ) ) ); 
-
-                                                if(!is_array($permission) || !$permission  ){
-
-                                                        $permission = Controller::find( array( 'concept' => 'calendarToPermission'), false ,array( 'filter' => array('AND', array('=', 'calendar' ,  $v['calendar']), array('=', 'type', '1' ) ) ) );    
-
-                                                }
-                                                $result[$i]['permission'] = $permission[0];
-                                        }
-                                }
-           }
+                    $result[$i]['defaultAlarms'] = Controller::find( array( 'concept' => 'calendarSignatureAlarm' ) , false ,array( 'filter' => array('=', 'calendarSignature'  ,  $v['id']) ));    
+                    //Caso não seja o dono da agenda retorna o objeto permission com as acls
+                    if($result[$i]['isOwner'] == 0){
+                            $permission = Controller::find( array( 'concept' => 'calendarToPermission'), false ,array( 'filter' => array('AND', array('=', 'calendar' ,  $v['calendar']), array('=', 'user', Config::me('uidNumber') ) ) ) ); 
+
+                            if(!is_array($permission) || !$permission  ){
+
+                                    $permission = Controller::find( array( 'concept' => 'calendarToPermission'), false ,array( 'filter' => array('AND', array('=', 'calendar' ,  $v['calendar']), array('=', 'type', '1' ) ) ) );    
+
+                            }
+                            $result[$i]['permission'] = $permission[0];
+                    }
+            }
+            //TODO - Padronizar retorno do deepness
+//            if(isset($v['user']))
+//                $result[$i]['user'] = Controller::read( array( 'concept' => 'user' , 'id' => $v['user']), false, false); 
+          }
        }       
    } 

trunk/prototype/modules/calendar/interceptors/LDAPMapping.php

@@ -36 +36 @@
                                                           )
                                                 );
+            
+                else
+                     $criteria['filter'] = array('AND',
+                                                array('AND' , 
+                                                            array('=' , 'objectClass' , 'phpgwAccount'),
+                                                            array('OR' , 
+                                                                        array('=' , 'phpgwAccountType' , 'i'),
+                                                                        array('=' , 'phpgwAccountType' , 'u'),
+                                                                        array('=' , 'phpgwAccountType' , 's')
+                                                                 )
+                                                     ),$criteria['filter']
+                                                );                      
             }
           
     }  
    
+
+       public function encodeFindGroup( &$uri , &$params , &$criteria , $original ){
+            if(isset($criteria['filter']))
+            {
+                if($criteria['filter'][0] === '*' && $criteria['filter'][1] === 'name') //Busca pelo nome group DFD00032
+                    $criteria['filter'] = array('AND',
+                                                array('AND' , 
+                                                            array('=' , 'objectClass' , 'phpgwAccount'),
+                                                            array('=' , 'phpgwAccountType' , 'g')
+                                                                 
+                                                    ),
+                                                 array('AND' ,  
+                                                                array('!','phpgwAccountVisible','-1'),
+                                                                array('OR', 
+                                                                        array('=','accountStatus','active'),
+                                                                        array('=','objectClass','posixGroup')
+                                                                    ),
+                                                                array('OR', 
+                                                                        array('*','name',$criteria['filter'][2]),
+                                                                        array('*','id',$criteria['filter'][2]),
+                                                                        array('*','mail',$criteria['filter'][2]),
+                                                                        array('*','mailAlternateAddress',$criteria['filter'][2]),
+                                                                    )
+                                                          )
+                                                );
+                
+                
+                    else
+                        $criteria['filter'] = array('AND',
+                            array('AND' , 
+                                        array('=' , 'objectClass' , 'phpgwAccount'),
+                                        array('=' , 'phpgwAccountType' , 'g')
+                                    ),$criteria['filter']
+                            );                      
+            }
+          
+    }  
+     
+    
+    
 }
 

trunk/prototype/modules/calendar/interceptors/Notifications.php

@@ -148 +148 @@
 
                 $data['nowStartDate'] = date_format( $sTime , 'd/m/Y');
-        $data['nowStartTime'] = ($schedulableReference['allDay']) ? '' : date_format( $sTime , 'H:i');
-        $data['nowEndDate'] = date_format( $eTime , 'd/m/Y');
-        $data['nowEndTime'] = ($schedulableReference['allDay']) ? '' :  date_format( $eTime , 'H:i');
+                $data['nowStartTime'] = ($schedulableReference['allDay']) ? '' : date_format( $sTime , 'H:i');
+                $data['nowEndDate'] = date_format( $eTime , 'd/m/Y');
+                $data['nowEndTime'] = ($schedulableReference['allDay']) ? '' :  date_format( $eTime , 'H:i');
                 $data['userRequest'] = Config::me('uid');
                 
@@ -161 +161 @@
                 $params['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/modules/calendar/templates/notify_suggestion_body.tpl');
                 $params['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/modules/calendar/templates/notify_subject.tpl');;
-                $params['from'] = Config::me('mail');   
+                $params['from'] ='"'.Config::me('cn').'" <'.Config::me('mail').'>';   
                 $params['to'] = $organizer['user']['mail'];
                 
@@ -192 +192 @@
                 $params['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/modules/calendar/templates/notify_subject.tpl');;
                 $params['to'] = $params['from'];
-                $params['from'] = Config::me('mail');   
+                $params['from'] = $params['from'] ='"'.Config::me('cn').'" <'.Config::me('mail').'>';
         }
         
@@ -435 +435 @@
        $mail['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/modules/calendar/templates/'.$template.'.tpl');
        $mail['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/modules/calendar/templates/notify_subject.tpl');;
-       $mail['from'] = Config::me('mail');   
+       $mail['from'] = '"'.Config::me('cn').'" <'.Config::me('mail').'>';
        $mail['to'] = $to;
        Controller::create( array( 'service' => 'SMTP' ), $mail );