Changeset 473 for trunk/dns.cgi

Timestamp:

03/12/13 17:39:47 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Object conversion of DNSDB.pm, 8 of <mumble>. See #11.

• update domainName(), revName(), userFullName(), groupName() and parentID(), and callers

File:

• trunk/dns.cgi (modified) (22 diffs)

trunk/dns.cgi

@@ -392 +392 @@
 
     $page->param(del_getconf => 1);
-    $page->param(domain => domainName($dbh,$webvar{id}));
+    $page->param(domain => $dnsdb->domainName($webvar{id}));
 
   } elsif ($webvar{del} eq 'ok') {
-    my $pargroup = parentID($dbh, (id => $webvar{id}, type => 'domain', revrec => $webvar{revrec}));
+    my $pargroup = $dnsdb->parentID(id => $webvar{id}, type => 'domain', revrec => $webvar{revrec});
     my ($code,$msg) = delZone($dbh, $webvar{id}, $webvar{revrec});
     if ($code eq 'OK') {
@@ -492 +492 @@
 
     $page->param(del_getconf => 1);
-    $page->param(revzone => revName($dbh,$webvar{id}));
+    $page->param(revzone => $dnsdb->revName($webvar{id}));
 
   } elsif ($webvar{del} eq 'ok') {
-    my $pargroup = parentID($dbh, (id => $webvar{id}, type => 'revzone', revrec => $webvar{revrec}));
-    my $zone = revName($dbh, $webvar{id});
+    my $pargroup = $dnsdb->parentID(id => $webvar{id}, type => 'revzone', revrec => $webvar{revrec});
+    my $zone = $dnsdb->revName($webvar{id});
     my ($code,$msg) = delZone($dbh, $webvar{id}, 'y');
     if ($code eq 'OK') {
@@ -569 +569 @@
 # fill the page-count and first-previous-next-last-all details
     fill_pgcount($count,"records",
-        ($webvar{defrec} eq 'y' ? "group ".groupName($dbh,$webvar{id}) : 
-                ($webvar{revrec} eq 'y' ? revName($dbh,$webvar{id}) : domainName($dbh,$webvar{id}))
+        ($webvar{defrec} eq 'y' ? "group ".$dnsdb->groupName($webvar{id}) : 
+                ($webvar{revrec} eq 'y' ? $dnsdb->revName($webvar{id}) : $dnsdb->domainName($webvar{id}))
         ));
     fill_fpnla($count);  # should put some params on this sub...
@@ -724 +724 @@
 
   if ($webvar{defrec} eq 'y') {
-    $page->param(dohere => "default records in group ".groupName($dbh,$webvar{parentid}));
+    $page->param(dohere => "default records in group ".$dnsdb->groupName($webvar{parentid}));
   } else {
-    $page->param(dohere => domainName($dbh,$webvar{parentid})) if $webvar{revrec} eq 'n';
-    $page->param(dohere => revName($dbh,$webvar{parentid})) if $webvar{revrec} eq 'y';
+    $page->param(dohere => $dnsdb->domainName($webvar{parentid})) if $webvar{revrec} eq 'n';
+    $page->param(dohere => $dnsdb->revName($webvar{parentid})) if $webvar{revrec} eq 'y';
   }
 
@@ -929 +929 @@
     changepage(page => "grpman");
   }
-  $page->param(delgroupname => groupName($dbh, $webvar{id}));
+  $page->param(delgroupname => $dnsdb->groupName($webvar{id}));
 
 } elsif ($webvar{page} eq 'edgroup') {
@@ -968 +968 @@
         changepage(page => "grpman", warnmsg =>
                 "You can only grant permissions you hold.  Default permissions in group ".
-                groupName($dbh, $webvar{gid})." updated with reduced access");
+                $dnsdb->groupName($webvar{gid})." updated with reduced access");
       } else {
         changepage(page => "grpman", resultmsg => $msg);
@@ -978 +978 @@
   }
   $page->param(gid => $webvar{gid});
-  $page->param(grpmeddle => groupName($dbh, $webvar{gid}));
+  $page->param(grpmeddle => $dnsdb->groupName($webvar{gid}));
   my %grpperms;
   getPermissions($dbh, 'group', $webvar{gid}, \%grpperms);
@@ -996 +996 @@
 
   $page->param(curpage => $webvar{page});
-  fill_pgcount($count,'domains',groupName($dbh,$curgroup));
+  fill_pgcount($count, 'domains', $dnsdb->groupName($curgroup));
   fill_fpnla($count);
   $page->param(perpage => $perpage);
@@ -1026 +1026 @@
     changepage(page => "domlist", errmsg => "You are not permitted to bulk-move domains")
         unless ($permissions{admin} || ($permissions{domain_edit} && $permissions{domain_create} && $permissions{domain_delete}));
-    my $newgname = groupName($dbh,$webvar{destgroup});
+    my $newgname = $dnsdb->groupName($webvar{destgroup});
     $page->param(action => "Move to group $newgname");
   } elsif ($webvar{bulkaction} eq 'deactivate' || $webvar{bulkaction} eq 'activate') {
@@ -1056 +1056 @@
       next;
     }
-    $row{domain} = domainName($dbh,$webvar{$_});
+    $row{domain} = $dnsdb->domainName($webvar{$_});
 
     # Do the $webvar{bulkaction}
