Changeset 158 for branches/stable


Ignore:
Timestamp:
02/09/05 15:53:56 (19 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Merge all changes from /trunk r141-144 and r146

Location:
branches/stable
Files:
8 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/stable/assign.html

    r140 r158  
    3131<td>Route/allocate from this master:&nbsp;</td><td>$$MASTERLIST$$</td>
    3232</tr><tr class="color1">
    33 <td>Cicruit ID:&nbsp;</td><td><input name=circid size=40></td>
     33<td>Circuit ID:&nbsp;</td><td><input name=circid size=40></td>
    3434</tr><tr class="color2">
    3535<td>Description/Name:&nbsp;</td><td><input name="desc" size=40></td>

  • branches/stable/cgi-bin/IPDB.pm

    r152 r158  
    77# Last update by $Author$
    88###
    9 # Copyright (C) 2004 - Kris Deugau
     9# Copyright (C) 2004,2005 - Kris Deugau
    1010
    1111package IPDB;

  • branches/stable/cgi-bin/admin.cgi

    r94 r158  
    99# Last update by $Author$
    1010###
     11# Copyright (C) 2004,2005 - Kris Deugau
    1112
    1213use strict;

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

    r125 r158  
    1010
    1111use DBI;
    12 use IPDB 2.0 qw(:ALL);
     12use MyIPDB;
    1313use NetAddr::IP;
    1414
    15 ($dbh,$errstr) = connectDB("ipdb", "ipdb", "ipdbpwd");
     15($dbh,$errstr) = connectDB_My;
    1616
    1717# Schlep up the masters

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

    r26 r158  
    1010# Last update by $Author$
    1111###
     12# Copyright (C) 2004,2005 - Kris Deugau
    1213
    1314use strict;
    … …  
    1516use DBI;
    1617use NetAddr::IP;
    17 use IPDB qw(:ALL);
     18use MyIPDB;
    1819
    1920$ENV{"PATH"} = "/bin;/usr/bin";
    … …  
    2930#               );
    3031
    31 my $dbh = connectDB;
     32my ($dbh,$msg) = connectDB_My;
     33
     34# For WHOIS purposes this may not be very useful.  YMMV, we'll see.
     35#initIPDBGlobals($dbh);
    3236
    3337my @masterblocks;

  • branches/stable/cgi-bin/freespace.pl

    r125 r158  
    88# Last update by $Author$
    99###
    10 # Copyright (C) 2004 - Kris Deugau
     10# Copyright (C) 2004,2005 - Kris Deugau
    1111
    1212use DBI;
    13 use IPDB 2.0 qw(:ALL);
     13use MyIPDB;
    1414use NetAddr::IP;
    1515
    16 ($dbh,errstr) = connectDB("ipdb", "ipdb", "ipdbpwd");
     16($dbh,$errstr) = connectDB_My;
    1717
    1818print "Content-type: text/plain\n\n";

  • branches/stable/cgi-bin/main.cgi

    r140 r158  
    1414use DBI;
    1515use CommonWeb qw(:ALL);
    16 use IPDB 2.0 qw(:ALL);
     16use MyIPDB;
    1717use CustIDCK;
    1818use POSIX qw(ceil);
    … …  
    3838my $sth;
    3939my $errstr;
    40 ($ip_dbh,$errstr) = connectDB("ipdb", "ipdb", "ipdbpwd");
     40($ip_dbh,$errstr) = connectDB_My;
    4141if (!$ip_dbh) {
    4242  printAndExit("Failed to connect to database: $errstr\n");

  • branches/stable/cgi-bin/newcity.cgi

    r140 r158  
    1515use DBI;
    1616use CommonWeb qw(:ALL);
    17 use IPDB 2.0 qw(:ALL);
     17use MyIPDB;
    1818#use POSIX qw(ceil);
    1919use NetAddr::IP;
    … …  
    3434cleanInput(\%webvar);
    3535
    36 my ($dbh,$errstr) = connectDB("ipdb", "ipdb", "ipdbpwd");
     36my ($dbh,$errstr) = connectDB_My;
    3737my $sth;
    3838
Note: See TracChangeset for help on using the changeset viewer.