Changeset 933 for trunk

Timestamp:

12/08/22 13:44:35 (2 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge inexplicably unmerged get-pool-IPs-as-CSV feature from production
Fix long-missing VLAN display snafu on allocation update "done OK" page
Update @INC-munger in main.cgi
Update copyright block and style

Location:

trunk

Files:

• Makefile (modified) (2 diffs)
• cgi-bin/IPDB.pm (modified) (1 diff)
• cgi-bin/MyIPDB.pm (modified) (1 diff)
• cgi-bin/main.cgi (modified) (5 diffs)
• cgi-bin/pool2csv.pl (added)
• htaccess.example (added)
• templates/listpool.tmpl (modified) (1 diff)

trunk/Makefile

@@ -32 +32 @@
 
 HTML = \
-        alloctypes.html help.html index.shtml ipdb.css rDNS.html
+        alloctypes.html help.html index.shtml ipdb.css rDNS.html htaccess.example
 
 JS = templates/widgets.js
@@ -63 +63 @@
 SCRIPTS = \
         cgi-bin/access-pwd-update.pl cgi-bin/allocate.pl cgi-bin/combineblocks.pl \
-        cgi-bin/consistency-check.pl cgi-bin/db-update.pl cgi-bin/freespace.pl \
+        cgi-bin/consistency-check.pl cgi-bin/db-update.pl cgi-bin/freespace.pl cgi-bin/pool2csv.pl \
         \
         cgi-bin/admin.cgi cgi-bin/ipdb-rpc.cgi cgi-bin/main.cgi cgi-bin/newcity.cgi cgi-bin/newnode.cgi \

trunk/cgi-bin/IPDB.pm

@@ -144 +144 @@
 # Append the default domain on unqualified DNS names?
 our $append_domain = 1;
+
+# Enable link publishing selected IP pool data as a CSV
+# Not enabled by default due to webserver config required
+our $enablecsv = 0;
 
 ##

trunk/cgi-bin/MyIPDB.pm

@@ -101 +101 @@
 #$IPDB::append_domain = 1;
 
+## Enable link publishing selected IP pool data as a CSV?
+# Not enabled by default due to webserver config required
+#$IPDB::enablecsv = 0;
+
 ## connectDB_My()
 # Wrapper for IPDB::connectDB

trunk/cgi-bin/main.cgi

@@ -1 +1 @@
 #!/usr/bin/perl
 # ipdb/cgi-bin/main.cgi
-###
-# SVN revision info
-# $Date$
-# SVN revision $Rev$
-# Last update by $Author$
-###
-# Copyright (C) 2004-2016 - Kris Deugau
+##
+# $Id$
+# Copyright (C) 2004-2018,2022 - Kris Deugau <kdeugau@deepnet.cx>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+##
 
 use strict;             
@@ -24 +34 @@
 ##uselib##
 
-# push "the directory the script is in" into @INC
-use FindBin;
-use lib "$FindBin::RealBin/";
+# Taint-safe (ish) voodoo to push "the directory the script is in" into @INC.
+use File::Spec ();
+use File::Basename ();
+my $path;
+BEGIN {
+    $path = File::Basename::dirname(File::Spec->rel2abs($0));
+    if ($path =~ /(.*)/) {
+        $path = $1;
+    }
+}
+use lib $path;
 
 use CustIDCK;
@@ -458 +476 @@
   $page->param(vlan => $poolinfo->{vlan});
   $page->param(poolpctfree => sprintf("%0.1f", $poolinfo->{nfree}/2**(32-$poolinfo->{masklen}) * 100 ) );
+  $page->param(csvlink => $IPDB::enablecsv);
 
   # Tree navigation
@@ -485 +504 @@
   my $plist = listPool($ip_dbh, $webvar{pool}, 1);
   $page->param(poolips => $plist);
+  # CSV voodoo
+  $page->param(poolid => $webvar{pool});
 
   # retrieve any notices
@@ -1409 +1430 @@
   $page->param(city => $webvar{city});
   $page->param(disptype => $disp_alloctypes{$webvar{alloctype}});
+  $page->param(vlan => $webvar{vlan});
   $page->param(custid => $webvar{custid});
   $page->param(swip => $webvar{swip} eq 'on' ? 'Yes' : 'No');

trunk/templates/listpool.tmpl

@@ -3 +3 @@
 <TMPL_IF webpath></TMPL_IF>
 <br>
-<div class="tbltitle">Listing pool IPs for <TMPL_VAR NAME=block><br>
-(<TMPL_VAR NAME=disptype> in <TMPL_VAR NAME=city>)<TMPL_IF vlan><br>
-VLAN <TMPL_VAR NAME=vlan></TMPL_IF>
-<TMPL_VAR NAME=poolpctfree>% free</div>
+<div class="tbltitle">Listing pool IPs for <TMPL_VAR NAME=block>
+<br>(<TMPL_VAR NAME=disptype> in <TMPL_VAR NAME=city>)
+<TMPL_IF vlan><br>VLAN <TMPL_VAR NAME=vlan></TMPL_IF>
+<br><TMPL_VAR NAME=poolpctfree>% free
+<TMPL_IF csvlink><br><a href="<TMPL_VAR NAME=webpath>/<TMPL_VAR NAME=poolid>-<TMPL_VAR NAME=city>.csv">Download</a> IP, CustID, Description as CSV</TMPL_IF>
+</div>
 
 <br>