[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.202,1.203

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv27543/inc

Modified Files:
        class.common.inc.php 
Log Message:
removed charset from tpls since its added by xslt already plus update 
class.common: add a flag to disable any xslt output

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.202
retrieving revision 1.203
diff -C2 -r1.202 -r1.203
*** class.common.inc.php        24 Apr 2003 01:34:44 -0000      1.202
--- class.common.inc.php        24 Apr 2003 21:04:22 -0000      1.203
***************
*** 1073,1077 ****
                        $var = array
                        (
-                               'charset'                       => 
lang('charset'),
                                'website_title'         => 
$GLOBALS['phpgw_info']['server']['site_title'] . $app_title,
                                'webserver_url'         => 
$GLOBALS['phpgw_info']['server']['webserver_url'],
--- 1073,1076 ----
***************
*** 1658,1684 ****
                                define('PHPGW_FINAL',True);
  
!                               
if($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
!                                       
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
!                                       
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
!                                       
address@hidden'phpgw_info']['flags']['noappfooter'])
                                {
!                                       
if($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
                                        {
!                                               $this->start_xslt_capture();    
// if index already turned it off
                                        }
-                                       $this->phpgw_appfooter();
-                               }
  
!                               if 
($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
!                               {
!                                       $this->stop_xslt_capture();
!                               }
  
!                               if 
($GLOBALS['phpgw_info']['flags']['currentapp'] != 'login'&&
!                                       
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout')
!                               {
!                                       $this->framework();
                                }
-                               $GLOBALS['phpgw']->xslttpl->pp();
                                $GLOBALS['phpgw']->db->disconnect();
  
--- 1657,1686 ----
                                define('PHPGW_FINAL',True);
  
!                               if 
(!$GLOBALS['phpgw_info']['flags']['noframework'])
                                {
!                                       
if($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
!                                               
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
!                                               
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
!                                               
address@hidden'phpgw_info']['flags']['noappfooter'])
                                        {
!                                               
if($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
!                                               {
!                                                       
$this->start_xslt_capture();    // if index already turned it off
!                                               }
!                                               $this->phpgw_appfooter();
                                        }
  
!                                       if 
($GLOBALS['phpgw_info']['server']['support_old_style_apps'])
!                                       {
!                                               $this->stop_xslt_capture();
!                                       }
  
!                                       if 
($GLOBALS['phpgw_info']['flags']['currentapp'] != 'login'&&
!                                               
$GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout')
!                                       {
!                                               $this->framework();
!                                       }
!                                       $GLOBALS['phpgw']->xslttpl->pp();
                                }
                                $GLOBALS['phpgw']->db->disconnect();