diff --git a/include/phone.it.inc b/include/phone.it.inc index 3906829..0ca5881 100644 --- a/include/phone.it.inc +++ b/include/phone.it.inc @@ -8,19 +8,19 @@ function phone_it_metadata() { // These strings are translated using t() on output. return array( - 'error' => '"%value" is not a valid Italian phone number
Italian phone numbers should only ...', + 'error' => '"%value" is not a valid Italian phone number
Italian phone numbers should be like 999 999/999999.', ); } /** - * Verifies that $phonenumber is valid + * Verifies that $phonenumber is valid * * @param string $phonenumber * @return boolean Returns boolean FALSE if the phone number is not valid. */ function valid_it_phone_number($phonenumber) { // define regular expression - $regex = "/^(\+39)?[ ]?([0-9]{2,3}(\/|-| )?[0-9]{6,7})$/i"; + $regex = "/^(\+39)?[\s]?([0-9]{2,3}(\/|-|\s)?[0-9]{6,8})$/i"; // return true if valid, false otherwise return (bool) preg_match($regex, $phonenumber); @@ -37,11 +37,11 @@ function format_it_phone_number($phonenumber, $field) { //$phonenumber = trim($phonenumber); // do some formatting on the phone number - $phonenumber = str_replace("[ -]", "", $phonenumber); + $phonenumber = str_replace("[\s-]", "", $phonenumber); if ($field['phone_country_code']) { if ($matches[1] != "+39") { - $phonenumber = "+39" . " " . $phonenumber; + $phonenumber = "+39" . " " . $phonenumber; } }