Merge pull request #247 from GOCDB/master

Merge of master to dev (covering #146)
GOCDB · Aug 18, 2020 · 55e84f2 · 55e84f2
2 parents 65e5307 + d181cf6
commit 55e84f2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/config/gocdb_schema.xml b/config/gocdb_schema.xml
@@ -394,7 +394,7 @@
 	<field>
 	    <fname>EMAIL</fname>
 	    <length>255</length>
-	    <regex>/^([0-9a-zA-Z]+[-._])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6}$/</regex>
+	    <regex>/^((([0-9a-zA-Z]+[-._])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6});)*(([0-9a-zA-Z]+[-._])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6});?$/</regex>
 	</field>
     </entity>
     <!-- ==========================================================  -->

diff --git a/htdocs/web_portal/views/service_group/edit_service_group.php b/htdocs/web_portal/views/service_group/edit_service_group.php
@@ -9,7 +9,7 @@
         <input type="text" value="<?php xecho($sg->getName()) ?>" name="name" class="input_input_text">
         <span class="input_name">Description</span>
         <input type="text" value="<?php xecho($sg->getDescription()) ?>" name="description" class="input_input_text">
-        <span class="input_name">Contact E-Mail *<span class="input_syntax" >(valid email format)</span></span>
+        <span class="input_name">Contact E-Mail *<span class="input_syntax" >(valid email format, semicolon separated without spaces)</span></span>
         <input type="text" value="<?php xecho($sg->getEmail()) ?>" name="email" class="input_input_text">
         <span class="input_name">Should this service group be Monitored?</span>
         <input class="add_edit_form" style="width: auto; display: inline;" type="checkbox" name="monitored" value="" <?php if($sg->getMonitored() == true) echo " checked=\"checked\""; ?> />
@@ -41,4 +41,4 @@
           '#optionalScopeCheckBoxDIV',
           true);
     });
-</script>
+</script>