Changeset 67 for trunk/DNSDB.pm

Timestamp:

11/30/10 18:01:27 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint
Add user ACL handling nearing function
Add user/edit user pages merged; they're next to identical anyway
Group list images tweaked with proper "alpha channel", CSS fiddled again

• final arrangement will probably be a couple of small triangles; pointing right for an expandable group, down for an expanded one

Option to add user to a different group removed

File:

• trunk/DNSDB.pm (modified) (4 diffs)

trunk/DNSDB.pm

@@ -25 +25 @@
 @ISA            = qw(Exporter);
 @EXPORT_OK      = qw(
-        &initGlobals &initPermissions &getPermissions &changePermissions
+        &initGlobals
+        &initPermissions &getPermissions &changePermissions &comparePermissions
         &connectDB &finish
         &addDomain &delDomain &domainName
@@ -39 +40 @@
 @EXPORT         = (); # Export nothing by default.
 %EXPORT_TAGS    = ( ALL => [qw(
-                &initGlobals &initPermissions &getPermissions &changePermissions
+                &initGlobals
+                &initPermissions &getPermissions &changePermissions &comparePermissions
                 &connectDB &finish
                 &addDomain &delDomain &domainName
@@ -294 +296 @@
 
 
+## DNSDB::comparePermissions()
+# Compare two permission hashes
+# Returns '>', '<', '=', '!'
+sub comparePermissions {
+  my $p1 = shift;
+  my $p2 = shift;
+
+  my $retval = '=';     # assume equality until proven otherwise
+
+  no warnings "uninitialized";
+
+  foreach (@permtypes) {
+    next if $p1->{$_} == $p2->{$_};     # equal is good
+    if ($p1->{$_} && !$p2->{$_}) {
+      if ($retval eq '<') {     # if we've already found an unequal pair where
+        $retval = '!';          # $p2 has more access, and we now find a pair
+        last;                   # where $p1 has more access, the overall access
+      }                         # is neither greater or lesser, it's unequal.
+      $retval = '>';
+    }
+    if (!$p1->{$_} && $p2->{$_}) {
+      if ($retval eq '>') {     # if we've already found an unequal pair where
+        $retval = '!';          # $p1 has more access, and we now find a pair
+        last;                   # where $p2 has more access, the overall access
+      }                         # is neither greater or lesser, it's unequal.
+      $retval = '<';
+    }
+  }
+  return $retval;
+} # end comparePermissions()
+
+
 ## DNSDB::_log()
 # Log an action
@@ -640 +674 @@
   my $type = shift || 'u';      # create limited users by default - fwiw, not sure yet how this will interact with ACLs
   
+  my $permstring = shift || 'i';        # default is to inhert permissions from group
+
   my $fname = shift || $username;
   my $lname = shift || '';