Changeset 2419 for trunk/calendar


Ignore:
Timestamp:
04/05/10 16:31:25 (14 years ago)
Author:
rodsouza
Message:

Ticket #1009 - Removendo a chamada redundante ao método 'phpgw_header' no ExpressoLivre?

Location:
trunk/calendar/inc
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/calendar/inc/class.uicalendar.inc.php

    r2230 r2419  
    170170                        $sb = CreateObject('phpgwapi.sbox2'); 
    171171                        $jscal = CreateObject('phpgwapi.jscalendar');   // before phpgw_header() !!! 
    172                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    173                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     172                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     173                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    174174                        $GLOBALS['phpgw_info']['flags']['noappheader'] = True; 
    175175                        $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; 
    176176                        $GLOBALS['phpgw_info']['flags']['app_header'] = $event['id'] ? lang('Calendar - Edit') : lang('Calendar - Add'); 
    177                         $GLOBALS['phpgw']->common->phpgw_header(); 
     177                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    178178 
    179179                        $ldap_manager = CreateObject('contactcenter.bo_ldap_manager'); 
    … …  
    477477                        else 
    478478                        { 
    479                                 unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    480                                 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     479                                //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     480                                //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    481481                                unset($GLOBALS['phpgw_info']['flags']['noappheader']); 
    482482                                unset($GLOBALS['phpgw_info']['flags']['noappfooter']); 
    … …  
    486486                                } 
    487487                                 
    488                                 $GLOBALS['phpgw']->common->phpgw_header(); 
     488                                $this -> header( ); 
     489                                //$GLOBALS['phpgw']->common->phpgw_header(); 
    489490                                $new_body = $this->bo->debug_string.$body;                               
    490491                                 
    … …  
    833834                function view($vcal_id=0,$cal_date=0) 
    834835                { 
    835                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    836                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     836                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     837                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    837838                        $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('View'); 
    838839                        $GLOBALS['phpgw_info']['flags']['noappheader'] = True; 
    839                         $GLOBALS['phpgw']->common->phpgw_header(); 
     840                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    840841 
    841842                        $cal_id = get_var('cal_id',array('GET','POST'),$vcal_id); 
    … …  
    11801181                        } 
    11811182 
    1182                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    1183                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     1183                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     1184                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    11841185                        $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Reinstate'); 
    1185                         $GLOBALS['phpgw']->common->phpgw_header(); 
     1186                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    11861187 
    11871188                        $cal_id = get_var('cal_id',array('GET'),$params['cal_id']); 
    … …  
    18621863                function edit_status() 
    18631864                { 
    1864                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    1865                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     1865                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     1866                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    18661867                        $GLOBALS['phpgw_info']['flags']['noappheader'] = True; 
    18671868                        $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; 
    18681869                        $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Change Status'); 
    1869                         $GLOBALS['phpgw']->common->phpgw_header(); 
     1870                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    18701871 
    18711872                        $event = $this->bo->read_entry($_GET['cal_id']); 
    … …  
    19791980                                } 
    19801981         
    1981                                 unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    1982                                 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     1982                                //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     1983                                //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    19831984                                $GLOBALS['phpgw_info']['flags']['noappheader'] = True; 
    19841985                                $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; 
    19851986                                $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Scheduling Conflict'); 
    1986                                 $GLOBALS['phpgw']->common->phpgw_header(); 
     1987                                //$GLOBALS['phpgw']->common->phpgw_header(); 
    19871988         
    19881989                                $p = $GLOBALS['phpgw']->template; 
    … …  
    21522153                        if (!$no_header) 
    21532154                        { 
    2154                                 unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    2155                                 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     2155                                //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     2156                                //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    21562157                                if ($this->always_app_header) $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Group Planner'); 
    2157                                 $GLOBALS['phpgw']->common->phpgw_header(); 
     2158                                //$GLOBALS['phpgw']->common->phpgw_header(); 
    21582159                        } 
    21592160 
    … …  
    26972698                        $sb = CreateObject('phpgwapi.sbox'); 
    26982699 
    2699                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    2700                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     2700                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     2701                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    27012702                        if ($this->always_app_header) $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Matrixview'); 
    2702                         $GLOBALS['phpgw']->common->phpgw_header(); 
     2703                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    27032704 
    27042705                        $p = &$GLOBALS['phpgw']->template; 
    … …  
    28532854                        $GLOBALS['phpgw']->session->appsession("participants", NULL, implode(";", $participants)); 
    28542855 
    2855                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    2856                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     2856                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     2857                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    28572858                        if ($this->always_app_header) $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Matrixview'); 
    2858                         $GLOBALS['phpgw']->common->phpgw_header(); 
     2859                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    28592860 
    28602861                        switch($_POST['matrixtype']) 
    … …  
    29192920                        } 
    29202921 
    2921                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    2922                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     2922                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     2923                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    29232924                        $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Search Results'); 
    2924                         $GLOBALS['phpgw']->common->phpgw_header(); 
     2925                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    29252926 
    29262927                        $error = ''; 
    … …  
    33603361                        if(!isset($GLOBALS['phpgw_info']['flags']['noheader'])) 
    33613362                        { 
    3362                                 unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    3363                                 unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     3363                                //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     3364                                //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    33643365                                $GLOBALS['phpgw_info']['flags']['noappheader'] = True; 
    33653366                                $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; 
    33663367                                $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Permission denied'); 
    3367                                 $GLOBALS['phpgw']->common->phpgw_header(); 
     3368                                //$GLOBALS['phpgw']->common->phpgw_header(); 
    33683369                        } 
    33693370                        echo '<center>You do not have permission to edit this appointment!</center>'; 
    … …  
    38143815                        } 
    38153816 
    3816                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    3817                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     3817                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     3818                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    38183819                        $GLOBALS['phpgw_info']['flags']['noappheader'] = True; 
    38193820                        $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; 
    38203821                        $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Scheduling Conflict'); 
    3821                         $GLOBALS['phpgw']->common->phpgw_header(); 
     3822                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    38223823 
    38233824                        $p = $GLOBALS['phpgw']->template; 
    … …  
    49084909                        $jscal = CreateObject('phpgwapi.jscalendar');   // before phpgw_header() !!! 
    49094910                         
    4910                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    4911                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     4911                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     4912                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    49124913                        $GLOBALS['phpgw_info']['flags']['noappheader'] = True; 
    49134914                        $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; 
    49144915                        $GLOBALS['phpgw_info']['flags']['app_header'] = $event['id'] ? lang('Editing event') : lang('Adding event'); 
    49154916                        if ($param['plain'] != "True"){ 
    4916                                 $GLOBALS['phpgw']->common->phpgw_header(); 
     4917                        //      $GLOBALS['phpgw']->common->phpgw_header(); 
    49174918                        } 
    49184919                        else{ 

  • trunk/calendar/inc/class.uicustom_fields.inc.php

    r1684 r2419  
    4444                              $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/admin/index.php')); 
    4545                        } 
    46                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    47                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     46                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     47                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    4848                        $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Custom fields and sorting'); 
    49                         $GLOBALS['phpgw']->common->phpgw_header(); 
     49                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    5050 
    5151                        $this->tpl = $GLOBALS['phpgw']->template; 

  • trunk/calendar/inc/class.uigroup_access.inc.php

    r1684 r2419  
    4545                                        ); 
    4646                 
    47                 $GLOBALS['phpgw']->common->phpgw_header(); 
     47                //$GLOBALS['phpgw']->common->phpgw_header(); 
    4848                $this->template_dir = 'calendar/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']; 
    4949                $this->template = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);               

  • trunk/calendar/inc/class.uiholiday.inc.php

    r1684 r2419  
    5252                              $GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/admin/index.php')); 
    5353                        } 
    54                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    55                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     54                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     55                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    5656                        $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; 
    57                         $GLOBALS['phpgw']->common->phpgw_header(); 
     57                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    5858 
    5959                        $p = &$GLOBALS['phpgw']->template; 
    … …  
    138138                                $GLOBALS['phpgw']->redirect_link($this->base_url,$link_params); 
    139139                        } 
    140                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    141                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     140                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     141                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    142142                        $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; 
    143                         $GLOBALS['phpgw']->common->phpgw_header(); 
     143                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    144144                        $p = CreateObject('phpgwapi.Template',$this->template_dir); 
    145145                        $p->set_file(Array('locale'=>'locales.tpl')); 
    … …  
    247247                                $holiday['locale'] = $this->locale; 
    248248                        } 
    249                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    250                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     249                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     250                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    251251                        $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; 
    252252                        $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.($this->bo->id ? lang('Edit') : lang('Add')).' '.lang('Holiday'); 
    253                         $GLOBALS['phpgw']->common->phpgw_header(); 
     253                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    254254 
    255255                        $t = &$GLOBALS['phpgw']->template; 
    … …  
    380380                        } 
    381381 
    382                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    383                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     382                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     383                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    384384                        $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; 
    385                         $GLOBALS['phpgw']->common->phpgw_header(); 
     385                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    386386 
    387387                        $p = CreateObject('phpgwapi.Template',$this->template_dir); 
    … …  
    420420                        } 
    421421                         
    422                         unset($GLOBALS['phpgw_info']['flags']['noheader']); 
    423                         unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
     422                        //unset($GLOBALS['phpgw_info']['flags']['noheader']); 
     423                        //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); 
    424424                        $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; 
    425                         $GLOBALS['phpgw']->common->phpgw_header(); 
     425                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    426426 
    427427                        $p = CreateObject('phpgwapi.Template',$this->template_dir); 
    … …  
    484484                        $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; 
    485485                        $GLOBALS['phpgw_info']['flags']['nofooter'] = True; 
    486                         $GLOBALS['phpgw']->common->phpgw_header(); 
     486                        //$GLOBALS['phpgw']->common->phpgw_header(); 
    487487 
    488488                        echo '<body onLoad="document.submitform.submit()">'."\n"; 
Note: See TracChangeset for help on using the changeset viewer.