Changeset 310 for trunk

Timestamp:

04/18/12 17:30:41 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Minor code review in dns.cgi

• remove some stale commented code
• clean up a minor ##fixme by keeping state on "Make domain active?" and target group for a new domain

Location:

trunk

Files:

• dns.cgi (modified) (5 diffs)
• templates/newdomain.tmpl (modified) (1 diff)

trunk/dns.cgi

@@ -228 +228 @@
     # Snag ACL/permissions here too
 
-#    my $sth = $dbh->prepare("SELECT user_id,group_id,password,firstname,lastname FROM users WHERE username=?");
-#    $sth->execute($webvar{username});
-#
-#    if (my ($uid,$gid,$pass,$fname,$lname) = $sth->fetchrow_array) {
-#      $webvar{password} = '' if !$webvar{password};
-#
-#      if ($pass =~ m|^\$1\$([A-Za-z0-9/.]+)\$|) {
-#        # native passwords (crypt-md5)
-#        $webvar{loginfailed} = 1 if $pass ne unix_md5_crypt($webvar{password},$1);
-#      } elsif ($pass =~ /^[0-9a-f]{32}$/) {
-#        # VegaDNS import (hex-coded MD5)
-#        $webvar{loginfailed} = 1 if $pass ne md5_hex($webvar{password});
-#      } else {
-#        # plaintext (convenient now and then)
-#        $webvar{loginfailed} = 1 if $pass ne $webvar{password};
-#      }
-
     my $userdata = login($dbh, $webvar{username}, $webvar{password});
 
@@ -313 +296 @@
   $page->param(loginfailed => 1) if $webvar{loginfailed};
   $page->param(sessexpired => 1) if $webvar{sessexpired};
-#  $page->param(orgname => $config{orgname}) if $config{orgname} ne 'Example Corp';
   $page->param(version => $DNSDB::VERSION);
 
@@ -355 +337 @@
         unless ($permissions{admin} || $permissions{domain_create});
 
-  fill_grouplist("grouplist");
+  $webvar{group} = $curgroup if !$webvar{group};
+  fill_grouplist("grouplist", $webvar{group});
 
   if ($session->param('add_failed')) {
@@ -363 +346 @@
     $session->clear('errmsg');
     $page->param(domain => $webvar{domain});
+    $page->param(addinactive => $webvar{makeactive} eq 'n');
   }
 
@@ -391 +375 @@
     $session->param('add_failed', 1);
 ##fixme:  domain a security risk for XSS?
-##fixme:  keep active/inactive state, group selection
-    changepage(page => "newdomain", domain => $webvar{domain}, errmsg => $msg);
+    changepage(page => "newdomain", domain => $webvar{domain}, errmsg => $msg,
+        makeactive => ($webvar{makeactive} ? 'y' : 'n'), group => $webvar{group});
   }
 

trunk/templates/newdomain.tmpl

@@ -30 +30 @@
         </tr>
         <tr class="datalinelight">
-                <td>Make domain active on next DNS propagation</td><td><input type="checkbox" name="makeactive" checked="checked" /></td>
+                <td>Make domain active on next DNS propagation</td><td><input type="checkbox" name="makeactive"<TMPL_UNLESS addinactive> checked="checked"</TMPL_UNLESS> /></td>
         </tr>
         <tr><td colspan="2" class="tblsubmit"><input type="submit" value="Add domain" /></td></tr>