Changeset 112

Timestamp:

08/02/11 18:54:07 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Mostly complete functionality of bulk group move

Location:

trunk

Files:

• DNSDB.pm (modified) (3 diffs)
• dns.cgi (modified) (6 diffs)
• templates/bulkdomain.tmpl (modified) (3 diffs)

trunk/DNSDB.pm

@@ -27 +27 @@
         &initGlobals
         &initPermissions &getPermissions &changePermissions &comparePermissions
+        &changeGroup
         &connectDB &finish
         &addDomain &delDomain &domainName &domainID
@@ -43 +44 @@
                 &initGlobals
                 &initPermissions &getPermissions &changePermissions &comparePermissions
+                &changeGroup
                 &connectDB &finish
                 &addDomain &delDomain &domainName &domainID
@@ -348 +350 @@
   return $retval;
 } # end comparePermissions()
+
+
+## DNSDB::changeGroup()
+# Change group ID of an entity
+# Takes a database handle, entity type, entity ID, and new group ID
+sub changeGroup {
+  my $dbh = shift;
+  my $type = shift;
+  my $id = shift;
+  my $newgrp = shift;
+
+##fixme:  fail on not enough args
+  #return ('FAIL', "Missing 
+
+  if ($type eq 'domain') {
+    $dbh->do("UPDATE domains SET group_id=? WHERE domain_id=?", undef, ($newgrp, $id))
+        or return ('FAIL','Group change failed: '.$dbh->errstr);
+  } elsif ($type eq 'user') {
+    $dbh->do("UPDATE users SET group_id=? WHERE user_id=?", undef, ($newgrp, $id))
+        or return ('FAIL','Group change failed: '.$dbh->errstr);
+  } elsif ($type eq 'group') {
+    $dbh->do("UPDATE groups SET parent_group_id=? WHERE group_id=?", undef, ($newgrp, $id))
+        or return ('FAIL','Group change failed: '.$dbh->errstr);
+  }
+  return ('OK','OK');
+} # end changeGroup()
 
 

trunk/dns.cgi

@@ -37 +37 @@
 
 my @debugbits;  # temp, to be spit out near the end of processing
-my $debugenv = 0;
+my $debugenv = 1;
 
 # Let's do these templates right...
@@ -108 +108 @@
 my $sortorder = "ASC";
 
-my ($dbh,$msg) = connectDB("dnsdb","dnsdb","secret","newdbhost");
+#my ($dbh,$msg) = connectDB("dnsdb","dnsdb","secret","newdbhost");
+# dbname, user, pass, host (optional)
+my ($dbh,$msg) = connectDB("dnsdb", "dnsdb", "secret", "dnsdbhost");
 #my $dbh = DBI->connect("DBI:mysql:database=vegadns","vegadns","secret",
 #       { AutoCommit => 0 }) or die $DBI::errstr;
@@ -587 +589 @@
     if ($code ne 'OK') {
 # need to find failure mode
+      logaction(0, $session->param("username"), $webvar{curgroup}, "Failure deleting group $deleteme: $msg");
       changepage(page => "grpman", del_failed => 1, errmsg => $msg);
-##fixme: log
     } else {
 ##fixme: need to clean up log when deleting a major container
@@ -642 +644 @@
 
 ##fixme: un-hardcode the limit?
-  $perpage = 50;
+#  $perpage = 50;
 
   my $sth = $dbh->prepare("SELECT count(*) FROM domains WHERE group_id=?");
@@ -651 +653 @@
   fill_pgcount($count,'domains',groupName($dbh,$curgroup));
   fill_fpnla($count);
+  $page->param(offset => $offset);      # since apparently this isn't set explicitly elsewhere.  Who knew?
+  $page->param(perpage => $perpage);
 
   my @domlist;
@@ -669 +673 @@
   }
   $page->param(domtable => \@domlist);
-# ACLs
+  # ACLs
   $page->param(maymove => ($permissions{admin} || ($permissions{domain_edit} && $permissions{domain_create} && $permissions{domain_delete})));
   $page->param(maystatus => $permissions{admin} || $permissions{domain_edit});
   $page->param(maydelete => $permissions{admin} || $permissions{domain_delete});
 
