forked from extern/egroupware
removed charset from tpls since its added by xslt already plus update class.common: add a flag to disable any xslt output
This commit is contained in:
parent
ded88a0790
commit
dbca6b1b6b
@ -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 */
|
||||
|
@ -3,7 +3,6 @@
|
||||
<xsl:template match="phpgw">
|
||||
<xsl:variable name="phpgw_css_file" select="phpgw_css_file"/>
|
||||
<xsl:variable name="theme_css_file" select="theme_css_file"/>
|
||||
<xsl:variable name="charset" select="charset"/>
|
||||
<xsl:variable name="onload" select="onload"/>
|
||||
<xsl:variable name="home_link" select="home_link"/>
|
||||
<xsl:variable name="prefs_link" select="prefs_link"/>
|
||||
@ -26,7 +25,6 @@
|
||||
<xsl:variable name="webserver_url"><xsl:value-of select="webserver_url"/></xsl:variable>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset={$charset}"/>
|
||||
<meta name="author" content="phpGroupWare http://www.phpgroupware.org"/>
|
||||
<meta name="description" content="phpGroupWare"/>
|
||||
<meta name="keywords" content="phpGroupWare"/>
|
||||
|
@ -3,11 +3,9 @@
|
||||
<xsl:template match="phpgw">
|
||||
<xsl:variable name="phpgw_css_file" select="phpgw_css_file"/>
|
||||
<xsl:variable name="theme_css_file" select="theme_css_file"/>
|
||||
<xsl:variable name="charset" select="charset"/>
|
||||
<xsl:variable name="current_app" select="current_app"/>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset={$charset}"/>
|
||||
<meta name="author" content="phpGroupWare http://www.phpgroupware.org"/>
|
||||
<meta name="description" content="phpGroupWare"/>
|
||||
<meta name="keywords" content="phpGroupWare"/>
|
||||
|
@ -3,7 +3,6 @@
|
||||
<xsl:template match="phpgw">
|
||||
<xsl:variable name="phpgw_css_file"><xsl:value-of select="phpgw_css_file"/></xsl:variable>
|
||||
<xsl:variable name="theme_css_file"><xsl:value-of select="theme_css_file"/></xsl:variable>
|
||||
<xsl:variable name="charset"><xsl:value-of select="charset"/></xsl:variable>
|
||||
<xsl:variable name="webserver_url"><xsl:value-of select="webserver_url"/></xsl:variable>
|
||||
<xsl:variable name="logo_img"><xsl:value-of select="logo_img"/></xsl:variable>
|
||||
<xsl:variable name="home_link"><xsl:value-of select="home_link"/></xsl:variable>
|
||||
@ -27,7 +26,6 @@
|
||||
<xsl:variable name="current_app" select="current_app"/>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset={$charset}"/>
|
||||
<meta name="author" content="phpGroupWare http://www.phpgroupware.org"/>
|
||||
<meta name="description" content="phpGroupWare"/>
|
||||
<meta name="keywords" content="phpGroupWare"/>
|
||||
|
@ -3,7 +3,6 @@
|
||||
<xsl:template match="phpgw">
|
||||
<xsl:variable name="phpgw_css_file"><xsl:value-of select="phpgw_css_file"/></xsl:variable>
|
||||
<xsl:variable name="theme_css_file"><xsl:value-of select="theme_css_file"/></xsl:variable>
|
||||
<xsl:variable name="charset"><xsl:value-of select="charset"/></xsl:variable>
|
||||
<xsl:variable name="webserver_url"><xsl:value-of select="webserver_url"/></xsl:variable>
|
||||
<xsl:variable name="onload"><xsl:value-of select="onload"/></xsl:variable>
|
||||
<xsl:variable name="logo_img"><xsl:value-of select="logo_img"/></xsl:variable>
|
||||
@ -32,7 +31,6 @@
|
||||
<xsl:variable name="current_app" select="current_app"/>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset={$charset}"/>
|
||||
<meta name="author" content="phpGroupWare http://www.phpgroupware.org"/>
|
||||
<meta name="description" content="phpGroupWare"/>
|
||||
<meta name="keywords" content="phpGroupWare"/>
|
||||
|
@ -4,7 +4,6 @@
|
||||
<xsl:variable name="phpgw_css_file"><xsl:value-of select="phpgw_css_file"/></xsl:variable>
|
||||
<xsl:variable name="theme_css_file"><xsl:value-of select="theme_css_file"/></xsl:variable>
|
||||
<xsl:variable name="webserver_url"><xsl:value-of select="webserver_url"/></xsl:variable>
|
||||
<xsl:variable name="charset"><xsl:value-of select="charset"/></xsl:variable>
|
||||
<xsl:variable name="onload"><xsl:value-of select="onload"/></xsl:variable>
|
||||
<xsl:variable name="logo_img"><xsl:value-of select="logo_img"/></xsl:variable>
|
||||
<xsl:variable name="nav_bar_left_top_bg_img"><xsl:value-of select="nav_bar_left_top_bg_img"/></xsl:variable>
|
||||
@ -27,7 +26,6 @@
|
||||
<xsl:variable name="current_app" select="current_app"/>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset={$charset}"/>
|
||||
<meta name="author" content="phpGroupWare http://www.phpgroupware.org"/>
|
||||
<meta name="description" content="phpGroupWare"/>
|
||||
<meta name="keywords" content="phpGroupWare"/>
|
||||
|
@ -3,7 +3,6 @@
|
||||
<xsl:template match="phpgw">
|
||||
<xsl:variable name="phpgw_css_file" select="phpgw_css_file"/>
|
||||
<xsl:variable name="theme_css_file" select="theme_css_file"/>
|
||||
<xsl:variable name="charset" select="charset"/>
|
||||
<xsl:variable name="logo_img" select="logo_img"/>
|
||||
<xsl:variable name="home_link" select="home_link"/>
|
||||
<xsl:variable name="prefs_link" select="prefs_link"/>
|
||||
@ -28,7 +27,6 @@
|
||||
<xsl:variable name="webserver_url"><xsl:value-of select="webserver_url"/></xsl:variable>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset={$charset}"/>
|
||||
<meta name="author" content="phpGroupWare http://www.phpgroupware.org"/>
|
||||
<meta name="description" content="phpGroupWare"/>
|
||||
<meta name="keywords" content="phpGroupWare"/>
|
||||
|
Loading…
Reference in New Issue
Block a user