holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove $windowed flag, as all template-sets are windows nowadays

Browse Source 
it also caused setting a non-existing template-set to display "/usr/share/egroupware/api/src/loader/deprecated_factory.php (58)"
This commit is contained in:
Ralf Becker 2022-01-28 10:19:06 +02:00
parent 855b786d97
commit 1241dac3c7
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
index.php
View File

@ -100,24 +100,7 @@ if (isset($_GET['tz']))
} }
} }
// Check if we are using windows or normal webpage if($app == 'api' && !$class && !$api_requested && !($_GET['cd'] === 'yes' && !Api\Header\UserAgent::mobile()) && $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] == 'idots')
$windowed = false;
$tpl_info = EGW_SERVER_ROOT . '/api/templates/' . basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']) . '/setup/setup.inc.php';
if (!file_exists($tpl_info))
{
$tpl_info = EGW_SERVER_ROOT.'/'.basename($GLOBALS['egw_info']['user']['preferences']['common']['template_set']) . '/setup/setup.inc.php';
}
if(@file_exists($tpl_info))
{
include_once($tpl_info);
if($GLOBALS['egw_info']['template'][$GLOBALS['egw_info']['user']['preferences']['common']['template_set']]['windowed'])
{
$windowed = true;
}
}
if($app == 'api' && !$class && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !Api\Header\UserAgent::mobile()) && $GLOBALS['egw_info']['user']['preferences']['common']['template_set'] == 'idots')
{ {
if ($GLOBALS['egw_info']['server']['force_default_app'] && $GLOBALS['egw_info']['server']['force_default_app'] != 'user_choice') if ($GLOBALS['egw_info']['server']['force_default_app'] && $GLOBALS['egw_info']['server']['force_default_app'] != 'user_choice')
{ {
@ -133,7 +116,7 @@ if($app == 'api' && !$class && !$api_requested && !($windowed && $_GET['cd'] ==
} }
} }
if($windowed && $_GET['cd'] == 'yes') if ($_GET['cd'] == 'yes' || empty($class))
{ {
$GLOBALS['egw_info']['flags'] = array( $GLOBALS['egw_info']['flags'] = array(
'noheader' => False, 'noheader' => False,