From fa20546b9cee6c4ebbbab579a67edf6290de2575 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Mon, 16 Jan 2006 03:38:53 +0000
Subject: [PATCH] Attempt to fix non-required field problems.
---
web/root/newuser.ssjs | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/web/root/newuser.ssjs b/web/root/newuser.ssjs
index 5f932a7d30..aca76303a2 100644
--- a/web/root/newuser.ssjs
+++ b/web/root/newuser.ssjs
@@ -5,6 +5,8 @@
/* $Id$ */
/* ToDo: Deal with UQ_NODEF */
+
+/* These two strings *must* be different! */
var required_str="*";
var optional_str="";
@@ -232,17 +234,21 @@ else {
}
}
if(gender != 'M' && gender != 'F') {
- err=1;
- template.err_message+="Please specify gender (M or F)\r\n";
- template.errs["gender"]="Male or Female";
+ if(template.sex_required==required_str || template.sex_required ne '') {
+ err=1;
+ template.err_message+="Please specify gender (M or F)\r\n";
+ template.errs["gender"]="Male or Female";
+ }
}
/* Validate date */
if(http_request.query["birthdate"].toString().length<8) {
- err=1;
- if(system.settings & SYS_EURODATE)
- template.err_message+="Bad date format (ie: 19/12/75)\r\n";
- else
- template.err_message+="Bad date format (ie: 12/19/75)\r\n";
+ if(template.bd_required==required_str || http_request.query["birthdate"].toString().length > 0) {
+ err=1;
+ if(system.settings & SYS_EURODATE)
+ template.err_message+="Bad date format (ie: 19/12/75)\r\n";
+ else
+ template.err_message+="Bad date format (ie: 12/19/75)\r\n";
+ }
}
else {
brokendate=http_request.query["birthdate"].toString().split('/');
--
GitLab