Changeset 19 for trunk

Timestamp:

10/09/09 17:49:14 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint

Location:

trunk

Files:

• DNSDB.pm (modified) (3 diffs)
• dns.cgi (modified) (5 diffs)
• templates/grpman.tmpl (added)
• templates/newgrp.tmpl (added)

trunk/DNSDB.pm

@@ -23 +23 @@
 @ISA            = qw(Exporter);
 @EXPORT_OK      = qw(
-        &initGlobals &connectDB &finish &addDomain &delDomain &domainName &addGroup &grpName &getSOA
+        &initGlobals &connectDB &finish &addDomain &delDomain &domainName &addGroup &getChildren &grpName &getSOA
         &getRecLine &getDomRecs &addRec &updateRec &delRec &domStatus
         %typemap %reverse_typemap
@@ -30 +30 @@
 @EXPORT         = (); # Export nothing by default.
 %EXPORT_TAGS    = ( ALL => [qw(
-                &initGlobals &connectDB &finish &addDomain &delDomain &domainName &addGroup &grpName &getSOA
+                &initGlobals &connectDB &finish &addDomain &delDomain &domainName &addGroup &getChildren &grpName 
+&getSOA
                 &getRecLine &getDomRecs &addRec &updateRec &delRec &domStatus
                 %typemap %reverse_typemap
@@ -318 +319 @@
 
 
+## DNSDB::getChildren()
+# Get a list of all groups whose parent^n is group <n>
+# Takes a database handle, group ID, and reference to an array to put the group IDs in
+# Calls itself
+sub getChildren {
+  $errstr = '';
+  my $dbh = shift;
+  my $rootgrp = shift;
+  my $grpdest = shift;
+
+  # special break for default group;  otherwise we get stuck.
+  if ($rootgrp == 1) {
+    # by definition, group 1 is the Root Of All Groups
+    my $sth = $dbh->prepare("SELECT group_id FROM groups");
+    $sth->execute;
+    my @grplist;
+    while (my @this = $sth->fetchrow_array) {
+      push @$grpdest, @this;
+    }
+  } else {
+    my $sth = $dbh->prepare("SELECT group_id FROM groups WHERE parent_group_id=?");
+    $sth->execute($rootgrp);
+    return if $sth->rows == 0;
+    my @grplist;
+    while (my ($grp) = $sth->fetchrow_array) {
+      push @$grpdest, $grp;
+      getChildren($dbh,$grp,$grpdest);
+    }
+  }
+} # end getChildren()
+
+
 ## DNSDB::grpName()
 # Return the group name based on a group ID

trunk/dns.cgi

@@ -49 +49 @@
 }
 
-my $logingroup = $session->param('logingroup');
-my $curgroup = ($session->param('curgroup') ? $session->param('curgroup') : $session->param('logingroup'));
+my $logingroup = ($session->param('logingroup') ? $session->param('logingroup') : 1);
+my $curgroup = ($session->param('curgroup') ? $session->param('curgroup') : $logingroup);
 my $group = ($webvar{group} ? $webvar{group} : 1);
 
@@ -403 +403 @@
     $page->param(errmsg => $msg);
     $page->param(newgroup => $webvar{newgroup});
+     fill_grplist('pargroup',$webvar{pargroup});
+  } else {
+#    $page->param
+     fill_grplist('pargroup',$curgroup);
+
   }
 }
@@ -416 +421 @@
   $page->param(grp => $group);
   $page->param(grpname => grpName($dbh,$group));
-  fill_grplist();
+  fill_grplist("grplist");
 }
 
@@ -634 +639 @@
 
 sub fill_grplist {
+  my $template_var = shift;
+  my $cur = shift || $curgroup;
   # weesa gonna discard parent_group_id for now
   my $sth = $dbh->prepare("SELECT group_id,parent_group_id,group_name FROM groups ORDER BY group_id");
-push @debugbits, "grp list sth err: ".$sth->errstr."<br>\n";
   $sth->execute;
   my @grplist;
@@ -645 +651 @@
 ##fixme: need magic
 #    $row{defgrp} = '';
-    $row{grpactive} = 1 if $grpid eq $curgroup;
+    $row{grpactive} = 1 if $grpid == $cur;
     push @grplist, \%row;
   }
 
-  $page->param(grplist => \@grplist);
-
-}
+  $page->param("$template_var" => \@grplist);
+
+}