Changeset 18 for trunk/dns.cgi

Timestamp:

10/08/09 17:29:50 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint

File:

• trunk/dns.cgi (modified) (9 diffs)

trunk/dns.cgi

@@ -45 +45 @@
 # need to know the "upper" group the user can deal with;  may as well
 # stick this in the session rather than calling out to the DB every time.
-  $session->param('logingroupid',1);
-  $session->param('workinggroupid',1);  # yes, we *do* need to track this too.  er, probably.
-}
-
+  $session->param('logingroup',1);
+  $session->param('curgroup',1);        # yes, we *do* need to track this too.  er, probably.
+}
+
+my $logingroup = $session->param('logingroup');
+my $curgroup = ($session->param('curgroup') ? $session->param('curgroup') : $session->param('logingroup'));
 my $group = ($webvar{group} ? $webvar{group} : 1);
+
 # handle login redirect
 if ($webvar{action} && $webvar{action} eq 'login') {
@@ -102 +105 @@
   }
 
+  $page->param(curpage => $webvar{page});
+
   listdomains();
 
@@ -110 +115 @@
   $page->param(defrec => $webvar{defrec});
   $page->param(id => $webvar{id});
-  $page->param(curpage => 'reclist');
+  $page->param(curpage => $webvar{page});
 
 # select count(*) from (default_)?records where (group|domain)_id=?
@@ -134 +139 @@
 } elsif ($webvar{page} eq 'newdomain') {
 
-  # weesa gonna discard parent_group_id for now
-  my $sth = $dbh->prepare("select group_id,parent_group_id,name from groups order by group_id");
-  $sth->execute;
-  my @grplist;
-  while (my ($grpid,$pargrp,$grpname) = $sth->fetchrow_array()) {
-    my %row;
-    $row{grpname} = $grpname;
-    $row{grpval} = $grpid;
-##fixme: need magic
-#    $row{defgrp} = '';
-    push @grplist, \%row;
-  }
-
-  $page->param(grplist => \@grplist);
 
 } elsif ($webvar{page} eq 'deldom') {
@@ -384 +375 @@
         "LEFT OUTER JOIN domains d ON d.group_id=g.group_id ".
         "GROUP BY g.group_id, g.group_name, g2.group_name ".
-        "ORDER BY g.group_name".($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage));
-
+        "ORDER BY g.group_id".($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage));
   $sth->execute;
+
   my $rownum = 0;
   while (my @data = $sth->fetchrow_array) {
@@ -401 +392 @@
   $page->param(grptable => \@grplist);
 
+  $page->param(curpage => $webvar{page});
+
 } elsif ($webvar{page} eq 'newgrp') {
-
+  # do.. uhh.. stuff.. if we have no webvar{action}
+  if ($webvar{action} && $webvar{action} eq 'add') {
+        # not gonna provide the 4th param: template-or-clone flag, just yet
+    my ($code,$msg) = addGroup($dbh, $webvar{newgroup}, $webvar{pargroup});
+    changepage(page => "grpman") if $code eq 'OK';
+    $page->param(add_failed => 1);
+    $page->param(errmsg => $msg);
+    $page->param(newgroup => $webvar{newgroup});
+  }
 }
 
@@ -415 +416 @@
   $page->param(grp => $group);
   $page->param(grpname => grpName($dbh,$group));
-  $page->param(curpage => $webvar{page});
+  fill_grplist();
 }
 
@@ -433 +434 @@
 print $footer->output;
 
+# as per the docs, Just In Case
+$session->flush();
 
 exit 0;
@@ -628 +631 @@
   $page->param(domtable => \@domlist);
 } # end listdomains()
+
+
+sub fill_grplist {
+  # 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;
+  while (my ($grpid,$pargrp,$grpname) = $sth->fetchrow_array()) {
+    my %row;
+    $row{grpname} = $grpname;
+    $row{grpval} = $grpid;
+##fixme: need magic
+#    $row{defgrp} = '';
+    $row{grpactive} = 1 if $grpid eq $curgroup;
+    push @grplist, \%row;
+  }
+
+  $page->param(grplist => \@grplist);
+
+}