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

only generate default email address for new accounts, allows to set empty email address for existing accounts or by emptying it before save for new accounts

Browse Source
This commit is contained in:
Ralf Becker 2014-09-04 07:41:58 +00:00
parent 41e8331edd
commit 5661201ee1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addressbook/js/app.js
View File

@ -670,7 +670,6 @@ app.classes.addressbook = AppJS.extend(
case 'account_lid': case 'account_lid':
case 'n_family': case 'n_family':
case 'n_given': case 'n_given':
case 'email':
case 'account_passwd_2': case 'account_passwd_2':
var values = this.et2._inst.getValues(this.et2); var values = this.et2._inst.getValues(this.et2);
var data = { var data = {

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

@ -250,8 +250,8 @@ class admin_account
*/ */
public static function ajax_check(array $data, $changed) public static function ajax_check(array $data, $changed)
{ {
// generate default email address // generate default email address, but only for new accounts
if (empty($data['account_email']) || !$data['account_id'] && in_array($changed, array('n_given', 'n_family'))) if (!$data['account_id'] && in_array($changed, array('n_given', 'n_family', 'account_lid')))
{ {
$email = common::email_address($data['account_firstname'], $data['account_lastname'], $data['account_lid']); $email = common::email_address($data['account_firstname'], $data['account_lastname'], $data['account_lid']);
if ($email && $email[0] != '@' && strpos($email, '@')) // only add valid email addresses if ($email && $email[0] != '@' && strpos($email, '@')) // only add valid email addresses