Changeset 20 for trunk/dns.cgi

Timestamp:

10/15/09 13:23:51 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint, group mangling almost complete
also normalized *most* group* refs to use "group*" vs "grp*"

File:

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

trunk/dns.cgi

@@ -59 +59 @@
 }
 
+if ($webvar{action} && $webvar{action} eq 'chgroup') {
+  # fiddle session-stored group data
+  # magic incantation to... uhhh...
+  $session->param('curgroup', $webvar{group});
+  $curgroup = ($webvar{group} ? $webvar{group} : $session->param('curgroup'));
+}
+
 my $header = HTML::Template->new(filename => "$templatedir/header.tmpl");
 my $footer = HTML::Template->new(filename => "$templatedir/footer.tmpl");
@@ -132 +139 @@
   if ($webvar{defrec} eq 'y') {
 ##fixme: hardcoded group
-    showdomain('y',$group);
+    showdomain('y',$curgroup);
   } else {
     showdomain('n',$webvar{id});
@@ -236 +243 @@
 
   if ($webvar{defrec} eq 'y') {
-    $page->param(dohere => "default records in group ".grpName($dbh,$webvar{parentid}));
+    $page->param(dohere => "default records in group ".groupName($dbh,$webvar{parentid}));
   } else {
     $page->param(dohere => domainName($dbh,$webvar{parentid}));
@@ -339 +346 @@
 
 ##fixme:  Group should be variable
-  my ($code,$msg) = addDomain($dbh,$webvar{domain},1,($webvar{makeactive} eq 'on' ? 1 : 0));
+  my ($code,$msg) = addDomain($dbh,$webvar{domain},$webvar{group},($webvar{makeactive} eq 'on' ? 1 : 0));
 
 # hokay, a bit of magic to decide which page we hit.
@@ -367 +374 @@
   fill_fpnla($count);
 
-  my @grplist;
+  my @grouplist;
   $sth = $dbh->prepare("SELECT g.group_id, g.group_name, g2.group_name, ".
         "count(distinct(u.email)), count(distinct(d.domain)) ".
@@ -381 +388 @@
   while (my @data = $sth->fetchrow_array) {
     my %row;
-    $row{grpid} = $data[0];
-    $row{grpname} = $data[1];
-    $row{pgrp} = $data[2];
+    $row{groupid} = $data[0];
+    $row{groupname} = $data[1];
+    $row{pgroup} = $data[2];
     $row{nusers} = $data[3];
     $row{ndomains} = $data[4];
     $row{bg} = ($rownum++)%2;
     $row{sid} = $sid;
-    push @grplist, \%row;
-  }
-  $page->param(grptable => \@grplist);
+    push @grouplist, \%row;
+  }
+  $page->param(grouptable => \@grouplist);
 
   $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') {
@@ -403 +411 @@
     $page->param(errmsg => $msg);
     $page->param(newgroup => $webvar{newgroup});
-     fill_grplist('pargroup',$webvar{pargroup});
+     fill_grouplist('pargroup',$webvar{pargroup});
   } else {
 #    $page->param
-     fill_grplist('pargroup',$curgroup);
-
-  }
+     fill_grouplist('pargroup',$curgroup);
+
+  }
+
+} elsif ($webvar{page} eq 'delgroup') {
+
+  $page->param(id => $webvar{id});
+  # first pass = confirm y/n (sorta)
+  if (!defined($webvar{del})) {
+    $page->param(del_getconf => 1);
+    $page->param(groupname => groupName($dbh,$webvar{id}));
+# print some neato things?
+
+#  } else {
+#    #whether actually deleting or cancelling we redirect to the group list, default format
+
+  } elsif ($webvar{del} eq 'ok') {
+    my ($code,$msg) = delGroup($dbh, $webvar{id});
+    if ($code ne 'OK') {
+# need to find failure mode
+      $page->param(del_failed => 1);
+      $page->param(errmsg => $msg);
+    } else {
+      # success.  go back to the domain list, do not pass "GO"
+      changepage(page => "grpman");
+    }
+  } else {
+    # cancelled.  whee!
+    changepage(page => "grpman");
+  }
+
 }
 
@@ -417 +453 @@
 foreach (@debugbits) { print; }
 
-# common bits
+##common bits
 if ($webvar{page} ne 'login') {
-  $page->param(grp => $group);
-  $page->param(grpname => grpName($dbh,$group));
-  fill_grplist("grplist");
+  $page->param(group => $curgroup);
+  $page->param(groupname => groupName($dbh,$curgroup));
+
+  # stuff for menu group change.  nb: this is icky.
+  fill_grouplist("grouplist");
+  $page->param(whereami => $ENV{REQUEST_URI});
 }
 
@@ -430 +469 @@
 foreach my $key (keys %webvar) {
   print "key: $key\tval: $webvar{$key}\n";
+}
+print "</pre>\nsession:\n<pre>\n";
+my $sesdata = $session->dataref();
+foreach my $key (keys %$sesdata) {
+  print "key: $key\tval: ".$sesdata->{$key}."\n";
 }
 print "</pre>\nENV:\n<pre>\n";
@@ -604 +648 @@
 
   my $sth = $dbh->prepare("SELECT count(*) FROM domains WHERE group_id=?");
-  $sth->execute($group);
+  $sth->execute($curgroup);
   my ($count) = $sth->fetchrow_array;
 
 # fill page count and first-previous-next-last-all bits
 ##fixme - hardcoded group bit
-  fill_pgcount($count,"domains","default group");
+  fill_pgcount($count,"domains",groupName($dbh,$curgroup));
   fill_fpnla($count);
 
 ##fixme - group
-  $page->param(grp => 1);
+  $page->param(group => $curgroup);
   my @domlist;
-  $sth = $dbh->prepare("select domain_id,domain,status,groups.group_name from domains".
-        " inner join groups on domains.group_id=groups.group_id".
-        " order by domain".($offset eq 'all' ? '' : " limit $perpage offset ".$offset*$perpage));
-  $sth->execute;
+  $sth = $dbh->prepare("SELECT domain_id,domain,status,groups.group_name FROM domains".
+        " INNER JOIN groups ON domains.group_id=groups.group_id".
+        " WHERE domains.group_id=?".
+        " ORDER BY domain".($offset eq 'all' ? '' : " LIMIT $perpage OFFSET ".$offset*$perpage));
+  $sth->execute($curgroup);
   my $rownum = 0;
   while (my @data = $sth->fetchrow_array) {
@@ -638 +683 @@
 
 
-sub fill_grplist {
+sub fill_grouplist {
   my $template_var = shift;
   my $cur = shift || $curgroup;
@@ -644 +689 @@
   my $sth = $dbh->prepare("SELECT group_id,parent_group_id,group_name FROM groups ORDER BY group_id");
   $sth->execute;
-  my @grplist;
-  while (my ($grpid,$pargrp,$grpname) = $sth->fetchrow_array()) {
+  my @grouplist;
+  while (my ($groupid,$pargroup,$groupname) = $sth->fetchrow_array()) {
     my %row;
-    $row{grpname} = $grpname;
-    $row{grpval} = $grpid;
+    $row{groupname} = $groupname;
+    $row{groupval} = $groupid;
 ##fixme: need magic
-#    $row{defgrp} = '';
-    $row{grpactive} = 1 if $grpid == $cur;
-    push @grplist, \%row;
-  }
-
-  $page->param("$template_var" => \@grplist);
-
-}
+#    $row{defgroup} = '';
+    $row{groupactive} = 1 if $groupid == $cur;
+    push @grouplist, \%row;
+  }
+
+  $page->param("$template_var" => \@grouplist);
+
+}