-##fixme:  need to clean up status indicator/usage/inversion
+} elsif ($webvar{page} eq 'bulkchange') {
+
+  if ($webvar{action} eq 'move') {
+    changepage(page => "domlist", errmsg => "You are not permitted to bulk-move domains")
+        unless ($permissions{admin} || ($permissions{domain_edit} && $permissions{domain_create} && $permissions{domain_delete}));
+$page->param(action => $webvar{action});
+my $tmpstr = 'tmpstr: ';
+my @bulkresults;
+# nngh.  due to alpha-sorting on the previous page, we can't use domid-numeric
+# order here, and since we don't have the domain names until we go around this
+# loop, we can't alpha-sort them here.  :(
+foreach (keys %webvar) {
+  my %row;
+  next unless $_ =~ /^dom_\d+$/;
+  $row{domain} = domainName($dbh,$webvar{$_});
+  my ($code, $msg) = changeGroup($dbh, 'domain', $webvar{$_}, $webvar{destgroup});
+  $row{domok} = ($code eq 'OK');
+  $row{domerr} = $msg;
+  push @bulkresults, \%row;
+}
+$page->param(bulkresults => \@bulkresults);
+
+  } elsif ($webvar{action} eq 'deactivate') {
+    changepage(page => "domlist", errmsg => "You are not permitted to bulk-deactivate domains")
+        unless ($permissions{admin} || $permissions{domain_edit});
+  } elsif ($webvar{action} eq 'activate') {
+    changepage(page => "domlist", errmsg => "You are not permitted to bulk-activate domains")
+        unless ($permissions{admin} || $permissions{domain_edit});
+  } elsif ($webvar{action} eq 'delete') {
+    changepage(page => "domlist", errmsg => "You are not permitted to bulk-delete domains")
+        unless ($permissions{admin} || $permissions{domain_delete});
+  }
+  # not going to handle the unknown $webvar{action} else;  it should not be possible in normal
+  # operations, and anyone who meddles with the URL gets what they deserve.
 
 } elsif ($webvar{page} eq 'useradmin') {

trunk/templates/bulkdomain.tmpl

@@ -9 +9 @@
 
 <input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>" />
-<input type="hidden" name="page" value="bulkdomain" />
+<input type="hidden" name="page" value="bulkchange" />
+<input type="hidden" name="offset" value="<TMPL_VAR NAME=offset>" />
+<input type="hidden" name="perpage" value="<TMPL_VAR NAME=perpage>" />
 
 <table class="container">
 <tr><td>
     <table border="0" cellspacing="2" cellpadding="2" width="100%">
-<TMPL_IF add_failed>    <tr><td class="errhead" colspan="2">Error adding domain <TMPL_VAR NAME=domain>: <TMPL_VAR NAME=errmsg></td></tr></TMPL_IF>
         <tr class="darkrowheader"><td colspan="2" align="center">Bulk Domain Changes</td></tr>
 
@@ -20 +21 @@
                 <td>Action:</td>
                 <td align="left">
-<TMPL_IF maymove><input type="radio" name="action" value="move" /> Move to group: <select name="group">
+<TMPL_IF maymove>               <input type="radio" name="action" value="move" checked="checked" /> Move to group: <select name="destgroup">
 <TMPL_LOOP name=grouplist>              <option value="<TMPL_VAR NAME=groupval>"<TMPL_IF groupactive> selected="selected"</TMPL_IF>><TMPL_VAR name=groupname></option>
 </TMPL_LOOP>
                 </select><br /></TMPL_IF>
-<TMPL_IF maystatus><input type="radio" name="action" value="deactivate" /> Deactivate<br />
-<input type="radio" name="action" value="activate" /> Activate<br /></TMPL_IF>
-<TMPL_IF maydelete><input type="radio" name="action" value="delete" /> Delete<br /></TMPL_IF>
-</td>
+<TMPL_IF maystatus>             <input type="radio" name="action" value="deactivate" /> Deactivate<br />
+                <input type="radio" name="action" value="activate" /> Activate<br /></TMPL_IF>
+<TMPL_IF maydelete>             <input type="radio" name="action" value="delete" /> Delete<br /></TMPL_IF>
+                </td>
         </tr>
         <tr class="darkrowheader">
@@ -46 +47 @@
 </table>
                 </td>
-        </tr>
+</td>
+</tr>
+<tr class="darkrowheader"><td colspan="2" align="center"><input type="submit" value="Make changes" /></td></tr>
     </table>
     </td>