diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php
index 96bd399553..a34147e171 100755
--- a/admin/inc/class.uiaccounts.inc.php
+++ b/admin/inc/class.uiaccounts.inc.php
@@ -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 '
#'.$account_id.'#
';
$prevVal = $GLOBALS['egw']->accounts->id2name($account_id,'account_lastpwd_change');
- //echo '
#'.$prevVal.'#
'; // previous Value was forced password change by admin
+ //echo '
#'.$prevVal.'#
'; // 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)
}
diff --git a/phpgwapi/inc/class.egw.inc.php b/phpgwapi/inc/class.egw.inc.php
index 034fb50776..8977c53917 100644
--- a/phpgwapi/inc/class.egw.inc.php
+++ b/phpgwapi/inc/class.egw.inc.php
@@ -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']] ||
diff --git a/setup/admin_account.php b/setup/admin_account.php
index 2d08d4dda3..fc3302d54e 100644
--- a/setup/admin_account.php
+++ b/setup/admin_account.php
@@ -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)