Changeset 191

Timestamp:

12/09/11 16:10:56 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Minor fix in dns-rpc.cgi to load DB user/pass/etc with loadConfig

Location:

trunk

Files:

• DNSDB.pm (modified) (3 diffs)
• dns-rpc.cgi (modified) (1 diff)
• dns.cgi (modified) (1 diff)
• dns.sql (modified) (1 diff)

trunk/DNSDB.pm

@@ -487 +487 @@
 # Log an action
 # Internal sub
-# Takes a database handle, domain_id, user_id, group_id, email, name and log entry
+# Takes a database handle, domain_id, group_id, log entry, and user info hash
+# User info must contain a user ID OR username+fullname
 sub _log {
   my $dbh = shift;
   my ($domain_id,$user_id,$group_id,$username,$name,$entry) = @_;
+
+##fixme:  need better way(s?) to snag userinfo for log entries
+  if (!$user_id) {
+    $user_id, $fullname) = $dbh->fetchrow_array("SELECT user_id, firstname || ' ' || lastname FROM users".
+        " WHERE username=?", undef, ($username));
+  } elsif (!$username) {
+    $username, $fullname) = $dbh->fetchrow_array("SELECT username, firstname || ' ' || lastname FROM users".
+        " WHERE user_id=?", undef, ($user_id));
+  }
+
+  $name = $fullname if !$name;
 
 ##fixme:  farm out the actual logging to different subs for file, syslog, internal, etc based on config
@@ -546 +558 @@
   local $dbh->{RaiseError} = 1;
 
-my $stage = 'insert';
   # Wrap all the SQL in a transaction
   eval {
     # insert the domain...
     $dbh->do("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)", undef, ($domain, $group, $state));
-$stage = 'domid';
 
     # get the ID...
     ($dom_id) = $dbh->selectrow_array("SELECT domain_id FROM domains WHERE domain=?", undef, ($domain));
 
-$stage = 'loginsert';
     _log($dbh, $dom_id, $userinfo{id}, $group, $userinfo{name}, $userinfo{fullname},
         "Added ".($state ? 'active' : 'inactive')." domain $domain");
 
-$stage = 'getdefrec';
     # ... and now we construct the standard records from the default set.  NB:  group should be variable.
     my $sth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl FROM default_records WHERE group_id=?");
@@ -592 +600 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    return ('FAIL',"$msg : $stage");
+    return ('FAIL',$msg);
   } else {
     return ('OK',$dom_id);

trunk/dns-rpc.cgi

@@ -18 +18 @@
 #package main;
 
+loadConfig();
+
 # need to create a DNSDB object too
-my ($dbh,$msg) = DNSDB::connectDB("dnsdb","dnsdb","secret","dnsdbhost");
+my ($dbh,$msg) = DNSDB::connectDB($DNSDB::config{dbname}, $DNSDB::config{dbuser},
+        $DNSDB::config{dbpass}, $DNSDB::config{dbhost});
+
 DNSDB::initGlobals($dbh);
 

trunk/dns.cgi

@@ -347 +347 @@
 
   if ($code eq 'OK') {
-    logaction($msg, $session->param("username"), $webvar{group}, "Added domain $webvar{domain}");
+#    logaction($msg, $session->param("username"), $webvar{group}, "Added domain $webvar{domain}");
     changepage(page => "reclist", id => $msg);
   } else {

trunk/dns.sql

@@ -184 +184 @@
 \.
 
+-- ennnhhh...  do we want to create superusers by default?  may save going back to the DB to manually readd one
 CREATE TABLE users (
     user_id serial NOT NULL,