From 410028494389c5a8ac7096d9b2e25eb7904b27ed Mon Sep 17 00:00:00 2001 From: jengo Date: Wed, 4 Jul 2001 03:00:05 +0000 Subject: [PATCH] Admins can now force users to use a default app --- index.php | 5 ++++ preferences/acl_preferences.php | 5 ++++ preferences/inc/hook_config.inc.php | 29 ++++++++++++++++++++++++ preferences/settings.php | 9 +++++++- preferences/templates/default/config.tpl | 9 ++++++++ 5 files changed, 56 insertions(+), 1 deletion(-) diff --git a/index.php b/index.php index 217402a260..48d3d156dd 100755 --- a/index.php +++ b/index.php @@ -52,6 +52,11 @@ $phpgw->redirect($phpgw->link($phpgw_forward,$extra_vars)); } + if ($phpgw_info['server']['force_default_app'] && $phpgw_info['server']['force_default_app'] != 'user_choice') + { + $phpgw_info['user']['preferences']['common']['default_app'] = $phpgw_info['server']['force_default_app']; + } + if (($phpgw_info['user']['preferences']['common']['useframes'] && $phpgw_info['server']['useframes'] == 'allowed') || ($phpgw_info['server']['useframes'] == 'always')) diff --git a/preferences/acl_preferences.php b/preferences/acl_preferences.php index aa0985dd7d..4c3785aab1 100644 --- a/preferences/acl_preferences.php +++ b/preferences/acl_preferences.php @@ -209,6 +209,11 @@ $p->set_file($templates); + if ($submit) + { + $p->set_var('errors',lang('ACL grants have been updated')); + } + $common_hidden_vars = ' '."\n" . ' '."\n" . ' '."\n" diff --git a/preferences/inc/hook_config.inc.php b/preferences/inc/hook_config.inc.php index fb5893eaf6..50e7d962d6 100644 --- a/preferences/inc/hook_config.inc.php +++ b/preferences/inc/hook_config.inc.php @@ -95,4 +95,33 @@ } return $out; } + + function force_default_app($config) + { + global $phpgw, $phpgw_info; + + $out = '