Changeset 38 for trunk/dns.cgi

Timestamp:

11/20/09 17:32:04 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint - big changes!

dns.cgi and DNSDB.pm:

• all output pages should validate as XHTML 1.0 Strict. For at least another five minutes.
• add variable to control env dump (which doesn't validate...)
• fiddle username add to use "uname" as username field, since username seems to cause HTML::Template to barf suddenly... O_o
• tweak "change current group" form URI for XHTML's idiotic "all ampersands must be exscapededed ALL EVARWERE!!!one11!"
• check for existence of group, domain, user at beginning of respective add* subs in DNSDB.pm

templates/*:

• adjust all templates to account for oddities and stupidities of XHTML 1.0. Templates do NOT validate on their own, but the final output should. WTFisms include (but are not limited to):
  • escaped ampersands in links?
  • "<form> can't go here"?
  • <td> can't use nowrap, width?
  • "<fieldset>"?
  • and now that the form fields are enclosed in a fieldset... apparently you can't right-click in "noncontent" space "inside" that element. GRRRRRRR!!!!!
• CSS now needs work to make things appear properly, due largely to the WTFisms above
• all this XHTML fixing got me to also normalize and clean up inconsistent usage, general structures, and things that wouldn't even pass HTML 4.0.1 Transitional (I think) - eg missing closing tags on <tr> or <td>
• delete raw dump of Vega's login page (need to delete a couple others)

File:

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

trunk/dns.cgi

@@ -25 +25 @@
 
 my @debugbits;  # temp, to be spit out near the end of processing
+my $debugenv = 0;
 
 # Let's do these templates right...
@@ -68 +69 @@
 
 # default
-my $perpage = 15;
-#my $perpage = 3;
+#my $perpage = 15;
+my $perpage = 3;
 my $offset = ($webvar{offset} ? $webvar{offset} : 0);
 
@@ -481 +482 @@
     $msg = "Passwords don't match";
   } else {
-    ($code,$msg) = addUser($dbh,$webvar{username}, $webvar{group}, $webvar{pass1},
+    ($code,$msg) = addUser($dbh,$webvar{uname}, $webvar{group}, $webvar{pass1},
         ($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{accttype}, 
         $webvar{fname}, $webvar{lname}, $webvar{phone});
@@ -490 +491 @@
     changepage(page => "useradmin");
   } else {
-# oooh, yeah, this is supposed to be a redirect.  er, maybe.  whee.
-#    $page = HTML::Template->new(filename => "$templatedir/newuser.tmpl");
+# oddity - apparently, xhtml 1.0 strict swallows username as an HTML::Template var.  O_o
     $page->param(add_failed => 1);
-    $page->param(username => $webvar{username});
+    $page->param(uname => $webvar{uname});
     $page->param(fname => $webvar{fname});
     $page->param(lname => $webvar{lname});
@@ -502 +502 @@
   }
 
-  $page->param(add_failed => 1);
+#  $page->param(add_failed => 1);
 
 } elsif ($webvar{page} eq 'deluser') {
@@ -654 +654 @@
   # stuff for menu group change.  nb: this is icky.
   fill_grouplist("grouplist");
-  $page->param(whereami => $ENV{REQUEST_URI});
+# @#$%@%@#% XHTML - & in a URL must be escaped.  >:(
+  my $tmp_ruri = $ENV{REQUEST_URI};
+  $tmp_ruri =~ s/\&([a-z])/\&amp\;$1/g;
+#  $page->param(whereami => $ENV{REQUEST_URI});
+  $page->param(whereami => $tmp_ruri);
 }
 
@@ -662 +666 @@
 print $page->output;
 
-print "<div id=debug>webvar keys: <pre>\n";
-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";
-foreach my $key (keys %ENV) {
-  print "key: $key\tval: $ENV{$key}\n";
-}
-print "</pre></div>\n";
+if ($debugenv) {
+  print "<div id=\"debug\">webvar keys: <pre>\n";
+  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";
+  foreach my $key (keys %ENV) {
+    print "key: $key\tval: $ENV{$key}\n";
+  }
+  print "</pre></div>\n";
+}
 
 print $footer->output;