Changeset 470

Timestamp:

03/12/13 16:19:08 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

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

• convert isParent(), fix up partial caller conversion that shouldn't have been committed in r469

Location:

trunk

Files:

• DNSDB.pm (modified) (2 diffs)
• dns.cgi (modified) (5 diffs)

trunk/DNSDB.pm

@@ -4158 +4158 @@
 # Returns true if $id1 is a parent of $id2, false otherwise
 sub isParent {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $id1 = shift;
   my $type1 = shift; 
@@ -4202 +4203 @@
     return 1 if $type1 eq 'revzone' && $id1 == $rdns;
     # if request is group, check *both* parents.  Only check if the parent is nonzero though.
-    return 1 if $dom && isParent($dbh, $id1, $type1, $dom, 'domain');
-    return 1 if $rdns && isParent($dbh, $id1, $type1, $rdns, 'revzone');
+    return 1 if $dom && $self->isParent($id1, $type1, $dom, 'domain');
+    return 1 if $rdns && $self->isParent($id1, $type1, $rdns, 'revzone');
     # exit here since we've executed the loop below by proxy in the above recursive calls.
     return 0;

trunk/dns.cgi

@@ -312 +312 @@
     my $flag = 0;
     foreach (@viewablegroups) {
-      $flag = 1 if $dnsdb->isParent(, $_, 'group', $webvar{id}, 'domain');
+      $flag = 1 if $dnsdb->isParent($_, 'group', $webvar{id}, 'domain');
     }
     if ($flag && ($permissions{admin} || $permissions{domain_edit})) {
@@ -416 +416 @@
     my $flag = 0;
     foreach (@viewablegroups) {
-      $flag = 1 if $dnsdb->isParent(, $_, 'group', $webvar{id}, 'revzone');
+      $flag = 1 if $dnsdb->isParent($_, 'group', $webvar{id}, 'revzone');
     }
     if ($flag && ($permissions{admin} || $permissions{domain_edit})) {
@@ -1092 +1092 @@
     my $flag = 0;
     foreach (@viewablegroups) {
-      $flag = 1 if $dnsdb->isParent(, $_, 'group', $webvar{id}, 'user');
+      $flag = 1 if $dnsdb->isParent($_, 'group', $webvar{id}, 'user');
     }
     if ($flag && ($permissions{admin} || $permissions{user_edit} ||
@@ -1775 +1775 @@
     $row{whereami} = $uri_self;
     $row{curgrp} = ($_ == $cur);
-    $row{expanded} = $dnsdb->isParent(, $_, 'group', $cur, 'group');
+    $row{expanded} = $dnsdb->isParent($_, 'group', $cur, 'group');
     $row{expanded} = 1 if $_ == $cur;
     $row{subs} = fill_grptree($_,$cur,$indent.'    ');
@@ -2337 +2337 @@
   } else {
     foreach (@viewablegroups) {
-      return 1 if $dnsdb->isParent(, $_, 'group', $entity, $entype);
+      return 1 if $dnsdb->isParent($_, 'group', $entity, $entype);
     }
   }