diff -Nur --no-dereference e-smith-ntp-2.6.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/datetime e-smith-ntp-2.6.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/datetime
--- e-smith-ntp-2.6.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/datetime 2008-10-07 13:36:26.000000000 -0400
+++ e-smith-ntp-2.6.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/datetime 2022-07-17 01:13:29.536000000 -0400
@@ -151,6 +151,14 @@
Error: invalid second
+ INVALID_MONTH
+ Error: invalid month
+
+
+ MONTH_BETWEEN_1_AND_12
+ Please choose a month value between 1 and 12.
+
+
UPDATING_CLOCK
param ('timezone');
- if ($timezone =~ /^(.*)$/) {
+ if ($timezone =~ /^([\w\-]+\/?[\w\-+]*)$/) {
$timezone = $1;
} else {
$timezone = "US/Eastern";
}
my $month = $q->param ('month');
- if ($month =~ /^(.*)$/) {
+ if ($month =~ /^(\d{1,2})$/) {
$month = $1;
} else {
$month = "1";
}
+ if (($month < 1) || ($month > 12))
+ {
+ $q->param(-name => "status_message",
+ -value => $q->p($self->localise('INVALID_MONTH')." $month. ".
+ $self->localise('MONTH_BETWEEN_1_AND_12')));
+ return $self->error($self->localise('INVALID_MONTH')." $month. ".
+ $self->localise('MONTH_BETWEEN_1_AND_12'));
+ }
+
my $day = $q->param ('day');
- if ($day =~ /^(.*)$/) {
+ if ($day =~ /^(\d{1,2})$/) {
$day = $1;
} else {
$day = "1";
@@ -522,11 +531,12 @@
$q->param(-name => "status_message",
-value => $q->p($self->localise('INVALID_DAY')." $day. ".
$self->localise('BETWEEN_1_AND_31')));
- return '';
+ return $self->error($self->localise('INVALID_DAY')." $day. ".
+ $self->localise('BETWEEN_1_AND_31'));
}
my $year = $q->param ('year');
- if ($year =~ /^(.*)$/) {
+ if ($year =~ /^(\d{4})$/) {
$year = $1;
} else {
$year = "2000";
@@ -536,11 +546,12 @@
$q->param(-name => "status_message",
-value => $q->p($self->localise('INVALID_YEAR')." $year. ".
$self->localise('FOUR_DIGIT_YEAR')));
- return '';
+ return $self->error($self->localise('INVALID_YEAR')." $year. ".
+ $self->localise('FOUR_DIGIT_YEAR'));
}
my $hour = $q->param ('hour');
- if ($hour =~ /^(.*)$/) {
+ if ($hour =~ /^(\d{1,2})$/) {
$hour = $1;
} else {
$hour = "12";
@@ -550,11 +561,12 @@
$q->param(-name => "status_message",
-value => $q->p($self->localise('INVALID_HOUR')." $hour. ".
$self->localise('BETWEEN_1_AND_12')));
- return '';
+ return $self->error($self->localise('INVALID_HOUR')." $hour. ".
+ $self->localise('BETWEEN_1_AND_12'));
}
my $minute = $q->param ('minute');
- if ($minute =~ /^(.*)$/) {
+ if ($minute =~ /^(\d{1,2})$/) {
$minute = $1;
} else {
$minute = "0";
@@ -564,11 +576,12 @@
$q->param(-name => "status_message",
-value => $q->p($self->localise('INVALID_MINUTE')." $minute. ".
$self->localise('BETWEEN_0_AND_59')));
- return '';
+ return $self->error(self->localise('INVALID_MINUTE')." $minute. ".
+ $self->localise('BETWEEN_0_AND_59'));
}
my $second = $q->param ('second');
- if ($second =~ /^(.*)$/) {
+ if ($second =~ /^(\d{1,2})$/) {
$second = $1;
} else {
$second = "0";
@@ -578,11 +591,12 @@
$q->param(-name => "status_message",
-value => $q->p($self->localise('INVALID_SECOND')." $second. ".
$self->localise('BETWEEN_0_AND_59')));
- return '';
+ return $self->error($self->localise('INVALID_SECOND')." $second. ".
+ $self->localise('BETWEEN_0_AND_59'));
}
my $ampm = $q->param ('ampm');
- if ($ampm =~ /^(.*)$/) {
+ if ($ampm =~ /^(AM|PM)$/) {
$ampm = $1;
} else {
$ampm = "AM";