Changeset 915 for trunk/cgi-bin/admin.cgi

Timestamp:

04/27/18 15:28:45 (6 years ago)

Author:

Kris Deugau

Message:

/trunk

Start adding a generalized in-your-face infonotice space to attach warnings
to a netblock. See #17 and #23, sort of.

• table to hold the notices, since they're likely to be far fewer than the overall allocation count
• show any notices for the parent chain for new allocations in the admin tools

File:

• trunk/cgi-bin/admin.cgi (modified) (2 diffs)

trunk/cgi-bin/admin.cgi

@@ -149 +149 @@
   ($fbid, $fb, $fbparent) = findAllocateFrom($ip_dbh, $maskbits, $webvar{alloctype}, '','',
         (gimme => "$cidr", allowpriv => 1));
+
+  # retrieve any notices
+  my $nlist = getBlockNotices($ip_dbh, $fbparent);
+  my @notices;
+  foreach (@$nlist) {
+    push @notices, $_->{notice} if $_->{notice};
+  }
+  my $blockmsg = join("<br>\n", @notices);
+  $page->param(blockmsg => $blockmsg);
+
   $page->param(fbid => $fbid);
   $page->param(parid => $fbparent);
@@ -205 +215 @@
     goto ERRJUMP;
   }
+
+  # retrieve any notices
+  my $nlist = getBlockNotices($ip_dbh, $webvar{parent});
+  my @notices;
+  foreach (@$nlist) {
+    push @notices, $_->{notice} if $_->{notice};
+  }
+  my $blockmsg = join("<br>\n", @notices);
+  $page->param(blockmsg => $blockmsg);
 
   my ($retcode,$msg) = allocateBlock($ip_dbh, cidr => $webvar{cidr}, fbid => $webvar{fbid},