mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 14:41:29 +01:00
- fixed main screen message (an other unnecessary stripslashes, after the correct handling in admin now)
- allow non numerical "show-on-home" pref (handled like 1)
This commit is contained in:
parent
80b4999f22
commit
d4cbb31b8f
@ -77,7 +77,7 @@
|
||||
$GLOBALS['egw']->translation->add_app('mainscreen');
|
||||
if (lang('mainscreen_message') != 'mainscreen_message*')
|
||||
{
|
||||
echo '<div style="text-align: center;">' . stripslashes(lang('mainscreen_message')) . "</div>\n";
|
||||
echo '<div style="text-align: center;">' . lang('mainscreen_message') . "</div>\n";
|
||||
}
|
||||
|
||||
/*
|
||||
@ -215,26 +215,17 @@
|
||||
}
|
||||
$varnames = $portal_oldvarnames;
|
||||
$varnames[] = 'homepage_display';
|
||||
$thisd = 0;
|
||||
foreach($varnames as $varcheck)
|
||||
{
|
||||
//echo "$appname:$varcheck=".$GLOBALS['egw_info']['user']['preferences'][$appname][$varcheck]."<br>";
|
||||
if($GLOBALS['egw_info']['user']['preferences'][$appname][$varcheck]=='True')
|
||||
{
|
||||
$thisd = 1;
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
$_thisd = (int)$GLOBALS['egw_info']['user']['preferences'][$appname][$varcheck];
|
||||
if($_thisd>0)
|
||||
$thisd = (int)$GLOBALS['egw_info']['user']['preferences'][$appname][$varcheck];
|
||||
if (!$thisd && $GLOBALS['egw_info']['user']['preferences'][$appname][$varcheck]) $thisd = 1;
|
||||
if($thisd>0)
|
||||
{
|
||||
//echo "Found $appname=$_thisd through $varcheck<br>";
|
||||
$thisd = $_thisd;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
//echo "$appname: $thisd<br>";
|
||||
if($thisd>0)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user