| 1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-ntp-1.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/datetime.pm mezzanine_patched_e-smith-ntp-1.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/datetime.pm |
| 2 |
|
|
--- e-smith-ntp-1.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/datetime.pm 2003-05-09 10:40:44.000000000 -0600 |
| 3 |
|
|
+++ mezzanine_patched_e-smith-ntp-1.16.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/datetime.pm 2007-01-16 08:21:22.000000000 -0700 |
| 4 |
|
|
@@ -367,7 +367,6 @@ |
| 5 |
|
|
# let ntp enable/disable itself as required |
| 6 |
|
|
$self->_performSetTimeserver(); |
| 7 |
|
|
} |
| 8 |
|
|
- $q->param(-name => "wherenext", -value => "Initial"); |
| 9 |
|
|
$q->Delete('ntpServer'); |
| 10 |
|
|
$q->Delete('ntpStatus'); |
| 11 |
|
|
|
| 12 |
|
|
@@ -596,13 +595,6 @@ |
| 13 |
|
|
} |
| 14 |
|
|
|
| 15 |
|
|
#-------------------------------------------------- |
| 16 |
|
|
- # If we get this far, parameters look good and we're ready to go: |
| 17 |
|
|
- #-------------------------------------------------- |
| 18 |
|
|
- |
| 19 |
|
|
- $q->param(-name => "status_message", |
| 20 |
|
|
- -value => $q->p ( $self->localise('UPDATING_CLOCK'))); |
| 21 |
|
|
- |
| 22 |
|
|
- #-------------------------------------------------- |
| 23 |
|
|
# Store time zone in configuration database |
| 24 |
|
|
#-------------------------------------------------- |
| 25 |
|
|
|
| 26 |
|
|
@@ -627,7 +619,7 @@ |
| 27 |
|
|
esmith::util::backgroundCommand(2, |
| 28 |
|
|
"/sbin/e-smith/signal-event","timezone-update",$newdate); |
| 29 |
|
|
|
| 30 |
|
|
- return ''; |
| 31 |
|
|
+ return $self->success('UPDATING_CLOCK'); |
| 32 |
|
|
} |
| 33 |
|
|
|
| 34 |
|
|
=pod |
| 35 |
|
|
@@ -658,7 +650,7 @@ |
| 36 |
|
|
{ |
| 37 |
|
|
my $self = shift; |
| 38 |
|
|
my $q = $self->{cgi}; |
| 39 |
|
|
- my $msg = $q->param("status_message") || ""; |
| 40 |
|
|
+ my $msg; |
| 41 |
|
|
|
| 42 |
|
|
#------------------------------------------------------------ |
| 43 |
|
|
# Verify the arguments and untaint the variables (see Camel |
| 44 |
|
|
@@ -705,9 +697,7 @@ |
| 45 |
|
|
} |
| 46 |
|
|
$conf->get('UnsavedChanges')->set_value($old); |
| 47 |
|
|
|
| 48 |
|
|
- |
| 49 |
|
|
- $msg .= $q->h2($self->localise("SERVER_DISABLED")); |
| 50 |
|
|
- $msg .= $q->p($self->localise('SERVER_DISABLED_DESC')); |
| 51 |
|
|
+ $msg = 'SERVER_DISABLED_DESC'; |
| 52 |
|
|
|
| 53 |
|
|
} |
| 54 |
|
|
else # enable service and synch with ntpServer |
| 55 |
|
|
@@ -722,10 +712,7 @@ |
| 56 |
|
|
} |
| 57 |
|
|
else |
| 58 |
|
|
{ |
| 59 |
|
|
- $msg .= $q->h2($self->localise('ERR_CHANGING_TS')); |
| 60 |
|
|
- $msg .= $q->p($self->localise('INVALID_NTP_ADDR').$ntpServer); |
| 61 |
|
|
- $q->param(-name => "status_message", -value => $msg); |
| 62 |
|
|
- return ''; |
| 63 |
|
|
+ return return $self->error('INVALID_NTP_ADDR'); |
| 64 |
|
|
} |
| 65 |
|
|
|
| 66 |
|
|
#------------------------------------------------------------ |
| 67 |
|
|
@@ -749,26 +736,21 @@ |
| 68 |
|
|
|
| 69 |
|
|
if ($ntpServer !~ /^\s*$/) |
| 70 |
|
|
{ |
| 71 |
|
|
- $msg .= $q->h2($self->localise('SETTINGS_CHANGED')); |
| 72 |
|
|
- $msg .= $q->p($self->localise('SYNC_WITH'). |
| 73 |
|
|
- $q->b(" ", $ntpServer)); |
| 74 |
|
|
+ $msg = 'SETTINGS_CHANGED'; |
| 75 |
|
|
} |
| 76 |
|
|
else |
| 77 |
|
|
{ |
| 78 |
|
|
$rec->set_prop('status', 'disabled'); |
| 79 |
|
|
$rec->set_prop('NTPServer', ''); |
| 80 |
|
|
- $msg .= $q->h2($self->localise('ERR_CHANGING_TS')); |
| 81 |
|
|
- $msg .= $q->p($self->localise("INVALID_NTP_SERVER")); |
| 82 |
|
|
+ $msg = 'INVALID_NTP_SERVER'; |
| 83 |
|
|
} |
| 84 |
|
|
|
| 85 |
|
|
} |
| 86 |
|
|
|
| 87 |
|
|
- $q->param(-name => "status_message", -value => $msg); |
| 88 |
|
|
- |
| 89 |
|
|
esmith::util::backgroundCommand(2, |
| 90 |
|
|
"/sbin/e-smith/signal-event", "timeserver-update"); |
| 91 |
|
|
|
| 92 |
|
|
- return ''; |
| 93 |
|
|
+ return $self->success($msg); |
| 94 |
|
|
} |
| 95 |
|
|
|
| 96 |
|
|
1; |
Parent Directory
| 
Revision Log
| 
Revision Graph
