Changeset 474

Timestamp:

03/12/13 18:04:34 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

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

• update entry to getPermissions() and changePermissions(), update callers

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• dns.cgi (modified) (10 diffs)

trunk/DNSDB.pm

@@ -1631 +1631 @@
 # Takes a db handle, type, owner-id, and hashref for the changed permissions.
 sub changePermissions {
-  my $dbh = shift;
+  my $self = shift;
+  my $dbh = $self->{dbh};
   my $type = shift;
   my $id = shift;

trunk/dns.cgi

@@ -893 +893 @@
     # fill default permissions with immediate parent's current ones
     my %parperms;
-    getPermissions($dbh, 'group', $curgroup, \%parperms);
+    $dnsdb->getPermissions('group', $curgroup, \%parperms);
     fill_permissions($page, \%parperms);
   }
@@ -944 +944 @@
     # extra safety check;  make sure user can't construct a URL to bypass ACLs
     my %curperms;
-    getPermissions($dbh, 'group', $webvar{gid}, \%curperms);
+    $dnsdb->getPermissions('group', $webvar{gid}, \%curperms);
     my %chperms;
     my $alterperms = 0;
@@ -963 +963 @@
       }
     }
-    my ($code,$msg) = changePermissions($dbh, 'group', $webvar{gid}, \%chperms);
+    my ($code,$msg) = $dnsdb->changePermissions('group', $webvar{gid}, \%chperms);
     if ($code eq 'OK') {
       if ($alterperms) {
@@ -980 +980 @@
   $page->param(grpmeddle => $dnsdb->groupName($webvar{gid}));
   my %grpperms;
-  getPermissions($dbh, 'group', $webvar{gid}, \%grpperms);
+  $dnsdb->getPermissions('group', $webvar{gid}, \%grpperms);
   fill_permissions($page, \%grpperms);
 
@@ -1124 +1124 @@
   fill_clonemelist();
   my %grpperms;
-  getPermissions($dbh, 'group', $curgroup, \%grpperms);
+  $dnsdb->getPermissions('group', $curgroup, \%grpperms);
 
   my $grppermlist = new HTML::Template(filename => "$templatedir/permlist.tmpl");
@@ -1146 +1146 @@
 
     my %newperms;       # we're going to prefill the existing permissions, so we can change them.
-    getPermissions($dbh, 'user', $webvar{uid}, \%newperms);
+    $dnsdb->getPermissions('user', $webvar{uid}, \%newperms);
 
     if ($webvar{pass1} ne $webvar{pass2}) {
@@ -1161 +1161 @@
       if (!$permissions{admin}) {
         my %grpperms;
-        getPermissions($dbh, 'group', $curgroup, \%grpperms);
+        $dnsdb->getPermissions('group', $curgroup, \%grpperms);
         my $ret = comparePermissions(\%permissions, \%grpperms);
         if ($ret eq '<' || $ret eq '!') {
@@ -1183 +1183 @@
       } elsif ($permissions{admin} && $webvar{perms_type} eq 'clone') {
         $permstring = "c:$webvar{clonesrc}";
-        getPermissions($dbh, 'user', $webvar{clonesrc}, \%newperms);
+        $dnsdb->getPermissions('user', $webvar{clonesrc}, \%newperms);
         $page->param(perm_clone => 1);
       } else {
@@ -1219 +1219 @@
         if ($code eq 'OK') {
           $newperms{admin} = 1 if $webvar{accttype} eq 'S';
-          ($code2,$msg2) = changePermissions($dbh, 'user', $webvar{uid}, \%newperms, ($permstring eq 'i'));
+          ($code2,$msg2) = $dnsdb->changePermissions('user', $webvar{uid}, \%newperms, ($permstring eq 'i'));
         }
       }
@@ -1281 +1281 @@
 
     my %curperms;
-    getPermissions($dbh, 'user', $webvar{user}, \%curperms);
+    $dnsdb->getPermissions('user', $webvar{user}, \%curperms);
     fill_permissions($page, \%curperms);