Ignore:
Timestamp:
01/18/12 16:10:57 (12 years ago)
Author:
cristiano
Message:

Ticket #2434 - Alteração da estrutura de diretórios da nova API

Location:
trunk/prototype
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/prototype

    • Property svn:ignore set to
      .links.php.kate-swp

  • trunk/prototype/modules/calendar/interceptors/DAViCalAdapter.php

    r5366 r5399  
    3939     
    4040    static function import($data , $params = false) 
    41     {               
     41    {                   
    4242        $user =  Controller::find(array('concept' => 'user' , 'service' => 'OpenLDAP' ),false,array('filter' => array('=','uid',$params['owner'])));   
    4343        $params['owner'] = $user[0]['id']; 
    … …  
    8787        if(isset($params['calendar'])) 
    8888        {  
    89             require_once ROOTPATH.'/app/plugins/icalcreator/iCalUtilityFunctions.class.php'; 
    90             require_once ROOTPATH.'/app/plugins/icalcreator/iCalcreator.class.php'; 
     89            require_once ROOTPATH.'/plugins/icalcreator/iCalUtilityFunctions.class.php'; 
     90            require_once ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php'; 
    9191             
    9292            $vcalendar = new icalCreator( );  
    … …  
    118118     
    119119    static function move($origem , $destino , $owner) 
    120     {     
     120    {   
    121121        $user =  Controller::find(array('concept' => 'user' , 'service' => 'OpenLDAP' ),false,array('filter' => array('=','uid',$owner)));   
    122122        $owner = $user[0]['id']; 
    … …  
    153153    {   
    154154      ob_start(); 
    155       require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php'; 
    156       $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password'] ); 
    157       $cal->DoPUTRequest( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/'.$params['uid'].'.ics', $data  );   
     155      require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php'; 
     156      $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password'] ); 
     157      $cal->DoPUTRequest( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/'.$params['uid'].'.ics', $data  );   
    158158      ob_end_clean(); 
    159159    } 
    … …  
    162162    { 
    163163       ob_start(); 
    164        require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php'; 
    165        $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']); 
    166        $cal->DoDELETERequest( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$params['collection'].'/'.$data.'.ics' ); 
     164       require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php'; 
     165       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']); 
     166       $cal->DoDELETERequest( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$params['collection'].'/'.$data.'.ics' ); 
    167167       ob_end_clean(); 
    168168    } 
    … …  
    171171    { 
    172172       ob_start(); 
    173        require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php'; 
    174        $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']); 
    175        $cal->DoDELETERequest($_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$data.'/'); 
     173       require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php'; 
     174       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']); 
     175       $cal->DoDELETERequest(Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$data.'/'); 
    176176       ob_end_clean(); 
    177177    } 
    … …  
    180180    { 
    181181       ob_start(); 
    182        require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php'; 
    183        $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);        
     182       require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php'; 
     183       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']);        
    184184       $cal->DoMOVERequest( $origem.'/' , $destination.'/' ); 
    185185       ob_end_clean(); 
    … …  
    189189    { 
    190190       ob_start(); 
    191        require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php'; 
    192        $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']);        
     191       require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php'; 
     192       $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']);        
    193193       ob_end_clean(); 
    194194       return $cal->FindCalendars(); 
    … …  
    198198    { 
    199199        ob_start(); 
    200         require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php'; 
    201         $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']); 
     200        require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php'; 
     201        $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']); 
    202202  
    203203        $xml ="<?xml version=\"1.0\" encoding=\"utf-8\" ?> 
    … …  
    216216           
    217217           
    218         $cal->DoXMLRequest('MKCALENDAR', $xml, $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/'.$location.'/'); 
     218        $cal->DoXMLRequest('MKCALENDAR', $xml, Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/'.$location.'/'); 
    219219        ob_end_clean(); 
    220220    } 
    … …  
    223223    { 
    224224        ob_start(); 
    225         require_once ROOTPATH.'/app/plugins/davicalCliente/caldav-client-v2.php'; 
    226         $cal = new CalDAVClient( $_SESSION['wallet']['caldav']['url'].'/'.$_SESSION['wallet']['user']['uid'].'/', $_SESSION['wallet']['user']['uid'], $_SESSION['wallet']['user']['password']); 
     225        require_once ROOTPATH.'/plugins/davicalCliente/caldav-client-v2.php'; 
     226        $cal = new CalDAVClient( Config::service( 'CalDAV' , 'url' ).'/'.Config::me( 'uid' ).'/', Config::me( 'uid' ), $_SESSION['wallet']['user']['password']); 
    227227          
    228228        $events = $cal->GetCollectionETags($url) ; 
    … …  
    234234            $args = array_merge($args , $sync); 
    235235        } 
    236             
    237          
     236           
    238237        include ROOTPATH.'/Sync.php'; 
    239238        ob_end_clean(); 

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

    r5376 r5399  
    682682        if($valid == true) 
    683683        { 
    684              $newCriteria['filter'] = array('AND',$newCriteria['filter'] , array('=' , 'owner', $_SESSION['wallet']['user']['uidNumber']) );         
     684             $newCriteria['filter'] = array('AND',$newCriteria['filter'] , array('=' , 'owner', Config::me('uidNumber')) );         
    685685            $externalUsers = Controller::find( $newuri , $original['properties'] ? $original['properties'] : null , $newCriteria ); 
    686686 
    … …  
    709709    public function createSchedulableMails( &$uri , &$result , &$criteria , $original ){ 
    710710         
    711         require_once (ROOTPATH.'/app/plugins/icalcreator/iCalcreator.class.php' ); 
    712         require_once (ROOTPATH.'/app/templates/parseTPL.php' ); 
     711        require_once (ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php' ); 
     712        require_once (ROOTPATH.'/api/parseTPL.php' ); 
    713713        $schedulable = Controller::read( array( 'concept' => 'schedulable' , 'id' => $result['id'] ));  
    714714        $participants = Controller::find( array( 'concept' => 'participant' ) , false ,array( 'filter' => array('=', 'schedulable' ,  $result['id']) )) ;  
    … …  
    777777                                                          'schedulableLocation' =>  $schedulable['location'], 
    778778                                                          'participants' =>  $attList 
    779                                                         ),ROOTPATH.'/app/templates/notify_create_body.tpl'); 
     779                                                        ),ROOTPATH.'/api/templates/notify_create_body.tpl'); 
    780780                 
    781781                //TODO: Internacionalização do Subject 
    … …  
    824824//HELPERS 
    825825    private static function decodeRepeat( $repeat , $start , $end ) { 
    826     require_once ROOTPATH.'/app/plugins/when/When.php'; 
     826    require_once ROOTPATH.'/plugins/when/When.php'; 
    827827 
    828828    $r = new When(); 
    … …  
    982982        $op = array_shift($filter); 
    983983 
    984         if (is_array($filter[0])) { 
     984        if (isset($filter[0]) && is_array($filter[0])) { 
    985985            foreach ($filter as $i => $f) 
    986986                $filter[$i] = self::validExternalUserCriteria($f, $map ,$findCalendar ); 

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

    r5341 r5399  
    22require_once ROOTPATH.'/modules/calendar/constants.php'; 
    33require_once ROOTPATH.'/modules/calendar/interceptors/Helpers.php'; 
    4 require_once ROOTPATH.'/app/plugins/icalcreator/iCalcreator.class.php'; 
    5 require_once ROOTPATH.'/app/templates/parseTPL.php'; 
     4require_once ROOTPATH.'/plugins/icalcreator/iCalcreator.class.php'; 
     5require_once ROOTPATH.'/api/parseTPL.php'; 
    66  
    77class Notifications extends Helpers  
    … …  
    140140             
    141141             $subject['notificationType'] = 'Convite de Calendario'; 
    142              $subject['eventTitle'] = $schedulable['summary']; 
     142             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8'); 
    143143             $subject['startDate'] = date_format( $sTime , 'd/m/Y'); 
    144144             $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i'); 
    … …  
    200200           
    201201        $subject['notificationType'] = 'Convite Aceito'; 
    202         $subject['eventTitle'] = $schedulable['summary']; 
     202        $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8'); 
    203203        $subject['startDate'] = date_format( $sTime , 'd/m/Y'); 
    204204        $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i'); 
    … …  
    241241       $mail['attachments'][] = $ical; 
    242242       $mail['isHtml'] = true;                          
    243        $mail['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/app/templates/'.$template.'.tpl'); 
    244        $mail['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/app/templates/notify_subject.tpl');; 
     243       $mail['body'] = parseTPL::load_tpl( $data ,ROOTPATH.'/modules/calendar/templates/'.$template.'.tpl'); 
     244       $mail['subject'] = parseTPL::load_tpl( $subject ,ROOTPATH.'/modules/calendar/templates/notify_subject.tpl');; 
    245245       $mail['from'] = Config::me('mail');    
    246246       $mail['to'] = $to; 
    … …  
    293293                     
    294294             $subject['notificationType'] = 'Cancelamento de Calendario'; 
    295              $subject['eventTitle'] = $schedulable['summary']; 
     295             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8'); 
    296296             $subject['startDate'] = date_format( $sTime , 'd/m/Y'); 
    297297             $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i'); 
    … …  
    347347            
    348348             $subject['notificationType'] = 'Cancelamento de Calendario'; 
    349              $subject['eventTitle'] = $schedulable['summary']; 
     349             $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8'); 
    350350             $subject['startDate'] = date_format( $sTime , 'd/m/Y'); 
    351351             $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format( $sTime , 'H:i'); 
    … …  
    421421 
    422422            $subject['notificationType'] = 'Modificação de Calendario'; 
    423             $subject['eventTitle'] = $schedulable['summary']; 
     423            $subject['eventTitle'] = mb_convert_encoding($schedulable['summary'],'ISO-8859-1','ISO-8859-1,UTF-8'); 
    424424            $subject['startDate'] = date_format($sTime, 'd/m/Y'); 
    425425            $subject['startTime'] = ($schedulable['allDay']) ? '' : date_format($sTime, 'H:i'); 
Note: See TracChangeset for help on using the changeset viewer.