From dbca6b1b6bc4947b59a872afbbbaef7ce6b76d89 Mon Sep 17 00:00:00 2001 From: ceb Date: Thu, 24 Apr 2003 21:04:22 +0000 Subject: [PATCH] removed charset from tpls since its added by xslt already plus update class.common: add a flag to disable any xslt output --- phpgwapi/inc/class.common.inc.php | 38 +++++++++++---------- phpgwapi/templates/default/phpgw.xsl | 2 -- phpgwapi/templates/default/phpgw_header.xsl | 2 -- phpgwapi/templates/funkwerk/phpgw.xsl | 2 -- phpgwapi/templates/idsociety/phpgw.xsl | 2 -- phpgwapi/templates/justweb/phpgw.xsl | 2 -- phpgwapi/templates/verdilak/phpgw.xsl | 2 -- 7 files changed, 20 insertions(+), 30 deletions(-) diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php index 381158b1e6..703dd5515c 100644 --- a/phpgwapi/inc/class.common.inc.php +++ b/phpgwapi/inc/class.common.inc.php @@ -1072,7 +1072,6 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' $css = $this->get_css_url(); $var = array ( - 'charset' => lang('charset'), 'website_title' => $GLOBALS['phpgw_info']['server']['site_title'] . $app_title, 'webserver_url' => $GLOBALS['phpgw_info']['server']['webserver_url'], 'phpgw_css_file' => $css[0], @@ -1657,29 +1656,32 @@ if (!@is_file(PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info' { define('PHPGW_FINAL',True); - if($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' && - $GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' && - $GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' && - !@$GLOBALS['phpgw_info']['flags']['noappfooter']) + if (!$GLOBALS['phpgw_info']['flags']['noframework']) { - if($GLOBALS['phpgw_info']['server']['support_old_style_apps']) + if($GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' && + $GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' && + $GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' && + !@$GLOBALS['phpgw_info']['flags']['noappfooter']) { - $this->start_xslt_capture(); // if index already turned it off + if($GLOBALS['phpgw_info']['server']['support_old_style_apps']) + { + $this->start_xslt_capture(); // if index already turned it off + } + $this->phpgw_appfooter(); } - $this->phpgw_appfooter(); - } - if ($GLOBALS['phpgw_info']['server']['support_old_style_apps']) - { - $this->stop_xslt_capture(); - } + 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(); + if ($GLOBALS['phpgw_info']['flags']['currentapp'] != 'login'&& + $GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout') + { + $this->framework(); + } + $GLOBALS['phpgw']->xslttpl->pp(); } - $GLOBALS['phpgw']->xslttpl->pp(); $GLOBALS['phpgw']->db->disconnect(); /* Clean up mcrypt */ diff --git a/phpgwapi/templates/default/phpgw.xsl b/phpgwapi/templates/default/phpgw.xsl index 6c744f8c3a..3f161ffa6e 100644 --- a/phpgwapi/templates/default/phpgw.xsl +++ b/phpgwapi/templates/default/phpgw.xsl @@ -3,7 +3,6 @@ - @@ -26,7 +25,6 @@ - diff --git a/phpgwapi/templates/default/phpgw_header.xsl b/phpgwapi/templates/default/phpgw_header.xsl index 90ae9797f4..063d97123a 100644 --- a/phpgwapi/templates/default/phpgw_header.xsl +++ b/phpgwapi/templates/default/phpgw_header.xsl @@ -3,11 +3,9 @@ - - diff --git a/phpgwapi/templates/funkwerk/phpgw.xsl b/phpgwapi/templates/funkwerk/phpgw.xsl index 9cbfc02824..1247441b48 100644 --- a/phpgwapi/templates/funkwerk/phpgw.xsl +++ b/phpgwapi/templates/funkwerk/phpgw.xsl @@ -3,7 +3,6 @@ - @@ -27,7 +26,6 @@ - diff --git a/phpgwapi/templates/idsociety/phpgw.xsl b/phpgwapi/templates/idsociety/phpgw.xsl index cd9853fca0..eb151bc96e 100644 --- a/phpgwapi/templates/idsociety/phpgw.xsl +++ b/phpgwapi/templates/idsociety/phpgw.xsl @@ -3,7 +3,6 @@ - @@ -32,7 +31,6 @@ - diff --git a/phpgwapi/templates/justweb/phpgw.xsl b/phpgwapi/templates/justweb/phpgw.xsl index e8249429fd..fd18e8624b 100644 --- a/phpgwapi/templates/justweb/phpgw.xsl +++ b/phpgwapi/templates/justweb/phpgw.xsl @@ -4,7 +4,6 @@ - @@ -27,7 +26,6 @@ - diff --git a/phpgwapi/templates/verdilak/phpgw.xsl b/phpgwapi/templates/verdilak/phpgw.xsl index d0f8dacc85..8f83302e34 100644 --- a/phpgwapi/templates/verdilak/phpgw.xsl +++ b/phpgwapi/templates/verdilak/phpgw.xsl @@ -3,7 +3,6 @@ - @@ -28,7 +27,6 @@ -