Changeset 17 for trunk/DNSDB.pm

Timestamp:

09/30/09 16:54:10 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint
dns.cgi:

• misc group-handling tweaks/fixme-fixes
• misc code and SQL formatting normalizations
• add group management list-the-groups page
• extend common-template-parameters section

DNSDB.pm:

• fix start point for returned records in record list
• fix several return-on-error conditions for record add/update

templates/

• add group management/comment to menu
• use fpnla.tmpl in domlist.tmpl
• misc minor fixups

File:

• trunk/DNSDB.pm (modified) (5 diffs)

trunk/DNSDB.pm

@@ -257 +257 @@
 
 ## DNSDB::grpName()
-# Return the domain name based on a domain ID
-# Takes a database handle and the domain ID
-# Returns the domain name or undef on failure
+# Return the group name based on a group ID
+# Takes a database handle and the group ID
+# Returns the group name or undef on failure
 sub grpName {
   $errstr = '';
@@ -388 +388 @@
   $sql .= " and not type=$reverse_typemap{SOA} order by $order";
 ##fixme:  need to set nstart properly (offset is not internally multiplied with limit)
-  $sql .= " limit $nrecs offset $nstart" if $nstart ne 'all';
+  $sql .= " limit $nrecs offset ".($nstart*$nrecs) if $nstart ne 'all';
 
   my $sth = $dbh->prepare($sql);
@@ -457 +457 @@
 sub updateRec {
   $errstr = '';
+
   my $dbh = shift;
   my $defrec = shift;
@@ -475 +476 @@
 
   if ($type == $reverse_typemap{MX} || $type == $reverse_typemap{SRV}) {
-    $dist = shift
-        or return ('FAIL',"MX or SRV requires distance");
+    $dist = shift;
+    return ('FAIL',"MX or SRV requires distance") if !defined($dist);
     if ($type == $reverse_typemap{SRV}) {
-      my $weight = shift
-        or return ('FAIL',"SRV requires weight");
-      my $port = shift
-        or return ('FAIL',"SRV requires port");
+      $weight = shift;
+      return ('FAIL',"SRV requires weight") if !defined($weight);
+      $port = shift;
+      return ('FAIL',"SRV requires port") if !defined($port);
     }
   }
@@ -490 +491 @@
   $sth->execute($host,$type,$val,$ttl,$dist,$weight,$port,$id);
 
-  return ('FAIL',$sth->errstr) if $sth->err;
+  return ('FAIL',$sth->errstr."<br>\n$errstr<br>\n") if $sth->err;
 
   return ('OK','OK');