Changeset 469

Timestamp:

03/12/13 16:12:46 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

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

• convert a couple more initialization/setup subs

Location:

trunk

Files:

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

trunk/DNSDB.pm

@@ -1466 +1466 @@
 
 ## DNSDB::initRPC()
-# Takes a database handle, remote username, and remote fullname.
+# Takes a remote username and remote fullname.
 # Sets up the RPC logging-pseudouser if needed.
 # Sets the %userdata hash for logging.
 # Returns undef on failure
 sub initRPC {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my %args  = @_;
 
@@ -1500 +1501 @@
 # Returns undef otherwise
 sub login {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $user = shift;
   my $pass = shift;
@@ -1534 +1536 @@
 # See https://secure.deepnet.cx/trac/dnsadmin/ticket/21
 sub initActionLog {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $uid = shift;
 
@@ -1562 +1565 @@
 # Takes database handle and UID
 sub initPermissions {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $uid = shift;
 
-#  %permissions = $(getPermissions($dbh,'user',$uid));
-  getPermissions($dbh, 'user', $uid, \%permissions);
+#  %permissions = $(getPermissions('user',$uid));
+  $self->getPermissions('user', $uid, \%permissions);
 
 } # end initPermissions()
@@ -1575 +1579 @@
 # Requires DB handle, group or user flag, ID, and hashref.
 sub getPermissions {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
+
   my $type = shift;
   my $id = shift;

trunk/dns.cgi

@@ -312 +312 @@
     my $flag = 0;
     foreach (@viewablegroups) {
-      $flag = 1 if isParent($dbh, $_, '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 isParent($dbh, $_, '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 isParent($dbh, $_, '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} = isParent($dbh, $_, '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 isParent($dbh, $_, 'group', $entity, $entype);
+      return 1 if $dnsdb->isParent(, $_, 'group', $entity, $entype);
     }
   }