Changeset 158 for branches/stable/cgi-bin

Timestamp:

02/09/05 15:53:56 (20 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge all changes from /trunk r141-144 and r146

Location:

branches/stable/cgi-bin

Files:

• IPDB.pm (modified) (1 diff)
• MyIPDB.pm (copied) (copied from trunk/cgi-bin/MyIPDB.pm )
• admin.cgi (modified) (1 diff)
• consistency-check.pl (modified) (1 diff)
• extras/db2rwhois.pl (modified) (3 diffs)
• freespace.pl (modified) (1 diff)
• main.cgi (modified) (2 diffs)
• newcity.cgi (modified) (2 diffs)

branches/stable/cgi-bin/IPDB.pm

@@ -7 +7 @@
 # Last update by $Author$
 ###
-# Copyright (C) 2004 - Kris Deugau
+# Copyright (C) 2004,2005 - Kris Deugau
 
 package IPDB;

branches/stable/cgi-bin/admin.cgi

@@ -9 +9 @@
 # Last update by $Author$
 ###
+# Copyright (C) 2004,2005 - Kris Deugau
 
 use strict;

branches/stable/cgi-bin/consistency-check.pl

@@ -10 +10 @@
 
 use DBI;
-use IPDB 2.0 qw(:ALL);
+use MyIPDB;
 use NetAddr::IP;
 
-($dbh,$errstr) = connectDB("ipdb", "ipdb", "ipdbpwd");
+($dbh,$errstr) = connectDB_My;
 
 # Schlep up the masters

branches/stable/cgi-bin/extras/db2rwhois.pl

@@ -10 +10 @@
 # Last update by $Author$
 ###
+# Copyright (C) 2004,2005 - Kris Deugau
 
 use strict;
@@ -15 +16 @@
 use DBI;
 use NetAddr::IP;
-use IPDB qw(:ALL);
+use MyIPDB;
 
 $ENV{"PATH"} = "/bin;/usr/bin";
@@ -29 +30 @@
 #               );
 
-my $dbh = connectDB;
+my ($dbh,$msg) = connectDB_My;
+
+# For WHOIS purposes this may not be very useful.  YMMV, we'll see.
+#initIPDBGlobals($dbh);
 
 my @masterblocks;

branches/stable/cgi-bin/freespace.pl

@@ -8 +8 @@
 # Last update by $Author$
 ###
-# Copyright (C) 2004 - Kris Deugau
+# Copyright (C) 2004,2005 - Kris Deugau
 
 use DBI;
-use IPDB 2.0 qw(:ALL);
+use MyIPDB;
 use NetAddr::IP;
 
-($dbh,errstr) = connectDB("ipdb", "ipdb", "ipdbpwd");
+($dbh,$errstr) = connectDB_My;
 
 print "Content-type: text/plain\n\n";

branches/stable/cgi-bin/main.cgi

@@ -14 +14 @@
 use DBI;
 use CommonWeb qw(:ALL);
-use IPDB 2.0 qw(:ALL);
+use MyIPDB;
 use CustIDCK;
 use POSIX qw(ceil);
@@ -38 +38 @@
 my $sth;
 my $errstr;
-($ip_dbh,$errstr) = connectDB("ipdb", "ipdb", "ipdbpwd");
+($ip_dbh,$errstr) = connectDB_My;
 if (!$ip_dbh) {
   printAndExit("Failed to connect to database: $errstr\n");

branches/stable/cgi-bin/newcity.cgi

@@ -15 +15 @@
 use DBI;
 use CommonWeb qw(:ALL);
-use IPDB 2.0 qw(:ALL);
+use MyIPDB;
 #use POSIX qw(ceil);
 use NetAddr::IP;
@@ -34 +34 @@
 cleanInput(\%webvar);
 
-my ($dbh,$errstr) = connectDB("ipdb", "ipdb", "ipdbpwd");
+my ($dbh,$errstr) = connectDB_My;
 my $sth;