Changeset 78

Timestamp:

02/23/11 14:53:57 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak and fix permission update sub; it should now properly add
the permission entry if the permissions being edited were inherited

File:

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

trunk/DNSDB.pm

@@ -247 +247 @@
   my $newperms = shift;
 
-my $failmsg = '';
+  my $failmsg = '';
 
   # see if we're switching from inherited to custom
@@ -258 +258 @@
   my ($wasinherited,$permid) = $sth->fetchrow_array;
 
+# hack phtoui
+# group id 1 is "special" in that it's it's own parent (err...  possibly.)
+# may make its parent id 0 which doesn't exist, and as a bonus is Perl-false.
+  $wasinherited = 0 if ($type eq 'group' && $id == 1);
+
   local $dbh->{AutoCommit} = 0;
   local $dbh->{RaiseError} = 1;
@@ -264 +269 @@
   eval {
     if ($wasinherited) {
-$failmsg = "wasinherited: '$wasinherited'";
-die "don't wanna add perms where we don't need to";
 ##fixme: need to add semirecursive bit to properly munge inherited permission ID on subgroups and users
-## FIXME:  need to fiddle permissions table to track back to users or groups table
-      my $sql = "INSERT INTO permissions ($permlist) ".
-        "SELECT $permlist FROM permissions WHERE permission_id=?";
-      $sth = $dbh->prepare($sql);
-      $sth->execute($permid);
+      $dbh->do("INSERT INTO permissions ($permlist) ".
+        "SELECT $permlist FROM permissions WHERE permission_id=?", undef, ($permid) );
+      #$sth = $dbh->prepare($sql);
+      #$sth->execute($permid);
       $sth = $dbh->prepare("SELECT permission_id FROM ".($type eq 'user' ? 'users' : 'groups').
         " WHERE ".($type eq 'user' ? 'user' : 'group')."_id=?");
       $sth->execute($id);
       ($permid) = $sth->fetchrow_array;
+      $dbh->do("UPDATE permissions SET ".($type eq 'user' ? 'user' : 'group')."_id=? ".
+        "WHERE permission_id=?", undef, ($id,$permid) );
+      $dbh->do("UPDATE ".($type eq 'user' ? 'users' : 'groups')." SET permission_id=? ".
+        "WHERE ".($type eq 'user' ? 'user' : 'group')."_id=?", undef, ($permid,$id) );
     }
     foreach (@permtypes) {
       if (defined ($newperms->{$_})) {
-        $sth = $dbh->prepare("UPDATE permissions SET $_=? WHERE permission_id=?");
-        $sth->execute($newperms->{$_},$permid);
+        $dbh->do("UPDATE permissions SET $_=? WHERE permission_id=?", undef, ($newperms->{$_},$permid) );
+        #$sth->execute($newperms->{$_},$permid);
       }
     }
+
     $dbh->commit;
   }; # end eval