@@ -1317 +1317 @@
   if (!defined($webvar{del})) {
     $page->param(del_getconf => 1);
-    $page->param(user => userFullName($dbh,$webvar{id}));
+    $page->param(user => $dnsdb->userFullName($webvar{id}));
   } elsif ($webvar{del} eq 'ok') {
     my ($code,$msg) = delUser($dbh, $webvar{id});
@@ -1627 +1627 @@
       goto DONELOG;
     }
-    $page->param(logfor => 'user '.userFullName($dbh,$id));
+    $page->param(logfor => 'user '.$dnsdb->userFullName($id));
   } elsif ($webvar{ltype} && $webvar{ltype} eq 'dom') {
     $id = $webvar{id};
@@ -1634 +1634 @@
       goto DONELOG;
     }
-    $page->param(logfor => 'domain '.domainName($dbh,$id));
+    $page->param(logfor => 'domain '.$dnsdb->domainName($id));
   } elsif ($webvar{ltype} && $webvar{ltype} eq 'rdns') {
     $id = $webvar{id};
@@ -1641 +1641 @@
       goto DONELOG;
     }
-    $page->param(logfor => 'reverse zone '.revName($dbh,$id));
+    $page->param(logfor => 'reverse zone '.$dnsdb->revName($id));
   } else {
     # Default to listing curgroup log
-    $page->param(logfor => 'group '.groupName($dbh,$id));
+    $page->param(logfor => 'group '.$dnsdb->groupName($id));
     # note that scope limitations are applied via the change-group check;
     # group log is always for the "current" group
@@ -1699 +1699 @@
 
   $page->param(group => $curgroup);
-  $page->param(groupname => groupName($dbh,$curgroup));
-  $page->param(logingrp => groupName($dbh,$logingroup));
+  $page->param(groupname => $dnsdb->groupName($curgroup));
+  $page->param(logingrp => $dnsdb->groupName($logingroup));
   $page->param(logingrp_num => $logingroup);
 
@@ -1771 +1771 @@
   foreach (@childlist) {
     my %row;
-    $row{grpname} = groupName($dbh,$_);
+    $row{grpname} = $dnsdb->groupName($_);
     $row{grpnum} = $_;
     $row{whereami} = $uri_self;
@@ -1847 +1847 @@
 #  $page->param(group   => $DNSDB::group);
   $page->param(isgrp => 1) if $defrec eq 'y';
-  $page->param(parent => ($defrec eq 'y' ? groupName($dbh, $id) :
-        ($revrec eq 'n' ? domainName($dbh, $id) : revName($dbh, $id)) ) );
+  $page->param(parent => ($defrec eq 'y' ? $dnsdb->groupName($id) :
+        ($revrec eq 'n' ? $dnsdb->domainName($id) : $dnsdb->revName($id)) ) );
 
 # defaults
@@ -1926 +1926 @@
 # prefill <domain> or DOMAIN in "Host" space for new records
   if ($webvar{revrec} eq 'n') {
-    my $domroot = ($webvar{defrec} eq 'y' ? 'DOMAIN' : domainName($dbh,$webvar{parentid}));
+    my $domroot = ($webvar{defrec} eq 'y' ? 'DOMAIN' : $dnsdb->domainName($webvar{parentid}));
     $page->param(name   => ($webvar{name} ? $webvar{name} : $domroot));
     $page->param(address        => $webvar{address});
@@ -1936 +1936 @@
     my $domroot = ($webvar{defrec} eq 'y' ? 'ADMINDOMAIN' : ".$config{domain}");
     $page->param(name   => ($webvar{name} ? $webvar{name} : $domroot));
-    my $zname = ($webvar{defrec} eq 'y' ? 'ZONE' : revName($dbh,$webvar{parentid}));
+    my $zname = ($webvar{defrec} eq 'y' ? 'ZONE' : $dnsdb->revName($webvar{parentid}));
     $zname =~ s|\d*/\d+$||;
     $page->param(address        => ($webvar{address} ? $webvar{address} : $zname));
@@ -2039 +2039 @@
 
 # fill page count and first-previous-next-last-all bits
-  fill_pgcount($count,($webvar{revrec} eq 'n' ? 'domains' : 'revzones'),groupName($dbh,$curgroup));
+  fill_pgcount($count,($webvar{revrec} eq 'n' ? 'domains' : 'revzones'),$dnsdb->groupName($curgroup));
   fill_fpnla($count);
 
@@ -2151 +2151 @@
       $row{groupval} = $_;
       $row{groupactive} = ($_ == $cur);
-      $row{groupname} = $indent.groupName($dbh, $_);
+      $row{groupname} = $indent.$dnsdb->groupName($_);
       push @{$grplist}, \%row;
       getgroupdrop($_, $cur, $grplist, $indent.'&nbsp;&nbsp;&nbsp;&nbsp;');
@@ -2159 +2159 @@
   my @grouplist;
   push @grouplist, { groupval => $logingroup, groupactive => $logingroup == $curgroup,
-        groupname => groupName($dbh, $logingroup) };
+        groupname => $dnsdb->groupName($logingroup) };
   getgroupdrop($logingroup, $curgroup, \@grouplist);