AMBARI-576. In Custom config for Nagios: emails with multiple periods before the '@' fails validation (Contributed by Jaimin Jetly)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1353744 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -6,6 +6,9 @@ characters wide.
 
 Release 1.0.0 - unreleased
 
+  AMBARI-576. In Custom config for Nagios: emails with multiple periods
+  before the '@' fails validation (Jaimin Jetly via yusaku)
+ 
   AMBARI-574. Service Configuration: tabify settings for each service
   (yusaku) 
 

hmc/php/frontend/configUtils.php

@@ -224,7 +224,7 @@ function validateConfigs($svcConfigs) {
       } else if ($key == "nagios_contact") {
         if ($val == "") {
           $errors[$key] = array ( "error" => $REQUIRED_FIELD_MESSAGE);
-        } else if (0 == preg_match("/^(\w+((-\w+)|(\w.\w+))*)\@(\w+((\.|-)\w+)*\.\w+$)/",$val)) {
+        } else if (0 == preg_match("/^(\w+((-\w+)|(\.\w+)|(_\w+))*)\@(\w+((\.|-)\w+)*\.\w+$)/",$val)) {
           $errors[$key] = array ( "error" => "Not a valid email address");
         }
       } else if ($key == "hadoop_heapsize") {