Changeset 201

Timestamp:

12/13/11 18:05:19 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Add perpage to config load
Switch SOA defaults to only pick up digits in config. Could be

updated to parse eg 1h, 2w, 30m, etc

Add group-tree open/closed pointer images to MANIFEST
Add an explicit value for makeactive on the newdomain template

to plug up a minor error log leak

Location:

trunk

Files:

• DNSDB.pm (modified) (3 diffs)
• Makefile (modified) (1 diff)
• dns.cgi (modified) (1 diff)
• templates/newdomain.tmpl (modified) (1 diff)

trunk/DNSDB.pm

@@ -126 +126 @@
                 # Other miscellanea
                 log_failures    => 1,   # log all evarthing by default
+                perpage         => 15,
         );
 
@@ -208 +209 @@
       $def{contact}     = $1 if /^contact\s*=\s*([a-z0-9_.-]+)/i;
       $def{prins}       = $1 if /^prins\s*=\s*([a-z0-9_.-]+)/i;
-      $def{soattl}      = $1 if /^soattl\s*=\s*([a-z0-9_.-]+)/i;
-      $def{refresh}     = $1 if /^refresh\s*=\s*([a-z0-9_.-]+)/i;
-      $def{retry}       = $1 if /^retry\s*=\s*([a-z0-9_.-]+)/i;
-      $def{expire}      = $1 if /^expire\s*=\s*([a-z0-9_.-]+)/i;
-      $def{minttl}      = $1 if /^minttl\s*=\s*([a-z0-9_.-]+)/i;
-      $def{ttl}         = $1 if /^ttl\s*=\s*([a-z0-9_.-]+)/i;
+      $def{soattl}      = $1 if /^soattl\s*=\s*(\d+)/i;
+      $def{refresh}     = $1 if /^refresh\s*=\s*(\d+)/i;
+      $def{retry}       = $1 if /^retry\s*=\s*(\d+)/i;
+      $def{expire}      = $1 if /^expire\s*=\s*(\d+)/i;
+      $def{minttl}      = $1 if /^minttl\s*=\s*(\d+)/i;
+      $def{ttl}         = $1 if /^ttl\s*=\s*(\d+)/i;
       # Mail settings
       $config{mailhost}         = $1 if /^mailhost\s*=\s*([a-z0-9_.-]+)/i;
@@ -223 +224 @@
       # session - note this is fed directly to CGI::Session
       $config{timeout}  = $1 if /^[tT][iI][mM][eE][oO][uU][tT]\s*=\s*(\d+[smhdwMy]?)/;
-      # log failed actions
+      # misc
       $config{log_failures}     = $1 if /^log_failures\s*=\s*([a-z01]+)/i;
+      $config{perpage}          = $1 if /^perpage\s*=\s*(\d+)/i;
     }
     close CFG;

trunk/Makefile

@@ -35 +35 @@
         \
         images/trash2.png images/fwd.png images/ffwd.png images/frev.png \
-        images/rev.png images/DESC.png images/ASC.png \
+        images/rev.png images/DESC.png images/ASC.png images/tree_open.png images/tree_closed.png \
         \
         templates/adddomain.tmpl templates/addgroup.tmpl templates/addrec.tmpl templates/adduser.tmpl \

trunk/dns.cgi

@@ -156 +156 @@
 # pagination
 my $perpage = 15;
+$perpage = $config{perpage} if $config{perpage};
 my $offset = ($webvar{offset} ? $webvar{offset} : 0);
 

trunk/templates/newdomain.tmpl

@@ -11 +11 @@
 <input type="hidden" name="page" value="adddomain" />
 <input type="hidden" name="newdomain" value="yes" />
+<input type="hidden" name="makeactive" value="0" />
 
 <table class="container" width="450">