Changeset 654 for trunk

Timestamp:

12/18/14 13:57:09 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Polish return-a-(legacy-)block-to-an-IP-pool return warning and links
for clarity

Location:

trunk

Files:

• cgi-bin/main.cgi (modified) (1 diff)
• templates/finaldelete.tmpl (modified) (1 diff)

trunk/cgi-bin/main.cgi

@@ -890 +890 @@
   if ($code =~ /^WARN(POOL|MERGE)/) {
     my ($pid,$pcidr) = split /,/, $msg;
+    my $real_pinfo = getBlockData($ip_dbh, $pid, 'b');
     $page->param(parent_id => $pid);
     $page->param(parent => $pcidr);
+    $page->param(real_disp => $q->escapeHTML($disp_alloctypes{$real_pinfo->{type}}));
     $page->param(mergeip => $code eq 'WARNPOOL');
   }

trunk/templates/finaldelete.tmpl

@@ -9 +9 @@
 <TMPL_IF parent_id><br><div>
 Warning:  
-<TMPL_IF mergeip>IPs in <TMPL_VAR NAME=block> were released as available static IPs in <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=parent_id>"><TMPL_VAR NAME=parent></a>,<br>
+<TMPL_IF mergeip>IPs in <TMPL_VAR NAME=block> were released as available static IPs in
+<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=listpool&amp;pool=<TMPL_VAR NAME=parent_id>"><TMPL_VAR NAME=parent> (<TMPL_VAR NAME=real_disp>)</a>,<br>
 not released for general netblock assignment under
-<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=delparent_id>"><TMPL_VAR NAME=delparent></a>.
+<a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=delparent_id>"><TMPL_VAR NAME=delparent> (<TMPL_VAR NAME=pdisp>)</a>.
 <TMPL_ELSE>
 <TMPL_VAR NAME=block> was released as free and merged with blocks under <a href="<TMPL_VAR NAME=webpath>/cgi-bin/main.cgi?action=showsubs&amp;parent=<TMPL_VAR NAME=parent_id>"><TMPL_VAR NAME=parent></a>,