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

fixed not working account-selection popup

Browse Source
This commit is contained in:
Ralf Becker 2014-06-02 15:03:23 +00:00
parent 2b86934088
commit 915940e51a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.php
View File

@ -97,14 +97,14 @@ if(@file_exists($tpl_info))
} }
// until home works again, we redirect to default_app from prefs (if set and not home) or calendar, if allowed, or first app found // until home works again, we redirect to default_app from prefs (if set and not home) or calendar, if allowed, or first app found
if ($app == 'home' && !($GLOBALS['egw']->framework instanceof jdots_framework)) if ($app == 'home' && !$api_requested && !($GLOBALS['egw']->framework instanceof jdots_framework))
{ {
$app = $GLOBALS['egw_info']['user']['preferences']['common']['default_app']; $app = $GLOBALS['egw_info']['user']['preferences']['common']['default_app'];
if (!$app || $app == 'home') $app = isset($GLOBALS['egw_info']['user']['apps']['calendar']) ? 'calendar' : key($GLOBALS['egw_info']['user']['apps']); if (!$app || $app == 'home') $app = isset($GLOBALS['egw_info']['user']['apps']['calendar']) ? 'calendar' : key($GLOBALS['egw_info']['user']['apps']);
egw::redirect(egw_framework::index($app), $app); egw::redirect(egw_framework::index($app), $app);
} }
// until home works again, we build new frameset for jdots template // until home works again, we build new frameset for jdots template
if ($app == 'home' && $GLOBALS['egw']->framework instanceof jdots_framework) $_GET['cd'] = 'yes'; if ($app == 'home' && !$api_requested && $GLOBALS['egw']->framework instanceof jdots_framework) $_GET['cd'] = 'yes';
if($app == 'home' && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !html::$ua_mobile)) if($app == 'home' && !$api_requested && !($windowed && $_GET['cd'] == 'yes' && !html::$ua_mobile))
{ {