From f94019a0c3d2cc621602b3b2569d773a40f3b263 Mon Sep 17 00:00:00 2001 From: Lars Kneschke Date: Thu, 26 Feb 2004 08:31:08 +0000 Subject: [PATCH] fix for bug [ 899867 ] Broken login page in RC3 --- login.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/login.php b/login.php index dde491e6fd..6cb6a680ca 100755 --- a/login.php +++ b/login.php @@ -354,7 +354,7 @@ $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_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']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.egroupware.org')); + $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 // FIXME $GLOBALS['phpgw']->common->image must get extra argument: force to look in this template set thirst @@ -363,6 +363,9 @@ if($GLOBALS['phpgw_info']['server']['login_logo_file']) { + // the find_image function does require this information + $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))