Changeset 489

Timestamp:

03/19/13 17:47:40 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Object conversion of DNSDB.pm, part 21. See #11.

• remove %permissions global from module; all the access controls are checked on the caller's side. Declare it in dns.cgi instead (the only place it's checked).

Location:

trunk

Files:

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

trunk/DNSDB.pm

@@ -38 +38 @@
 @EXPORT_OK      = qw(
         &initGlobals &login &initActionLog
-        &initPermissions &getPermissions &changePermissions &comparePermissions
+        &getPermissions &changePermissions &comparePermissions
         &changeGroup
         &loadConfig &connectDB &finish
@@ -60 +60 @@
         &mailNotify
         %typemap %reverse_typemap %config
-        %permissions @permtypes $permlist %permchains
+        @permtypes $permlist %permchains
         );
 
-@EXPORT         = qw(%typemap %reverse_typemap %permissions @permtypes $permlist %permchains);
+@EXPORT         = qw(%typemap %reverse_typemap @permtypes $permlist %permchains);
 %EXPORT_TAGS    = ( ALL => [qw(
                 &initGlobals &login &initActionLog
-                &initPermissions &getPermissions &changePermissions &comparePermissions
+                &getPermissions &changePermissions &comparePermissions
                 &changeGroup
                 &loadConfig &connectDB &finish
@@ -88 +88 @@
                 &mailNotify
                 %typemap %reverse_typemap %config
-                %permissions @permtypes $permlist %permchains
+                @permtypes $permlist %permchains
                 )]
         );
@@ -135 +135 @@
 our %typemap;
 our %reverse_typemap;
-
-our %permissions;
 
 # Prepopulate a basic config.  Note some of these *will* cause errors if left unset.
@@ -1557 +1555 @@
 
 } # end initActionLog
-
-
-## DNSDB::initPermissions()
-# Set up permissions global
-# Takes database handle and UID
-sub initPermissions {
-  my $self = shift;
-  my $dbh = $self->{dbh};
-  my $uid = shift;
-
-#  %permissions = $(getPermissions('user',$uid));
-  $self->getPermissions('user', $uid, \%permissions);
-
-} # end initPermissions()
 
 

trunk/dns.cgi

@@ -291 +291 @@
 
 # Misc Things To Do on most pages
-$dnsdb->initPermissions($session->param('uid'));
+my %permissions;
+$dnsdb->getPermissions('user', $session->param('uid'), \%permissions);
 $dnsdb->initActionLog($session->param('uid'));