Changeset 935 for trunk

Timestamp:

12/08/22 18:08:15 (2 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit a few little cleanups to search.cgi, along with bringing the header
style in line with current practice

File:

• trunk/cgi-bin/search.cgi (modified) (4 diffs, 1 prop)

trunk/cgi-bin/search.cgi

@@ -1 +1 @@
 #!/usr/bin/perl
-# ipdb/cgi-bin/search.cgi
-# Started splitting search functions (quick and otherwise) from
-# main IPDB interface 03/11/2005
-###
-# SVN revision info
-# $Date$
-# SVN revision $Rev$
-# Last update by $Author$
-###
+# IPDB search for users
+##
+# $Id$
 # Copyright 2005-2010,2012,2015-2017,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;             
@@ -23 +31 @@
 ##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 MyIPDB;
@@ -58 +74 @@
 ##fixme:  tweak for handling <select multiple='y' size=3> (list with multiple selection)
 my %webvar = $q->Vars;
+$webvar{cidrexclude} = '' if !$webvar{cidrexclude};
 
 if (defined($webvar{rpp})) {
@@ -341 +358 @@
 
 print $page->output;
+
+$sth->finish;
 
 # Shut down and clean up.