diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings index 5c2239220..d52b2e31e 100644 --- a/UI/Contacts/English.lproj/Localizable.strings +++ b/UI/Contacts/English.lproj/Localizable.strings @@ -37,6 +37,8 @@ "edit" = "edit"; "invalidemailwarn" = "The specified email is invalid"; "invaliddatewarn" = "The specified date is invalid."; +"invalidmonthwarn" = "The specified month is invalid."; +"invalidyearwarn" = "The specified year is invalid."; "new" = "new"; "Preferred Phone" = "Preferred Phone"; diff --git a/UI/WebServerResources/UIxContactEditor.js b/UI/WebServerResources/UIxContactEditor.js index 1db214b58..4163a2828 100644 --- a/UI/WebServerResources/UIxContactEditor.js +++ b/UI/WebServerResources/UIxContactEditor.js @@ -94,15 +94,34 @@ function validateContactEditor() { alert(_("invalidemailwarn")); rc = false; } + + var today = new Date(); + var yyyy = today.getFullYear(); var byear = $('birthyear'); var bmonth = $('birthmonth'); var bday = $('birthday'); - var bdayValue = byear.value + "-" + bmonth.value + "-" + bday.value; - if (bdayValue != "--" && !dateRegex.test(bdayValue)) { - alert(_("invaliddatewarn")); - rc = false; + + if(byear.value <= yyyy && (byear.value.length == 4)){ + if(bmonth.value <= 12 && bmonth.value >=1){ + if(bday.value <= 31 && bday.value >=1){ + var bdayValue = byear.value + "-" + bmonth.value + "-" + bday.value; + if (bdayValue != "--" && !dateRegex.test(bdayValue)) { + alert(_("invaliddatewarn")); + rc = false; + } + } + else{ + alert(_("invaliddatewarn")); + rc = false;} + } + else{ + alert(_("invalidmonthwarn")); + rc = false;} } + else{ + alert(_("invalidyearwarn")); + rc = false;} return rc; }