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

changed regex for mailLocalAddress

This commit is contained in:
Roland Gruber 2005-09-20 14:40:11 +00:00
parent 06a85fb622
commit d217dd78b3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lam/lib/account.inc
View File

@ -474,6 +474,9 @@ function get_preg($argument, $regexp) {
case "email": case "email":
$pregexpr = '/^([0-9a-z\\._-])+[@]([0-9a-z-])+([.]([0-9a-z-])+)*$/'; $pregexpr = '/^([0-9a-z\\._-])+[@]([0-9a-z-])+([.]([0-9a-z-])+)*$/';
break; break;
case "mailLocalAddress":
$pregexpr = '/^([0-9a-z\\._-])+([@]([0-9a-z-])+([.]([0-9a-z-])+)*)?$/';
break;
case "street": // Allow all letters, numbers, space and .-_ case "street": // Allow all letters, numbers, space and .-_
$pregexpr = '/^([[:alnum:]\\.\\ \\_-])*$/u'; $pregexpr = '/^([[:alnum:]\\.\\ \\_-])*$/u';
break; break;

6
lam/lib/modules/inetLocalMailRecipient.inc
View File

@ -253,7 +253,7 @@ class inetLocalMailRecipient extends baseModule {
if (isset($post['delAdr' . $i])) continue; if (isset($post['delAdr' . $i])) continue;
if (isset($post['localAdr' . $i]) && ($post['localAdr' . $i] != "")) { if (isset($post['localAdr' . $i]) && ($post['localAdr' . $i] != "")) {
// check if address has correct format // check if address has correct format
if (!get_preg($post['localAdr' . $i], 'email')) { if (!get_preg($post['localAdr' . $i], 'mailLocalAddress')) {
$message = $this->messages['localAdr'][0]; $message = $this->messages['localAdr'][0];
$message[] = $post['localAdr' . $i]; $message[] = $post['localAdr' . $i];
$this->triggered_messages[] = array($message); $this->triggered_messages[] = array($message);
@ -265,7 +265,7 @@ class inetLocalMailRecipient extends baseModule {
// check new local address // check new local address
if (isset($post['localAdr']) && ($post['localAdr'] != "")) { if (isset($post['localAdr']) && ($post['localAdr'] != "")) {
// check if address has correct format // check if address has correct format
if (get_preg($post['localAdr'], 'email')) { if (get_preg($post['localAdr'], 'mailLocalAddress')) {
$this->attributes['mailLocalAddress'][] = $post['localAdr']; $this->attributes['mailLocalAddress'][] = $post['localAdr'];
} }
else { else {
@ -309,7 +309,7 @@ class inetLocalMailRecipient extends baseModule {
$adrs = explode(',', $rawAccounts[$i][$ids['inetLocalMailRecipient_localAdr']]); $adrs = explode(',', $rawAccounts[$i][$ids['inetLocalMailRecipient_localAdr']]);
// check format // check format
for ($a = 0; $a < sizeof($adrs); $a++) { for ($a = 0; $a < sizeof($adrs); $a++) {
if (get_preg($adrs[$a], 'email')) { if (get_preg($adrs[$a], 'mailLocalAddress')) {
$partialAccounts[$i]['mailLocalAddress'][] = $adrs[$a]; $partialAccounts[$i]['mailLocalAddress'][] = $adrs[$a];
} }
else { else {