Index: /trunk/DNSDB.pm =================================================================== --- /trunk/DNSDB.pm (revision 18) +++ /trunk/DNSDB.pm (revision 19) @@ -23,5 +23,5 @@ @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,5 +30,6 @@ @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,4 +319,36 @@ +## DNSDB::getChildren() +# Get a list of all groups whose parent^n is group +# 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 Index: /trunk/dns.cgi =================================================================== --- /trunk/dns.cgi (revision 18) +++ /trunk/dns.cgi (revision 19) @@ -49,6 +49,6 @@ } -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,4 +403,9 @@ $page->param(errmsg => $msg); $page->param(newgroup => $webvar{newgroup}); + fill_grplist('pargroup',$webvar{pargroup}); + } else { +# $page->param + fill_grplist('pargroup',$curgroup); + } } @@ -416,5 +421,5 @@ $page->param(grp => $group); $page->param(grpname => grpName($dbh,$group)); - fill_grplist(); + fill_grplist("grplist"); } @@ -634,7 +639,8 @@ 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."
\n"; $sth->execute; my @grplist; @@ -645,9 +651,9 @@ ##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); + +} Index: /trunk/templates/grpman.tmpl =================================================================== --- /trunk/templates/grpman.tmpl (revision 19) +++ /trunk/templates/grpman.tmpl (revision 19) @@ -0,0 +1,49 @@ + + + + + +
+ + + + + + + + +
Manage groups
+ +insert search box here
insert letter search here
New Group
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Domain <TMPL_VAR NAME=sortorder>Status <TMPL_VAR NAME=sortorder>Group <TMPL_VAR NAME=sortorder>GroupParent GroupUsersDomainsDelete
No groups found
+ +
Index: /trunk/templates/newgrp.tmpl =================================================================== --- /trunk/templates/newgrp.tmpl (revision 19) +++ /trunk/templates/newgrp.tmpl (revision 19) @@ -0,0 +1,40 @@ + + + + + +
+Error adding group : +
+ + + + + + + + +
+ + + + + + + + + + + + + +
Add Group
Group Name:
Add as subgroup of:
tmp note: radio button select "group template" vs "clone group"?
+
+ +
+ +