holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests 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 07:54:29 +00:00
parent 89c30a557a
commit 4039fdf415
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -872,7 +872,7 @@
'account_email' => $email,
/* 'file_space' => $_POST['account_file_space_number'] . "-" . $_POST['account_file_space_type'] */
);
if ($userData['mustchangepassword'])
if ($userData['mustchangepassword'])
{
$userData['account_lastpwd_change']=0;
}
@ -884,7 +884,7 @@
//echo '<br>#'.$account_id.'#<br>';
$prevVal = $GLOBALS['egw']->accounts->id2name($account_id,'account_lastpwd_change');
//echo '<br>#'.$prevVal.'#<br>'; // previous Value was forced password change by admin
//echo '<br>#'.$prevVal.'#<br>'; // previous Value was forced password change by admin
if (isset($prevVal) && $prevVal==0) $userData['account_lastpwd_change']=egw_time::to('now','ts');
}
if($userData['account_primary_group'] && (!isset($userData['account_groups']) || !in_array($userData['account_primary_group'],$userData['account_groups'])))
@ -1216,7 +1216,7 @@
$availableApps = $GLOBALS['egw_info']['apps'];
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)
}
@ -1543,7 +1543,7 @@
$availableApps = $GLOBALS['egw_info']['apps'];
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)
}

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

@ -354,7 +354,7 @@ class egw extends egw_minimal
{
$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
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
$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();
$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'app_name','app_enabled < 3',__LINE__,__FILE__);
while ($GLOBALS['egw_setup']->db->next_record())
foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'app_name','app_enabled < 3',__LINE__,__FILE__) as $row)
{
$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,
// not yet set for the default group or development only apps like (etemplate, jinn, tt's)