Changeset 476 for trunk/dns.cgi

Timestamp:

03/13/13 13:20:50 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

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

• group manipulation and data-retrieval subs changeGroup(), addGroup(), delGroup(), getChildren(), getGroupCount(), and getGroupList()

File:

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

trunk/dns.cgi

@@ -874 +874 @@
     # https://secure.deepnet.cx/trac/dnsadmin/ticket/8 for the UI enhancement
     # that will make this variable.
-    my ($code,$msg) = addGroup($dbh, $webvar{newgroup}, $webvar{pargroup}, \%newperms, 1);
+    my ($code,$msg) = $dnsdb->addGroup($webvar{newgroup}, $webvar{pargroup}, \%newperms, 1);
     if ($code eq 'OK') {
       if ($alterperms) {
@@ -917 +917 @@
 
   } elsif ($webvar{del} eq 'ok') {
-    my ($code,$msg) = delGroup($dbh, $webvar{id});
+    my ($code,$msg) = $dnsdb->delGroup($webvar{id});
     if ($code eq 'OK') {
 ##fixme: need to clean up log when deleting a major container
@@ -1060 +1060 @@
     # Do the $webvar{bulkaction}
     my ($code, $msg);
-    ($code, $msg) = changeGroup($dbh, 'domain', $webvar{$_}, $webvar{destgroup})
+    ($code, $msg) = $dnsdb->changeGroup('domain', $webvar{$_}, $webvar{destgroup})
         if $webvar{bulkaction} eq 'move';
     if ($webvar{bulkaction} eq 'deactivate' || $webvar{bulkaction} eq 'activate') {
@@ -1766 +1766 @@
 
   my $grptree = HTML::Template->new(filename => 'templates/grptree.tmpl');
-  getChildren($dbh,$root,\@childlist,'immediate');
+  $dnsdb->getChildren($root, \@childlist, 'immediate');
   return if $#childlist == -1;
   my @grouplist;
@@ -2032 +2032 @@
 
   my @childgroups;
-  getChildren($dbh, $curgroup, \@childgroups, 'all') if $searchsubs;
+  $dnsdb->getChildren($curgroup, \@childgroups, 'all') if $searchsubs;
   my $childlist = join(',',@childgroups);
 
@@ -2090 +2090 @@
 
   my @childgroups;
-  getChildren($dbh, $curgroup, \@childgroups, 'all') if $searchsubs;
+  $dnsdb->getChildren($curgroup, \@childgroups, 'all') if $searchsubs;
   my $childlist = join(',',@childgroups);
 
-  my ($count) = getGroupCount($dbh, (childlist => $childlist, curgroup => $curgroup,
-        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) ) );
+  my ($count) = $dnsdb->getGroupCount(childlist => $childlist, curgroup => $curgroup,
+        filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef) );
 
 # fill page count and first-previous-next-last-all bits
@@ -2125 +2125 @@
   $sortby = 'g2.group_name' if $sortby eq 'parent';
 
-  my $glist = getGroupList($dbh, (childlist => $childlist, curgroup => $curgroup,
+  my $glist = $dnsdb->getGroupList(childlist => $childlist, curgroup => $curgroup,
         filter => ($filter ? $filter : undef), startwith => ($startwith ? $startwith : undef),
-        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder) );
+        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder);
 
   $page->param(grouptable => $glist);
@@ -2145 +2145 @@
 
     my @childlist;
-    getChildren($dbh,$root,\@childlist,'immediate');
+    $dnsdb->getChildren($root, \@childlist, 'immediate');
     return if $#childlist == -1;
     foreach (@childlist) {
@@ -2188 +2188 @@
 
   my @childgroups;
-  getChildren($dbh, $curgroup, \@childgroups, 'all') if $searchsubs;
+  $dnsdb->getChildren($curgroup, \@childgroups, 'all') if $searchsubs;
   my $childlist = join(',',@childgroups);
 
@@ -2235 +2235 @@
 
   my @childgroups;
-  getChildren($dbh, $curgroup, \@childgroups, 'all') if $searchsubs;
+  $dnsdb->getChildren($curgroup, \@childgroups, 'all') if $searchsubs;
   my $childlist = join(',',@childgroups);