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

fixed:

Browse Source 
- logo can be given now as URL or filename (in phpgwapi/templates/default/images)
- the logo url dont need a leading http://, if its not present, it will be added automaticaly (you can enter a https url)
- re-enabled autoload of lang-files, it can be disabled in Admin->Site configuration
This commit is contained in:
Ralf Becker 2004-03-21 14:58:04 +00:00
parent 45df07162b
commit 24331610a9
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
login.php
View File

@ -230,9 +230,7 @@
} }
if(!$GLOBALS['phpgw_info']['server']['disable_autoload_langfiles']) if(!$GLOBALS['phpgw_info']['server']['disable_autoload_langfiles'])
{ {
// this need to be fixed $GLOBALS['phpgw']->translation->autoload_changed_langfiles();
// lkneschke 20.01.2004
#$GLOBALS['phpgw']->translation->autoload_changed_langfiles();
} }
$extra_vars['cd'] = 'yes'; $extra_vars['cd'] = 'yes';
@ -354,30 +352,23 @@
$tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']); $tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']);
$tmpl->set_var('bg_color',($GLOBALS['phpgw_info']['server']['login_bg_color']?$GLOBALS['phpgw_info']['server']['login_bg_color']:'FFFFFF')); $tmpl->set_var('bg_color',($GLOBALS['phpgw_info']['server']['login_bg_color']?$GLOBALS['phpgw_info']['server']['login_bg_color']:'FFFFFF'));
$tmpl->set_var('bg_color_title',($GLOBALS['phpgw_info']['server']['login_bg_color_title']?$GLOBALS['phpgw_info']['server']['login_bg_color_title']:'486591')); $tmpl->set_var('bg_color_title',($GLOBALS['phpgw_info']['server']['login_bg_color_title']?$GLOBALS['phpgw_info']['server']['login_bg_color_title']:'486591'));
$tmpl->set_var('logo_url',($GLOBALS['phpgw_info']['server']['login_logo_url']?'http://'.$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.egroupware.org'));
// retrieve logo from login template set if (substr($GLOBALS['phpgw_info']['server']['login_logo_file'],0,4) == 'http')
// FIXME $GLOBALS['phpgw']->common->image must get extra argument: force to look in this template set thirst
$template_logo_file = $GLOBALS['phpgw_info']['server']['webserver_url'].'/phpgwapi/templates/'.$GLOBALS['phpgw_info']['login_template_set'].'/images/logo.png';
$template_logo_real = PHPGW_SERVER_ROOT . '/phpgwapi/templates/'.$GLOBALS['phpgw_info']['login_template_set'].'/images/logo.png';
if($GLOBALS['phpgw_info']['server']['login_logo_file'])
{ {
// the find_image function does require this information $var['logo_file'] = $GLOBALS['phpgw_info']['server']['login_logo_file'];
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] =
$GLOBALS['phpgw_info']['login_template_set'];
$tmpl->set_var('logo_file',$GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']));
}
elseif(getimagesize($template_logo_real))
{
$tmpl->set_var('logo_file',$template_logo_file);
} }
else else
{ {
$tmpl->set_var('logo_file',$GLOBALS['phpgw']->common->image('phpgwapi','logo')); $var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
} }
$var['logo_url'] = $GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
if (substr($var['logo_url'],0,4) != 'http')
{
$var['logo_url'] = 'http://'.$var['logo_url'];
}
$var['logo_title'] = $GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'www.eGroupWare.org';
$tmpl->set_var($var);
$tmpl->set_var('logo_title',($GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'eGroupWare --> home'));
$tmpl->set_var('autocomplete', ($GLOBALS['phpgw_info']['server']['autocomplete_login'] ? 'autocomplete="off"' : '')); $tmpl->set_var('autocomplete', ($GLOBALS['phpgw_info']['server']['autocomplete_login'] ? 'autocomplete="off"' : ''));
$tmpl->pfp('loginout','login_form'); $tmpl->pfp('loginout','login_form');