Changeset 238

Timestamp:

02/22/12 18:03:41 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Clean up some little annoyances:

• set reverse zone default sort field in the session same as for domains, users, etc
• handle regular-page template failures more gracefully by showing the parse error if the template exists, and fall back to the previous informationless "Bad page! no cookie!" if the template doesn't exist.

Location:

trunk

Files:

• dns.cgi (modified) (2 diffs)
• templates/badpage.tmpl (modified) (2 diffs)
• templates/menu.tmpl (modified) (1 diff)

trunk/dns.cgi

@@ -78 +78 @@
   $session->param('domlistsortby','domain');
   $session->param('domlistorder','ASC');
+  $session->param('revzonessortby','revnet');
+  $session->param('revzonesorder','ASC');
   $session->param('useradminsortby','user');
   $session->param('useradminorder','ASC');
@@ -195 +197 @@
 my $page;
 eval {
-  $page = HTML::Template->new(filename => "$templatedir/$webvar{page}.tmpl");
+  # sigh.  can't set loop_context_vars or global_vars once instantiated.
+  $page = HTML::Template->new(filename => "$templatedir/$webvar{page}.tmpl",
+        loop_context_vars => 1, global_vars => 1);
 };
 if ($@) {
-  warn "Bad page $webvar{page} requested";
+  my $msg = $@;
   $page = HTML::Template->new(filename => "$templatedir/badpage.tmpl");
-  $page->param(badpage => $q->escapeHTML($webvar{page}));
+  if (-e "$templatedir/$webvar{page}.tmpl") {
+    $page->param(badtemplate => $q->escapeHTML($msg));
+  } else {
+    warn "Bad page $webvar{page} requested";
+    $page->param(badpage => $q->escapeHTML($webvar{page}));
+  }
   $webvar{page} = 'badpage';
 }

trunk/templates/badpage.tmpl

@@ -1 +1 @@
 <!-- <TMPL_VAR NAME=sid> -->
 <div id="badpage">
+<TMPL_IF badpage>
 Bad page requested:
 <div class="errmsg">
@@ -6 +7 @@
 </div>
 Press the 'Back' button on your browser to continue.
+</TMPL_IF>
+<TMPL_IF badtemplate>
+Template error:
+<div class="warnmsg">
+<TMPL_VAR NAME=badtemplate>
 </div>
+</TMPL_IF>
+</div>

trunk/templates/menu.tmpl

@@ -8 +8 @@
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=log">Log</a><br />
 <TMPL_IF maydefrec><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=reclist&amp;id=<TMPL_VAR NAME=group>&amp;defrec=y">Default Records</a><br />
-<TMPL_IF mayrdns><A href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=reclist&amp;id=<TMPL_VAR NAME=group>&amp;defrec=y&amp;revrec=y">Default Reverse Records</a><br /></TMPL_IF></TMPL_IF>
+<TMPL_IF mayrdns><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=reclist&amp;id=<TMPL_VAR NAME=group>&amp;defrec=y&amp;revrec=y">Default Reverse Records</a><br /></TMPL_IF></TMPL_IF>
 <TMPL_IF mayimport><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=axfr">AXFR Import</a><br /></TMPL_IF>
 <TMPL_IF maybulk><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=bulkdomain">Bulk Domain Operations</a><br /></TMPL_IF>