diff options
| author | ivan <ivan> | 2011-12-19 01:32:11 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-12-19 01:32:11 +0000 |
| commit | 42ea39c6e35c370369fdcccb7c303c1812146355 (patch) | |
| tree | 22c62e3a8c1029dc78afca055bafc189d6ff74a7 /httemplate/misc/process | |
| parent | 425b5f85e183064be4cc3e1a8ce444f11fe011df (diff) | |
missing commit from nms auto-addition fixdes, RT#15536
Diffstat (limited to 'httemplate/misc/process')
| -rw-r--r-- | httemplate/misc/process/nms-add_iface.html | 11 | ||||
| -rw-r--r-- | httemplate/misc/process/nms-add_router.html | 12 |
2 files changed, 14 insertions, 9 deletions
diff --git a/httemplate/misc/process/nms-add_iface.html b/httemplate/misc/process/nms-add_iface.html index 5f51e5ce1..d21b3792a 100644 --- a/httemplate/misc/process/nms-add_iface.html +++ b/httemplate/misc/process/nms-add_iface.html @@ -1,4 +1,4 @@ -<% header('Interface added') %> +<& /elements/header-popup.html, 'Interface added') &> <SCRIPT TYPE="text/javascript"> window.top.location.reload(); </SCRIPT> @@ -9,16 +9,17 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Configure network monitoring'); my $host = $cgi->param('host'); -die 'invalid host' unless $host =~ /^[0-9.a-zA-Z\-]+$/; +errorpage_popup('invalid host') unless $host =~ /^[0-9.a-zA-Z\-]+$/; my $iface = $cgi->param('iface'); -die 'invalid iface' unless $iface =~ /^[0-9A-Za-z_\-.\\\/ ]+$/; +errorpage_popup('invalid iface') unless $iface =~ /^[0-9A-Za-z_\-.\\\/ ]+$/; my $serviceid = $cgi->param('serviceid'); #die 'invalid serviceid' unless $serviceid =~ /^[0-9A-Za-z_\-.\\\/ ]+$/; -die 'invalid serviceid' unless $serviceid =~ /^[0-9A-Za-z_]+$/; +errorpage_popup('invalid serviceid') unless $serviceid =~ /^[0-9A-Za-z_]+$/; my $nms = new FS::NetworkMonitoringSystem; -$nms->add_interface($host,$iface,$serviceid); +my $error = $nms->add_interface($host,$iface,$serviceid); +errorpage_popup($error) if $error; </%init> diff --git a/httemplate/misc/process/nms-add_router.html b/httemplate/misc/process/nms-add_router.html index a77d897d2..c3b42a8d3 100644 --- a/httemplate/misc/process/nms-add_router.html +++ b/httemplate/misc/process/nms-add_router.html @@ -1,4 +1,7 @@ -<% header('Router added') %> +<& /elements/header-popup.html, 'Router added' &> + <SCRIPT TYPE="text/javascript"> + window.top.location.reload(); + </SCRIPT> </BODY></HTML> <%init> @@ -6,12 +9,13 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Configure network monitoring'); my $host = $cgi->param('host'); -die 'invalid host' unless $host =~ /^[0-9.a-zA-Z\-]+$/; +errorpage_popup('invalid host') unless $host =~ /^[0-9.a-zA-Z\-]+$/; my $community = $cgi->param('community'); -die 'invalid SNMP community string' unless $community =~ /^[0-9.a-zA-Z\-]*$/; +errorpage_popup('invalid SNMP community string') unless $community =~ /^[0-9.a-zA-Z\-]*$/; my $nms = new FS::NetworkMonitoringSystem; -$nms->add_router($host,$community); +my $error = $nms->add_router($host,$community); +errorpage_popup($error) if $error; </%init> |