projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
misc
/
process
/
nms-add_iface.html
diff --git
a/httemplate/misc/process/nms-add_iface.html
b/httemplate/misc/process/nms-add_iface.html
index
8c1e673
..
79e6856
100644
(file)
--- a/
httemplate/misc/process/nms-add_iface.html
+++ b/
httemplate/misc/process/nms-add_iface.html
@@
-1,22
+1,25
@@
-<
% header('Interface added') %
>
+<
& /elements/header-popup.html, 'Interface added' &
>
<SCRIPT TYPE="text/javascript">
window.top.location.reload();
</SCRIPT>
</BODY></HTML>
<%init>
<SCRIPT TYPE="text/javascript">
window.top.location.reload();
</SCRIPT>
</BODY></HTML>
<%init>
-# XXX: access rights
+die "access denied"
+ unless $FS::CurrentUser::CurrentUser->access_right('Configure network monitoring');
my $host = $cgi->param('host');
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');
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');
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;
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>
</%init>