[interchange-cvs] interchange - racke modified code/OrderCheck/future.oc

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2005-12-01 19:41:15 GMT
Modified:  code/OrderCheck Tag: STABLE_5_4-branch future.oc
Log:
allow dates without time or with seconds
more restrictive regexp

Revision  Changes    Path
No                   revision



No                   revision



1.1.2.3   +2 -2      interchange/code/OrderCheck/future.oc


rev 1.1.2.3, prev_rev 1.1.2.2
Index: future.oc
===================================================================
RCS file: /var/cvs/interchange/code/OrderCheck/future.oc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- future.oc	1 Dec 2005 14:56:15 -0000	1.1.2.2
+++ future.oc	1 Dec 2005 19:41:15 -0000	1.1.2.3
@@ -1,6 +1,6 @@
 # Copyright 2005 Interchange Development Group (http://www.icdevgroup.org/)
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: future.oc,v 1.1.2.2 2005/12/01 14:56:15 racke Exp $
+# $Id: future.oc,v 1.1.2.3 2005/12/01 19:41:15 racke Exp $
 
 CodeDef future OrderCheck 1
 CodeDef future Description Future date
@@ -33,7 +33,7 @@
 										   );
 
 	# reject invalid dates
-	if($value !~ /^[0-9]{12,12}$/) {
+	if($value !~ /^[12]\d\d\d[01]\d[0123]\d(?:[0-2]\d[0-5]\d(?:[0-5]\d)?)?$/) {
 		return (0, $name, $message);
 	}