Changeset 916 for trunk

Timestamp:

05/01/18 13:29:29 (6 years ago)

Author:

Kris Deugau

Message:

/trunk

Continue adding a generalized block-notice system. See #17 and #23, sort of.
Add a retrieval sub for block notices to IPDB.pm
Wrap the new module sub in a local sub in main.cgi, since the primary

web-UI actions will be called from a number of places

Update the block assignment templates and call the new local sub for

block assignment

Location:

trunk

Files:

• cgi-bin/main.cgi (modified) (3 diffs)
• templates/assign.tmpl (modified) (1 diff)
• templates/confirm.tmpl (modified) (1 diff)

trunk/cgi-bin/main.cgi

@@ -513 +513 @@
 
     my $pinfo = getBlockData($ip_dbh, $webvar{parent});
+
+    # retrieve any notices
+    blocknotices($webvar{parent});
 
     my @cities;
@@ -770 +773 @@
   $page->param(dnslocal => 1) unless ($pinfo->{revpartial} || $pinfo->{revavail});
 
+  # retrieve any notices
+  blocknotices($webvar{parent});
+
   # reserve for expansion
   $page->param(reserve => $webvar{reserve});
@@ -1763 +1769 @@
 
 } # finalDelete
+
+# Retrive and lightly preprocess any block notices.
+sub blocknotices {
+  my $blockid = shift;
+  # retrieve any notices
+  my $nlist = getBlockNotices($ip_dbh, $blockid);
+  my @notices;
+  foreach (@$nlist) {
+    push @notices, $_->{notice} if $_->{notice};
+  }
+  my $blockmsg = join("<br>\n", @notices);
+  $page->param(blockmsg => $blockmsg);
+}

trunk/templates/assign.tmpl

@@ -1 +1 @@
 <div class="indent">
+
+<TMPL_IF blockmsg><br><div class="strongwarning blockcenter w70"><TMPL_VAR NAME=blockmsg></div><br></TMPL_IF>
 
 <form method="post" action="main.cgi" class="regular">

trunk/templates/confirm.tmpl

@@ -12 +12 @@
 </div>
 </TMPL_IF>
+
+<TMPL_IF blockmsg><br><div class="strongwarning blockcenter w70"><TMPL_VAR NAME=blockmsg></div><br></TMPL_IF>
+
 <form method="POST" action="main.cgi" class="regular">
 <fieldset><legend class="noshow">&nbsp;</legend>