Changeset 238 for trunk/dns.cgi

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.

File:

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

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';
 }