extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-23 14:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

* give everyone implicit rights for home app, as taking them away makes to many support problems

Browse Source
This commit is contained in:
Ralf Becker 2011-03-30 08:00:14 +00:00
parent 1de74dc26c
commit b924262b2f
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/inc/class.uiaccounts.inc.php
View File

@ -1200,7 +1200,7 @@
$availableApps = $GLOBALS['egw_info']['apps']; $availableApps = $GLOBALS['egw_info']['apps'];
foreach($availableApps as $app => $data) foreach($availableApps as $app => $data)
{ {
if (!$data['enabled'] || !$data['status'] || $data['status'] == 3) if (!$data['enabled'] || !$data['status'] || $data['status'] == 3 || $app == 'home')
{ {
unset($availableApps[$app]); // do NOT show disabled apps, or our API (status = 3) unset($availableApps[$app]); // do NOT show disabled apps, or our API (status = 3)
} }
@ -1520,7 +1520,7 @@
$availableApps = $GLOBALS['egw_info']['apps']; $availableApps = $GLOBALS['egw_info']['apps'];
foreach($availableApps as $app => $data) foreach($availableApps as $app => $data)
{ {
if (!$data['enabled'] || !$data['status'] || $data['status'] == 3) if (!$data['enabled'] || !$data['status'] || $data['status'] == 3 || $app == 'home')
{ {
unset($availableApps[$app]); // do NOT show disabled apps, or our API (status = 3) unset($availableApps[$app]); // do NOT show disabled apps, or our API (status = 3)
} }

2
phpgwapi/inc/class.egw.inc.php
View File

@ -342,7 +342,7 @@ class egw extends egw_minimal
{ {
$this->currentapp = $GLOBALS['egw_info']['flags']['currentapp']; // some apps change it later $this->currentapp = $GLOBALS['egw_info']['flags']['currentapp']; // some apps change it later
if ($GLOBALS['egw_info']['flags']['currentapp'] != 'about') if ($GLOBALS['egw_info']['flags']['currentapp'] != 'home') // give everyone implicit home rights
{ {
// This will need to use ACL in the future // This will need to use ACL in the future
if (!$GLOBALS['egw_info']['user']['apps'][$currentapp = $GLOBALS['egw_info']['flags']['currentapp']] || if (!$GLOBALS['egw_info']['user']['apps'][$currentapp = $GLOBALS['egw_info']['flags']['currentapp']] ||

7
setup/admin_account.php
View File

@ -118,13 +118,12 @@ else
} }
// Group perms for the default group // Group perms for the default group
$GLOBALS['egw_setup']->add_acl(array('addressbook','calendar','infolog','felamimail','filemanager','preferences','home','manual','groupdav','notifications','syncml'),'run',$defaultgroupid); $GLOBALS['egw_setup']->add_acl(array('addressbook','calendar','infolog','felamimail','filemanager','preferences','manual','groupdav','notifications','syncml'),'run',$defaultgroupid);
$apps = array(); $apps = array();
$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'app_name','app_enabled < 3',__LINE__,__FILE__); foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'app_name','app_enabled < 3',__LINE__,__FILE__) as $row)
while ($GLOBALS['egw_setup']->db->next_record())
{ {
$apps[] = $GLOBALS['egw_setup']->db->f('app_name'); $apps[] = $row['app_name'];
} }
// if not otherwise selected, give admin only access to the rest of the default apps, // if not otherwise selected, give admin only access to the rest of the default apps,
// not yet set for the default group or development only apps like (etemplate, jinn, tt's) // not yet set for the default group or development only apps like (etemplate, jinn, tt's)