Changeset 80 for trunk/uribl/delist-uri

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/delist-uri (modified) (2 diffs)

trunk/uribl/delist-uri

@@ -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
@@ -23 +23 @@
 use DBI;
 
-use URIdb;
+# push "the directory the script is in" into @INC
+use FindBin;
+use lib "$FindBin::RealBin/";
+
+use URIdb 2.0;
 
 my $uridb = new URIdb;
 
-# default DB info - all other settings should be loaded from the DB.
-my $dbhost = "localhost";
-my $dbname = "dnsbl";
-my $dbuser = "dnsbl";
-my $dbpass = "spambgone";
+die "Usage: delist-uri <domain>\n"
+        if !$ARGV[1];
 
-die "Usage: delist-uri <domain>\n"
-        if !$ARGV[0];
+my $cfgname = shift @ARGV;
 
-# Load a config ref containing DB host, name, user, and pass info based on
-# from the server name + full script web path.  This allows us to host
-# multiple instances without having to duplicate the code.
-# This file is a Perl fragment to be processed inline.
-if (-e "/etc/uridb/uridb.conf") {
-  my $cfg = `cat /etc/uridb/uridb.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");
+$uridb->connect;
 
 my %config;