WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

changed check for NIS recipient

This commit is contained in:
Roland Gruber 2011-04-19 17:47:41 +00:00
parent ea5ea0c1c5
commit c74bbd6489
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lam/lib/account.inc
View File

@ -399,7 +399,6 @@ function get_preg($argument, $regexp) {
case "telephone": // Allow letters, numbers, space, brackets, /-+.
$pregexpr = '/^(\\+)*([0-9a-zA-Z\\.\\ \\(\\)\\/-])*$/';
break;
case 'nis_recipient':
case "email":
$pregexpr = '/^([0-9a-zA-Z+\\/\\._-])+[@]([0-9a-zA-Z-])+([.]([0-9a-zA-Z-])+)*$/';
break;
@ -460,6 +459,9 @@ function get_preg($argument, $regexp) {
case 'nis_alias':
$pregexpr = '/^([[:alnum:]@\\.\\ \\_-])+$/u';
break;
case 'nis_recipient':
$pregexpr = '/^([[:alnum:]+@\\.\\ \\_-])+$/u';
break;
case 'country': // Allow all letters and space
$pregexpr = '/^[[:alpha:]]([[:alpha:] ])+$/u';
break;

7
lam/lib/modules/nisMailAlias.inc
View File

@ -181,6 +181,7 @@ class nisMailAlias extends baseModule {
$this->attributes['cn'][] = $_POST['cn'];
}
else {
$this->attributes['cn'][] = $_POST['cn'];
$message = $this->messages['alias'][0];
$message[] = $_POST['cn'];
$errors[] = $message;
@ -191,7 +192,7 @@ class nisMailAlias extends baseModule {
if (isset($_POST['delRec' . $i])) continue;
if (isset($_POST['rfc822MailMember' . $i]) && ($_POST['rfc822MailMember' . $i] != "")) {
// check if address has correct format
if (!get_preg($_POST['rfc822MailMember' . $i], 'nis_recipient')) {
if (!get_preg($_POST['rfc822MailMember' . $i], 'nis_recipient') && !get_preg($_POST['rfc822MailMember' . $i], 'email')) {
$message = $this->messages['recipient'][0];
$message[] = $_POST['rfc822MailMember' . $i];
$errors[] = $message;
@ -203,7 +204,7 @@ class nisMailAlias extends baseModule {
// check new recipient
if (isset($_POST['rfc822MailMember']) && ($_POST['rfc822MailMember'] != "")) {
// check if address has correct format
if (get_preg($_POST['rfc822MailMember'], 'nis_recipient')) {
if (get_preg($_POST['rfc822MailMember'], 'nis_recipient') || get_preg($_POST['rfc822MailMember'], 'email')) {
$this->attributes['rfc822MailMember'][] = $_POST['rfc822MailMember'];
}
else {
@ -261,7 +262,7 @@ class nisMailAlias extends baseModule {
$aliases = explode(',', $rawAccounts[$i][$ids['nisMailAlias_recipients']]);
// check format
for ($a = 0; $a < sizeof($aliases); $a++) {
if (get_preg($aliases[$a], 'nis_recipient')) {
if (get_preg($aliases[$a], 'nis_recipient') || get_preg($aliases[$a], 'email')) {
$partialAccounts[$i]['rfc822MailMember'][] = $aliases[$a];
}
else {