mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-22 07:53:39 +01:00
fixed:
- 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)
This commit is contained in:
parent
24331610a9
commit
c4f87aed4c
@ -235,8 +235,19 @@ href="'.$GLOBALS['phpgw_info']['navbar']['logout']['url'].'"><img src="'.$GLOBAL
|
||||
$var['messages'] = $api_messages . '<br>' . checkcode($cd);
|
||||
}
|
||||
|
||||
$var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
|
||||
if (substr($GLOBALS['phpgw_info']['server']['login_logo_file'],0,4) == 'http')
|
||||
{
|
||||
$var['logo_file'] = $GLOBALS['phpgw_info']['server']['login_logo_file'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$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';
|
||||
|
||||
$GLOBALS['idots_tpl']->set_var($var);
|
||||
|
@ -156,8 +156,19 @@
|
||||
$var['powered_by'] = '';
|
||||
}
|
||||
|
||||
$var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
|
||||
if (substr($GLOBALS['phpgw_info']['server']['login_logo_file'],0,4) == 'http')
|
||||
{
|
||||
$var['logo_file'] = $GLOBALS['phpgw_info']['server']['login_logo_file'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$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';
|
||||
|
||||
$tpl->set_var($var);
|
||||
|
@ -204,8 +204,19 @@
|
||||
$var['messages'] = $api_messages . '<br>' . checkcode($cd);
|
||||
}
|
||||
|
||||
$var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
|
||||
if (substr($GLOBALS['phpgw_info']['server']['login_logo_file'],0,4) == 'http')
|
||||
{
|
||||
$var['logo_file'] = $GLOBALS['phpgw_info']['server']['login_logo_file'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$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';
|
||||
|
||||
$GLOBALS['jerryr_tpl']->set_var($var);
|
||||
|
@ -105,8 +105,19 @@
|
||||
$var['messages'] = $api_messages . '<br>' . checkcode($cd);
|
||||
}
|
||||
|
||||
$var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
|
||||
if (substr($GLOBALS['phpgw_info']['server']['login_logo_file'],0,4) == 'http')
|
||||
{
|
||||
$var['logo_file'] = $GLOBALS['phpgw_info']['server']['login_logo_file'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$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';
|
||||
|
||||
$GLOBALS['idots_tpl']->set_var($var);
|
||||
|
Loading…
Reference in New Issue
Block a user