extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 13:39:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

new 4th parameter to egw_framework::includeCSS() to tell framework NOT to load any default CSS and make send_headers public

Browse Source
This commit is contained in:
Ralf Becker 2014-03-03 14:54:03 +00:00
parent d044c02ae8
commit 876a14ff52
2 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -135,7 +135,7 @@ abstract class egw_framework
/** /**
* Send HTTP headers: Content-Type and Content-Security-Policy * Send HTTP headers: Content-Type and Content-Security-Policy
*/ */
protected function _send_headers() public function send_headers()
{ {
// add a content-type header to overwrite an existing default charset in apache (AddDefaultCharset directiv) // add a content-type header to overwrite an existing default charset in apache (AddDefaultCharset directiv)
header('Content-type: text/html; charset='.translation::charset()); header('Content-type: text/html; charset='.translation::charset());
@ -1011,7 +1011,13 @@ if ($app == 'home') continue;
public function _get_css() public function _get_css()
{ {
$app_css = ''; $app_css = '';
if (isset($GLOBALS['egw_info']['flags']['css']))
{
$app_css = $GLOBALS['egw_info']['flags']['css'];
}
if (self::$load_default_css)
{
// Load these first // Load these first
// Cascade should go: // Cascade should go:
// Libs < etemplate2 < framework/theme < app < print (?) // Libs < etemplate2 < framework/theme < app < print (?)
@ -1024,20 +1030,6 @@ if ($app == 'home') continue;
// eTemplate2 - load in top so sidebox has styles too // eTemplate2 - load in top so sidebox has styles too
self::includeCSS('/etemplate/templates/default/etemplate2.css'); self::includeCSS('/etemplate/templates/default/etemplate2.css');
if(isset($_GET['menuaction']))
{
list($app,$class,$method) = explode('.',$_GET['menuaction']);
if(is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['css'])
{
error_log("Deprecated functionality in $app class $class: using of public_function css, use \$GLOBALS['egw_info']['flags']['css'] or an app.css file!");
$app_css .= $GLOBALS[$class]->css();
}
}
if (isset($GLOBALS['egw_info']['flags']['css']))
{
$app_css .= $GLOBALS['egw_info']['flags']['css'];
}
$theme_css = $this->template_dir.'/css/'.$GLOBALS['egw_info']['user']['preferences']['common']['theme'].'.css'; $theme_css = $this->template_dir.'/css/'.$GLOBALS['egw_info']['user']['preferences']['common']['theme'].'.css';
if(!file_exists(EGW_SERVER_ROOT.$theme_css)) if(!file_exists(EGW_SERVER_ROOT.$theme_css))
{ {
@ -1055,7 +1047,7 @@ if ($app == 'home') continue;
// sending template/theme and print css last, so they can overwrite anything // sending template/theme and print css last, so they can overwrite anything
self::includeCSS($theme_css); self::includeCSS($theme_css);
self::includeCSS($print_css); self::includeCSS($print_css);
}
// add all css files from self::includeCSS // add all css files from self::includeCSS
$max_modified = 0; $max_modified = 0;
$debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True'; $debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
@ -1823,16 +1815,29 @@ if ($app == 'home') continue;
*/ */
protected static $css_include_files = array(); protected static $css_include_files = array();
/**
*
* @var boolean
*/
protected static $load_default_css = true;
/** /**
* Include a css file, either speicified by it's path (relative to EGW_SERVER_ROOT) or appname and css file name * Include a css file, either speicified by it's path (relative to EGW_SERVER_ROOT) or appname and css file name
* *
* @param string $app path (relative to EGW_SERVER_ROOT) or appname (if !is_null($name)) * @param string $app path (relative to EGW_SERVER_ROOT) or appname (if !is_null($name))
* @param string $name=null name of css file in $app/templates/{default|$this->template}/$name.css * @param string $name=null name of css file in $app/templates/{default|$this->template}/$name.css
* @param boolean $append=true true append file, false prepend (add as first) file used eg. for template itself * @param boolean $append=true true append file, false prepend (add as first) file used eg. for template itself
* @param boolean $no_default_css=false true do NOT load any default css, only what app explicitly includes
* @return boolean false: css file not found, true: file found * @return boolean false: css file not found, true: file found
*/ */
public static function includeCSS($app, $name=null, $append=true) public static function includeCSS($app, $name=null, $append=true, $no_default_css=false)
{ {
if ($no_default_css)
{
self::$load_default_css = false;
self::$css_include_files = array();
}
if (!is_null($name)) if (!is_null($name))
{ {
$path = '/'.$app.'/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/'.$name.'.css'; $path = '/'.$app.'/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/'.$name.'.css';

2
phpgwapi/templates/idots/class.idots_framework.inc.php
View File

@ -91,7 +91,7 @@ class idots_framework extends egw_framework
if (self::$header_done) return ''; if (self::$header_done) return '';
self::$header_done = true; self::$header_done = true;
self::_send_headers(); $this->send_headers();
// catch error echo'ed before the header, ob_start'ed in the header.inc.php // catch error echo'ed before the header, ob_start'ed in the header.inc.php
$content = ob_get_contents(); $content = ob_get_contents();