-);
-
+ my %row = (city => $city);
+ push @cities, \%row;
+ }
+ $page->param(
+ cidr => $cidr,
+ disptype => $disp_alloctypes{$webvar{alloctype}},
+ type => $webvar{alloctype},
+ alloc_from => $alloc_from,
+ custid => $custid,
+ citylist => \@cities
+ );
} elsif ($webvar{action} eq 'confirm') {
- print "Assigning $webvar{cidr} to $webvar{custid} (\"$webvar{desc}\") as ".
- "$disp_alloctypes{$webvar{alloctype}}... \n";
+ $page->param(
+ cidr => $webvar{cidr},
+ custid => $webvar{custid},
+ desc => $webvar{desc},
+ disptype => $disp_alloctypes{$webvar{alloctype}}
+ );
# Only need to check city here.
if ($webvar{city} eq '-') {
@@ -237,9 +216,8 @@
$sth->execute;
if ($sth->err) {
- print "Allocation failed! DBI said:\n".$sth->errstr."\n";
+ $page->param(errmsg => $sth->errstr);
syslog "err", "($authuser) Allocation of '$webvar{cidr}' to '$webvar{custid}' as ".
"'$webvar{alloctype}' failed: '".$sth->errstr."'";
} else {
- print "Allocation OK!\n";
syslog "notice", "$authuser allocated '$webvar{cidr}' to '$webvar{custid}' as ".
"'$webvar{alloctype}'";
@@ -253,9 +231,8 @@
$webvar{circid});
if ($retcode eq 'OK') {
- print "Allocation OK!\n";
syslog "notice", "$authuser allocated '$webvar{cidr}' to '$webvar{custid}' as ".
"'$webvar{alloctype}'";
} else {
- print "Allocation failed! IPDB::allocateBlock said:\n$msg\n";
+ $page->param(errmsg => $msg);
syslog "err", "($authuser) Allocation of '$webvar{cidr}' to '$webvar{custid}' as ".
"'$webvar{alloctype}' failed: '$msg'";
@@ -379,5 +356,7 @@
} elsif ($webvar{action} eq 'tweakpool') {
+
showPool($webvar{pool});
+
} elsif ($webvar{action} eq 'updatepool') {
@@ -388,14 +367,15 @@
"where ip='$webvar{ip}'");
$sth->execute($webvar{city},$webvar{notes},$webvar{desc});
+ $page->param(ip => $webvar{ip});
if ($sth->err) {
- print "Error updating pool IP $webvar{ip}: $@\n";
- syslog "err", "$authuser could not update pool IP $webvar{ip}: $@";
- } else {
- $sth = $ip_dbh->prepare("select pool from poolips where ip='$webvar{ip}'");
- $sth->execute;
- my @data = $sth->fetchrow_array;
- print "$webvar{ip} in $data[0] updated\n\n";
+ $page->param(errmsg => $sth->errstr);
+ syslog "err", "$authuser could not update pool IP $webvar{ip}: ".$sth->errstr;
+ } else {
syslog "notice", "$authuser updated pool IP $webvar{ip}";
}
+ $sth = $ip_dbh->prepare("select pool from poolips where ip='$webvar{ip}'");
+ $sth->execute;
+ my @data = $sth->fetchrow_array;
+ $page->param(pool => $data[0]);
} elsif ($webvar{action} eq 'showusers') {
@@ -455,53 +435,19 @@
} elsif ($webvar{action} eq 'emailnotice') {
- print "
Email notice management:
\nClick the email addresses to edit that list.";
+
$sth = $ip_dbh->prepare("SELECT action,reciplist FROM notify");
$sth->execute;
-
- print "
\n";
+ my @spamlist;
while (my ($notice_code,$reciplist) = $sth->fetchrow_array() ) {
##fixme: hairy mess, only a few things call mailNotify() anyway, so many possible notices won't work.
my $action_out = dispNoticeCode($notice_code);
- print "
Updating recipient list for '".dispNoticeCode($webvar{code})."':
\n";
+
+ $page->param(dispnotice => dispNoticeCode($webvar{code}));
$sth = $ip_dbh->prepare("UPDATE notify SET reciplist=? WHERE action=?");
$webvar{reciplist} =~ s/[\r\n]+/,/g;
$sth->execute($webvar{reciplist}, $webvar{code});
- if ($sth->err) {
- print "Failed: DB error: ".$sth->errstr."\n";
- } else {
- print "OK! \n"
- }
- print qq(Back to email notice list\n);
+ $page->param(updfailed => $sth->errstr) if $sth->err;
+
} elsif ($webvar{action} ne '') {
- print "webvar{action} check failed: Don't know how to $webvar{action}";
+ $page->param(dunno => $webvar{action});
}
@@ -645,56 +575,54 @@
# Show allocations to allow editing.
-sub showAllocs($) {
- my $cidr = new NetAddr::IP $_[0];
- print "Edit custID, allocation type, city for allocations in ".
- "$cidr:\n
";
- $sth = $ip_dbh->prepare("select * from allocations where cidr <<= '$cidr' order by cidr");
- $sth->execute;
- while (my @data = $sth->fetchrow_array) {
- print "
\n);
- }
- print "
\n";
-
- # notes
- print "Notes:\n".
- "
\n
Use the main interface to update description and notes fields\n".
- "
Changing the allocation type here will NOT affect IP pool data.\n".
- "
\n";
-}
+ $row{typelist} = \@typelist;
+ push @blocklist, \%row;
+ }
+ $page->param(blocklist => \@blocklist);
+} # end showAllocs()
# Stuff updates into DB
sub update {
- eval {
- # Relatively simple SQL transaction here. Note that we're deliberately NOT
- # updating notes/desc here as it's available through the main interface.
- $sth = $ip_dbh->prepare("update allocations set custid='$webvar{custid}',".
- "city='$webvar{city}',type='$webvar{alloctype}' where cidr='$webvar{block}'");
- $sth->execute;
- $ip_dbh->commit;
- };
- if ($@) {
- carp "Transaction aborted because $@";
- eval { $ip_dbh->rollback; };
- syslog "err", "$authuser could not update block '$webvar{block}': '$@'";
+ # Relatively simple SQL transaction here. Note that we're deliberately NOT
+ # updating notes/desc here as it's available through the main interface.
+ $sth = $ip_dbh->prepare("update allocations set custid='$webvar{custid}',".
+ "city=?,type='$webvar{alloctype}' where cidr='$webvar{block}'");
+ $sth->execute($webvar{city});
+
+ $page->param(block => $webvar{block});
+ if ($sth->err) {
+ $page->param(updfailed => $sth->errstr);
+ syslog "err", "$authuser could not update block '$webvar{block}': '".$sth->errstr."'";
} else {
- # If we get here, the operation succeeded.
syslog "notice", "$authuser updated $webvar{block}";
- print "Allocation $webvar{block} updated\n";
}
# need to get /24 that block is part of
@@ -702,5 +630,5 @@
$bits[3] = "0/24";
showAllocs((join ".", @bits));
-}
+} # end update()
@@ -710,33 +638,34 @@
sub showPool($) {
my $pool = new NetAddr::IP $_[0];
- print qq(Listing pool $pool:\n
-
Update the following record:
\n";
- $sth = $ip_dbh->prepare("select pool,ip,custid,city,type,available,description,notes from poolips where pool='$pool' order by ip");
- $sth->execute;
- while (my @data = $sth->fetchrow_array) {
- print qq(
$data[1]
).
- "
$data[2]
$data[3]
$data[4]
".
- "
$data[5]
$data[6]
$data[7]
\n";
- }
- print "
\n";
-}
+ my @typelist;
+ while (my ($type,$dispname) = $sth->fetchrow_array) {
+ my %row = (
+ type => $type,
+ dispname => $dispname
+ );
+ push @typelist, \%row;
+ }
+ $page->param(typelist => \@typelist);
+
+ $sth = $ip_dbh->prepare("select ip,custid,city,type,available,description,notes from poolips where pool='$pool' order by ip");
+ $sth->execute;
+ my @iplist;
+ while (my ($ip,$custid,$city,$type,$avail,$desc,$notes) = $sth->fetchrow_array) {
+ my %row = (
+ ip => $ip,
+ custid => $custid,
+ city => $city,
+ type => $type,
+ avail => $avail,
+ desc => $desc,
+ notes => $notes
+ );
+ push @iplist, \%row;
+ }
+ $page->param(iplist => \@iplist);
+} # end showPool()
Index: branches/htmlform/templates/admin/addnotice.tmpl
===================================================================
--- branches/htmlform/templates/admin/addnotice.tmpl (revision 487)
+++ branches/htmlform/templates/admin/addnotice.tmpl (revision 487)
@@ -0,0 +1,12 @@
+
+Adding notice to for :
+
+Failed: DB error:
+
+OK!
+
+
+Need to specify at least one recipient, an action, and an allocation type.
+("Special" content is considered an allocation type). Hit the Back button and try again.
+
+Back to email notice list
Index: branches/htmlform/templates/admin/alloc.tmpl
===================================================================
--- branches/htmlform/templates/admin/alloc.tmpl (revision 487)
+++ branches/htmlform/templates/admin/alloc.tmpl (revision 487)
@@ -0,0 +1,47 @@
+
+
Index: branches/htmlform/templates/admin/alloctweak.tmpl
===================================================================
--- branches/htmlform/templates/admin/alloctweak.tmpl (revision 487)
+++ branches/htmlform/templates/admin/alloctweak.tmpl (revision 487)
@@ -0,0 +1,1 @@
+
Index: branches/htmlform/templates/admin/confirm.tmpl
===================================================================
--- branches/htmlform/templates/admin/confirm.tmpl (revision 487)
+++ branches/htmlform/templates/admin/confirm.tmpl (revision 487)
@@ -0,0 +1,7 @@
+Assigning to ("") as
+...
+
+Allocation failed:
+
+Allocation OK!
+
Index: branches/htmlform/templates/admin/delnotice.tmpl
===================================================================
--- branches/htmlform/templates/admin/delnotice.tmpl (revision 487)
+++ branches/htmlform/templates/admin/delnotice.tmpl (revision 487)
@@ -0,0 +1,7 @@
+Deleting notices on :
+
+Failed: DB error:
+
+OK!
+
+Back to email notice list
Index: branches/htmlform/templates/admin/dunno.tmpl
===================================================================
--- branches/htmlform/templates/admin/dunno.tmpl (revision 487)
+++ branches/htmlform/templates/admin/dunno.tmpl (revision 487)
@@ -0,0 +1,1 @@
+webvar{action} check failed: Don't know how to
Index: branches/htmlform/templates/admin/ednotice.tmpl
===================================================================
--- branches/htmlform/templates/admin/ednotice.tmpl (revision 487)
+++ branches/htmlform/templates/admin/ednotice.tmpl (revision 487)
@@ -0,0 +1,15 @@
+