Fix Bug 3653 Add the ability to configure time-based firewall rules

- make available the option to use time with startdate and stopdate

4 files changed, 32 insertions, 14 deletions

diff --git a/templates/firewall/modify/node.tag/rule/node.tag/time/startdate/node.def b/templates/firewall/modify/node.tag/rule/node.tag/time/startdate/node.def
index 129b845..4d470f4 100644
--- a/templates/firewall/modify/node.tag/rule/node.tag/time/startdate/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/time/startdate/node.def
@@ -1,7 +1,12 @@
 type: txt
 help: Set to apply rule starting from specified date
-syntax:expression: pattern $VAR(@) "^[[:digit:]]\{4\}[-][[:digit:]]\{2\}[-][[:digit:]]\{2\}$" ; \
-                   "Incorrect value for startdate. Date should be entered as yyyy-mm-dd"
+syntax:expression: pattern $VAR(@) "^[[:digit:]]\{4\}[-][[:digit:]]\{2\}[-][[:digit:]]\{2\}(T[[:digit:]]\{2\}[:][[:digit:]]\{2\}[:][[:digit:]]\{2\})?$" ; \
+"Invalid value for startdate. Date should use yyyy-mm-dd format. To specify time
+of date with startdate, append 'T' to date followed by time in 24 hour notation
+hh:mm:ss. For example startdate value of 2009-01-21T13:30:00 refers to
+21st January 2009 with time 13:30:00"
 
-comp_help: Format for date : yyyy-mm-dd
+comp_help: Format for date : yyyy-mm-dd. To specify time of date with startdate, append
+'T' to date followed by time in 24 hour notation hh:mm:ss. For eg startdate
+value of 2009-01-21T13:30:00 refers to 21st Jan 2009 with time 13:30:00
 
diff --git a/templates/firewall/modify/node.tag/rule/node.tag/time/stopdate/node.def b/templates/firewall/modify/node.tag/rule/node.tag/time/stopdate/node.def
index 238e7a7..90dd684 100644
--- a/templates/firewall/modify/node.tag/rule/node.tag/time/stopdate/node.def
+++ b/templates/firewall/modify/node.tag/rule/node.tag/time/stopdate/node.def
@@ -1,7 +1,12 @@
 type: txt
 help: Set to apply rule till specified date
-syntax:expression: pattern $VAR(@) "^[[:digit:]]\{4\}[-][[:digit:]]\{2\}[-][[:digit:]]\{2\}$" ; \
-                   "Incorrect value for stopdate. Date should be entered as yyyy-mm-dd"
+syntax:expression: pattern $VAR(@) "^[[:digit:]]\{4\}[-][[:digit:]]\{2\}[-][[:digit:]]\{2\}(T[[:digit:]]\{2\}[:][[:digit:]]\{2\}[:][[:digit:]]\{2\})?$" ; \
+"Invalid value for stopdate. Date should use yyyy-mm-dd format. To specify time
+of date with stopdate, append 'T' to date followed by time in 24 hour notation
+hh:mm:ss. For example stopdate value of 2009-01-31T13:30:00 refers to
+31st Jan 2009 with time 13:30:00"
 
-comp_help: Format for date : yyyy-mm-dd
+comp_help: Format for date : yyyy-mm-dd. To specify time of date with stopdate,
+append 'T' to date followed by time in 24 hour notation hh:mm:ss. For eg
+stopdate value of 2009-01-31T13:30:00 refers to 31st Jan 2009 with time 13:30:00
 
diff --git a/templates/firewall/name/node.tag/rule/node.tag/time/startdate/node.def b/templates/firewall/name/node.tag/rule/node.tag/time/startdate/node.def
index 129b845..a971375 100644
--- a/templates/firewall/name/node.tag/rule/node.tag/time/startdate/node.def
+++ b/templates/firewall/name/node.tag/rule/node.tag/time/startdate/node.def
@@ -1,7 +1,11 @@
 type: txt
 help: Set to apply rule starting from specified date
-syntax:expression: pattern $VAR(@) "^[[:digit:]]\{4\}[-][[:digit:]]\{2\}[-][[:digit:]]\{2\}$" ; \
-                   "Incorrect value for startdate. Date should be entered as yyyy-mm-dd"
-
-comp_help: Format for date : yyyy-mm-dd
+syntax:expression: pattern $VAR(@) "^[[:digit:]]\{4\}[-][[:digit:]]\{2\}[-][[:digit:]]\{2\}(T[[:digit:]]\{2\}[:][[:digit:]]\{2\}[:][[:digit:]]\{2\})?$" ; \
+"Invalid value for startdate. Date should use yyyy-mm-dd format. To specify time
+of date with startdate, append 'T' to date followed by time in 24 hour notation 
+hh:mm:ss. For example startdate value of 2009-01-21T13:30:00 refers to 
+21st January 2009 with time 13:30:00"
 
+comp_help: Format for date : yyyy-mm-dd. To specify time of date with startdate, append 
+'T' to date followed by time in 24 hour notation hh:mm:ss. For eg startdate 
+value of 2009-01-21T13:30:00 refers to 21st Jan 2009 with time 13:30:00
diff --git a/templates/firewall/name/node.tag/rule/node.tag/time/stopdate/node.def b/templates/firewall/name/node.tag/rule/node.tag/time/stopdate/node.def
index 238e7a7..c99dd7b 100644
--- a/templates/firewall/name/node.tag/rule/node.tag/time/stopdate/node.def
+++ b/templates/firewall/name/node.tag/rule/node.tag/time/stopdate/node.def
@@ -1,7 +1,11 @@
 type: txt
 help: Set to apply rule till specified date
-syntax:expression: pattern $VAR(@) "^[[:digit:]]\{4\}[-][[:digit:]]\{2\}[-][[:digit:]]\{2\}$" ; \
-                   "Incorrect value for stopdate. Date should be entered as yyyy-mm-dd"
-
-comp_help: Format for date : yyyy-mm-dd
+syntax:expression: pattern $VAR(@) "^[[:digit:]]\{4\}[-][[:digit:]]\{2\}[-][[:digit:]]\{2\}(T[[:digit:]]\{2\}[:][[:digit:]]\{2\}[:][[:digit:]]\{2\})?$" ; \
+"Invalid value for stopdate. Date should use yyyy-mm-dd format. To specify time
+of date with stopdate, append 'T' to date followed by time in 24 hour notation
+hh:mm:ss. For example stopdate value of 2009-01-31T13:30:00 refers to
+31st Jan 2009 with time 13:30:00"
 
+comp_help: Format for date : yyyy-mm-dd. To specify time of date with stopdate,
+append 'T' to date followed by time in 24 hour notation hh:mm:ss. For eg
+stopdate value of 2009-01-31T13:30:00 refers to 31st Jan 2009 with time 13:30:00