Changeset 155 for trunk/DNSDB.pm

Timestamp:

10/26/11 18:10:09 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak DNSDB::isParent slightly; treat all groups as being their own parent
Remove stale $offset fiddling in page -> bulkdomain
Add error-reporting TMPL_IF on record data page
Continued scope-checking changes:

• rearrange group-changing check a little to allow propagating the error message without hardcoding it twice
• handle the special case of group-change while on the default record list page
• new sub, check_scope, to do the real checking
• use new sub checking access to individual records (both record and parent domain/group)
• check target for bulk domain move, as well as source domains in bulkchange
• check AXFR target group

File:

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

trunk/DNSDB.pm

@@ -1488 +1488 @@
   return 1 if $type1 eq 'group' && $id1 == 1;
 
+  # groups are always (a) parent of themselves
+  return 1 if $type1 eq 'group' && $type2 eq 'group' && $id1 == $id2;
+
 # almost the same loop as getParents() above
   my $id = $id2;
   my $type = $type2;
   my $foundparent = 0;
-my $tmp = 0;
+
   while (1) {
-my $sql = "SELECT $par_col{$type} FROM $par_tbl{$type} WHERE $id_col{$type} = ?";
+    my $sql = "SELECT $par_col{$type} FROM $par_tbl{$type} WHERE $id_col{$type} = ?";
     my $result = $dbh->selectrow_hashref($sql,
         undef, ($id) ) or warn $dbh->errstr." $sql";
@@ -1505 +1508 @@
     $id = $result->{$par_col{$type}};
     $type = $par_type{$type};
-last if $tmp++ > 10;
   }