Changeset 80 for trunk/uribl/uridb.cgi

Timestamp:

09/11/25 16:28:23 (4 days ago)

Author:

Kris Deugau

Message:

/trunk/uribl

Convert module to more proper object with embedded DB bits
Add module-finding blurb

File:

• trunk/uribl/uridb.cgi (modified) (5 diffs)

trunk/uribl/uridb.cgi

@@ -3 +3 @@
 ##
 # $Id$
-# Copyright 2010 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2010,2025 Kris Deugau <kdeugau@deepnet.cx>
 # 
 #    This program is free software: you can redistribute it and/or modify
@@ -22 +22 @@
 use warnings;
 no warnings qw(uninitialized);
+
 use CGI::Carp qw (fatalsToBrowser);
 use CGI::Simple;
@@ -27 +28 @@
 use Encode;
 
-use URIdb;
+# push "the directory the script is in" into @INC
+use FindBin;
+use lib "$FindBin::RealBin/";
+
+use URIdb 2.0;
 
 # Set up the CGI object...
@@ -40 +45 @@
 }
 
-my $uridb = new URIdb;
-
 print $q->header(-charset=>'utf8');
-
-# default DB info - all other settings should be loaded from the DB.
-my $dbhost = "localhost";
-my $dbname = "uridb";
-my $dbuser = "uridb";
-my $dbpass = "spambgone";
 
 #my %status = (0 => "Don't list",
@@ -64 +61 @@
 $cfgname =~ s|_uridb_cgi.*||;
 $cfgname =~ s|_$||;
-if (-e "/etc/uridb/$cfgname.conf") {
-  my $cfg = `cat /etc/uridb/$cfgname.conf`;
-  ($cfg) = ($cfg =~ /^(.+)$/s);         # avoid warnings, failures, and general nastiness with taint mode
-  eval $cfg;
-}
 
-my $dbh = $uridb->connect($dbhost, $dbname, $dbuser, $dbpass);
+my $uridb = new URIdb (configfile => "/etc/uridb/$cfgname.conf");
 
 my $page;