Changeset 417 for trunk/cgi-bin/main.cgi

Timestamp:

06/30/10 17:48:03 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Rearrangements and tweaks toward releaseability:

• Add Makefile to install halfway-sanely
• Add .spec file
• Shuffle "use IPDB;" and "use MyIPDB;" lines so that we can automagically insert a suitable "use lib..." line during 'make install'
• Check copyright statements
• Clear up some defaults, and place a number of "constants" in IPDB/MyIPDB rather than having them hardcoded all over the place (Still need to think of a sane way to do this for ipdb.psql's alloctype preseeding)
• Tweak $VERSION identifier in IPDB.pm so it can be defined in the Makefile
• Clean up some dangling bits from repository history conversion, remove unneeded "use ..." statements
• Tweak rWHOIS export script to use more globals and "constants" from (My)IPDB.pm, and more Perl internals than system()-equivalents. Add a few fixme comments for longer-term flexibility improvements.

File:

• trunk/cgi-bin/main.cgi (modified) (4 diffs)

trunk/cgi-bin/main.cgi

@@ -7 +7 @@
 # Last update by $Author$
 ###
+# Copyright (C) 2004-2010 - Kris Deugau
 
 use strict;             
@@ -13 +14 @@
 use DBI;
 use CommonWeb qw(:ALL);
-use MyIPDB;
 use CustIDCK;
 use POSIX qw(ceil);
@@ -19 +19 @@
 
 use Sys::Syslog;
+
+# don't remove!  required for GNU/FHS-ish install from tarball
+##uselib##
+
+use MyIPDB;
 
 openlog "IPDB","pid","local2";
@@ -956 +961 @@
       if (!$status) {
         printError("Customer ID not valid.  Make sure the Customer ID ".
-          "is correct.<br>\nUse STAFF for staff static IPs, and 6750400 for any other ".
+          "is correct.<br>\nUse STAFF for staff static IPs, and $defcustid for any other ".
           "non-customer assignments.");
         return;