Changeset 128 for trunk/dns.cgi

Timestamp:

09/21/11 18:13:16 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Code review/cleanup

• Move configuration of DB host, user, pass, name into an outside file.
• Fail more gracefully on DB connection failure. Includes minor CSS tweak that probably doesn't really do what I think it's doing.

File:

• trunk/dns.cgi (modified) (1 diff)

trunk/dns.cgi

@@ -130 +130 @@
 my $sortorder = "ASC";
 
-#my ($dbh,$msg) = connectDB("dnsdb","dnsdb","secret","newdbhost");
+# now load some local system defaults (mainly DB connect info)
+# note this is not *absolutely* fatal, since there's a default dbname/user/pass in DNSDB.pm
+# we'll catch a bad DB connect string a little further down.
+if (!loadConfig()) {
+  warn "Using default configuration;  unable to load custom settings: $DNSDB::errstr";
+}
+
+##fixme: quit throwing the database handle around, and put all the SQL and direct DB fiddling into DNSDB.pm
 # dbname, user, pass, host (optional)
-my ($dbh,$msg) = connectDB("dnsdb", "dnsdb", "secret", "dnsdbhost");
-#my $dbh = DBI->connect("DBI:mysql:database=vegadns","vegadns","secret",
-#       { AutoCommit => 0 }) or die $DBI::errstr;
-
-##fixme.  PLEASE!  <G>
-print $msg if !$dbh;
-
-# fiddle hardcoded "defaults" as per system/user (?) prefs
+my ($dbh,$msg) = connectDB($config{dbname}, $config{dbuser}, $config{dbpass}, $config{dbhost});
+
+if (!$dbh) {
+  print "Content-type: text/html\n\n";
+  print $header->output;
+  my $errpage = HTML::Template->new(filename => "$templatedir/dberr.tmpl");
+  $errpage->param(errmsg => $msg);
+  print $errpage->output;
+  print $footer->output;
+  exit;
+}
+
+# Load config pieces from the database.  Ideally all but the DB user/pass/etc should be loaded here.
 initGlobals($dbh);