Changeset 93 for trunk

Timestamp:

04/14/11 16:48:00 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Remove a couple of ##fixme notes
Log more info on user delete
Extend special-char replacement a little in WHOIS output
Comment a bit on some ##fixme's

File:

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

trunk/dns.cgi

@@ -664 +664 @@
                 $webvar{fname}, $webvar{lname}, $webvar{phone});
         if ($code eq 'OK') {
-##fixme - need to actually get a correct permission set to pass in here,
-# also a flag to revert custom permissions to inherited
           $newperms{admin} = 1 if $webvar{accttype} eq 'S';
           ($code,$msg) = changePermissions($dbh, 'user', $webvar{uid}, \%newperms, ($permstring eq 'i'));
@@ -817 +815 @@
 ##fixme: find group id user is in (for logging) *before* we delete the user
 ##fixme: get other user data too for log
+    my $userref = getUserData($dbh, $webvar{id});
     my ($code,$msg) = delUser($dbh, $webvar{id});
     if ($code ne 'OK') {
@@ -825 +824 @@
     } else {
       # success.  go back to the user list, do not pass "GO"
-##log
-      logaction(0, $session->param("username"), $curgroup, "Deleted user $webvar{id}");
+      # actions on users have a domain id of 0, always
+      logaction(0, $session->param("username"), $curgroup, "Deleted user $webvar{id}/".$userref->{username}.
+        " (".$userref->{lastname}.", ".$userref->{firstname}.")");
       changepage(page => "useradmin");
     }
@@ -961 +961 @@
     $Text::Wrap::columns = 88;
 
-# &%$@%@# high-bit crap.  We should probably find a way to properly recode these instead of one-by-one.
+# &%$@%@# high-bit crap.  We should probably find a way to properly recode these
+# instead of one-by-one.  Note CGI::Simple's escapeHTML() doesn't do more than
+# the bare minimum.  :/
 # Mainly an XHTML validation thing.
+    $dominfo = $q->escapeHTML($dominfo);
     $dominfo =~ s/\xa9/\©/g;
     $dominfo =~ s/\xae/\®/g;
@@ -1269 +1272 @@
 sub fill_fpnla {
   my $count = shift;
-##fixme
   if ($offset eq 'all') {
     $page->param(perpage => $perpage);
@@ -1331 +1333 @@
 
 # fill page count and first-previous-next-last-all bits
-##fixme - hardcoded group bit
   fill_pgcount($count,"domains",groupName($dbh,$curgroup));
   fill_fpnla($count);
@@ -1487 +1488 @@
     $row{groupval} = $groupid;
 ##fixme: need magic
+## ... WTF?
 #    $row{defgroup} = '';
     $row{groupactive} = 1 if $groupid == $cur;
@@ -1617 +1619 @@
   my $entry = shift;
 
-##fixme: ooohhh, nasty.  what if we get a failure *here*?    PTHBTT!
+##fixme: push SQL into DNSDB.pm
   my $sth = $dbh->prepare("SELECT user_id, firstname || ' ' || lastname FROM users WHERE username=?");
   $sth->execute($username);