Changeset 397 for trunk/dns.cgi

Timestamp:

10/02/12 18:15:38 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Caught some inconsistencies getting the RPC CGI updated.

• Normalize to use of odd in record list, same as other lists. Also normalize which case is which in templates so all lists look consistent.
• Normalize calling convention and database calls in list-getting subs
  • getZoneList, with light tweak to template for field name
  • getDomRecs, with conversion from fixed arguments to hash
• Normalize checks on list offsets to the best one, from getZoneList

File:

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

trunk/dns.cgi

@@ -1870 +1870 @@
   $page->param(ttl      => $soa->{ttl});
 
-  my $foo2 = getDomRecs($dbh,$def,$rev,$id,$perpage,$webvar{offset},$sortby,$sortorder,$filter);
-
-  my $row = 0;
+  my $foo2 = getDomRecs($dbh,(defrec => $def, revrec => $rev, id => $id, offset => $webvar{offset},
+        sortby => $sortby, sortorder => $sortorder, filter => $filter));
+
   foreach my $rec (@$foo2) {
     $rec->{type} = $typemap{$rec->{type}};
-    $rec->{row} = $row % 2;
-    $rec->{defrec} = $def;
-    $rec->{revrec} = $rev;
     $rec->{sid} = $webvar{sid};
-    $rec->{id} = $id;
     $rec->{fwdzone} = $rev eq 'n';
     $rec->{distance} = 'n/a' unless ($rec->{type} eq 'MX' || $rec->{type} eq 'SRV'); 
     $rec->{weight} = 'n/a' unless ($rec->{type} eq 'SRV'); 
     $rec->{port} = 'n/a' unless ($rec->{type} eq 'SRV');
-    $row++;
 # ACLs
     $rec->{record_edit} = ($permissions{admin} || $permissions{record_edit});