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

fixed lost active account-status, if an error happend (disabled permanent error_log)

Browse Source
This commit is contained in:
Ralf Becker 2013-06-26 10:48:37 +00:00
parent 5eea435035
commit 52933ba6c3
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -372,7 +372,7 @@
*/
function save_user(array &$_userData)
{
error_log(__METHOD__."(".array2string($_userData).")");
//error_log(__METHOD__."(".array2string($_userData).")");
$errors = array();
// do NOT save password via accounts::save, as pw policy violation can happen and we cant/dont report that way
@ -456,7 +456,7 @@
}
$GLOBALS['egw']->session->delete_cache((int)$_userData['account_id']);
error_log(__METHOD__."(".array2string($_userData).") returning ".array2string($errors));
//error_log(__METHOD__."(".array2string($_userData).") returning ".array2string($errors));
return $errors;
}

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

@ -888,17 +888,7 @@
settype($account_id,'integer');
$account_id = (int)($_GET['account_id'] ? $_GET['account_id'] : $accountid);
// todo
// not needed if i use the same file for new users too
/*if(!$account_id)
{
$this->list_users();
return False;
}
else*/
{
$this->create_edit_user($account_id);
}
$this->create_edit_user($account_id);
}
}
@ -962,7 +952,7 @@
$var['mustchangepassword']= (isset($userData['account_lastpwd_change']) && ((is_string($userData['account_lastpwd_change']) && $userData['account_lastpwd_change']==="0")||(is_int($userData['account_lastpwd_change']) && $userData['account_lastpwd_change']===0)) ? '  X' : ' ');
unset($acl);
if ($userData['status'])
if ($userData['account_status'])
{
$var['account_status'] = lang('Enabled');
}
@ -1335,7 +1325,7 @@
else
{
$userData = Array();
$userData['status'] = 'A';
$userData['account_status'] = 'A';
$userGroups = Array();
$userData['anonymous'] = False;
$userData['changepassword'] = (bool)$GLOBALS['egw_info']['server']['change_pwd_every_x_days'];
@ -1442,7 +1432,7 @@
'anonymous' => '<input type="checkbox" name="anonymous" value="1"'.($userData['anonymous'] ? ' checked' : '').'>',
'changepassword' => '<input type="checkbox" name="changepassword" value="1"'.($userData['changepassword'] ? ' checked' : '').'>',
'mustchangepassword' => '<input type="checkbox" name="mustchangepassword" value="1"'.($userData['mustchangepassword'] ? ' checked' : '').'>',
'account_status' => '<input type="checkbox" name="account_status" value="A"'.($userData['status']?' checked':'').'>',
'account_status' => '<input type="checkbox" name="account_status" value="A"'.($userData['account_status']?' checked':'').'>',
'account_firstname' => '<input id="firstname" onchange="check_account_email(this.id);" name="account_firstname" maxlength="50" value="' . $userData['account_firstname'] . '">',
'account_lastname' => '<input id="lastname" onchange="check_account_email(this.id);" name="account_lastname" maxlength="50" value="' . $userData['account_lastname'] . '">',
'account_email' => '<input id="email" onchange="email_set=0; check_account_email(this.id);" name="account_email" size="32" maxlength="100" value="' . $userData['account_email'] . '">',