Changeset 376 for trunk

Timestamp:

08/09/12 16:32:41 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Factor out another little code fragment: result, warning, and
error message output to templates.

File:

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

trunk/dns.cgi

@@ -331 +331 @@
   }
 
-  if ($session->param('resultmsg')) {
-    $page->param(resultmsg => $session->param('resultmsg'));
-    $session->clear('resultmsg');
-  }
-  if ($session->param('errmsg')) {
-    $page->param(errmsg => $session->param('errmsg'));
-    $session->clear('errmsg');
-  }
+  show_msgs();
 
   $page->param(curpage => $webvar{page});
@@ -442 +435 @@
   }
 
-  if ($session->param('resultmsg')) {
-    $page->param(resultmsg => $session->param('resultmsg'));
-    $session->clear('resultmsg');
-  }
-  if ($session->param('errmsg')) {
-    $page->param(errmsg => $session->param('errmsg'));
-    $session->clear('errmsg');
-  }
+  show_msgs();
 
   $page->param(curpage => $webvar{page});
@@ -604 +590 @@
     }
 
-    if ($session->param('resultmsg')) {
-      $page->param(resultmsg => $session->param('resultmsg'));
-      $session->clear('resultmsg');
-    }
-    if ($session->param('warnmsg')) {
-      $page->param(warnmsg => $session->param('warnmsg'));
-      $session->clear('warnmsg');
-    }
-    if ($session->param('errmsg')) {
-      $page->param(errmsg => $session->param('errmsg'));
-      $session->clear('errmsg');
-    }
+    show_msgs();
 
   } # close "you can't edit default records" check
@@ -849 +824 @@
   $page->param(delgrp => $permissions{admin} || $permissions{group_delete});
 
-  if ($session->param('resultmsg')) {
-    $page->param(resultmsg => $session->param('resultmsg'));
-    $session->clear('resultmsg');
-  }
-  if ($session->param('warnmsg')) {
-    $page->param(warnmsg => $session->param('warnmsg'));
-    $session->clear('warnmsg');
-  }
-  if ($session->param('errmsg')) {
-    $page->param(errmsg => $session->param('errmsg'));
-    $session->clear('errmsg');
-  }
+  show_msgs();
   $page->param(curpage => $webvar{page});
 
@@ -1120 +1084 @@
   $page->param(deluser => $permissions{admin} || $permissions{user_delete});
 
-  if ($session->param('resultmsg')) {
-    $page->param(resultmsg => $session->param('resultmsg'));
-    $session->clear('resultmsg');
-  }
-  if ($session->param('warnmsg')) {
-    $page->param(warnmsg => $session->param('warnmsg'));
-    $session->clear('warnmsg');
-  }
-  if ($session->param('errmsg')) {
-    $page->param(errmsg => $session->param('errmsg'));
-    $session->clear('errmsg');
-  }
+  show_msgs();
   $page->param(curpage => $webvar{page});
 
@@ -1352 +1305 @@
 #  }
   list_locations();
+  show_msgs();
 
 # Permissions!
@@ -1418 +1372 @@
     $page->param(locname => ($webvar{locname} ? $webvar{locname} : ''));
     $page->param(iplist => ($webvar{iplist} ? $webvar{iplist} : ''));
+
+    show_msgs();
   }
 
@@ -1775 +1731 @@
 } # end changepage
 
+# wrap up the usual suspects for result, warning, or error messages to be displayed
+sub show_msgs {
+  if ($session->param('resultmsg')) {
+    $page->param(resultmsg => $session->param('resultmsg'));
+    $session->clear('resultmsg');
+  }
+  if ($session->param('warnmsg')) {
+    $page->param(warnmsg => $session->param('warnmsg'));
+    $session->clear('warnmsg');
+  }
+  if ($session->param('errmsg')) {
+    $page->param(errmsg => $session->param('errmsg'));
+    $session->clear('errmsg');
+  }
+} # end show_msgs
+
 sub fillsoa {
   my $defrec = shift;