Changeset 88 for trunk

Timestamp:

04/01/11 18:01:14 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint, web UI miscellaneous cleanup

File:

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

trunk/dns.cgi

@@ -211 +211 @@
 
   $page->param(id => $webvar{id});
+
   # first pass = confirm y/n (sorta)
   if (!defined($webvar{del})) {
+
     $page->param(del_getconf => 1);
     $page->param(domain => domainName($dbh,$webvar{id}));
-# print some neato things?
-
-#  } else {
-#    #whether actually deleting or cancelling we redirect to the domain list, default format
 
   } elsif ($webvar{del} eq 'ok') {
+
     my $pargroup = parentID($webvar{id}, 'dom', 'group');
     my $dom = domainName($dbh, $webvar{id});
@@ -232 +231 @@
       changepage(page => "domlist");
     }
+
   } else {
     # cancelled.  whee!
@@ -245 +245 @@
   $page->param(curpage => $webvar{page});
 
-# select count(*) from (default_)?records where (group|domain)_id=?
-    my $sth = $dbh->prepare("SELECT count(*) FROM ".
+  my $sth = $dbh->prepare("SELECT count(*) FROM ".
         ($webvar{defrec} eq 'y' ? 'default_' : '')."records ".
         "WHERE ".($webvar{defrec} eq 'y' ? 'group' : 'domain')."_id=? ".
         "AND NOT type=$reverse_typemap{SOA}");
-    $sth->execute($webvar{id});
-    my ($count) = ($sth->fetchrow_array);
+  $sth->execute($webvar{id});
+  my ($count) = ($sth->fetchrow_array);
 
 #  $sortby = 'host';
@@ -402 +401 @@
   } else {
     $page->param(parentid => $webvar{parentid});
-#    $page->param(id => $webvar{id});
     $page->param(dohere => domainName($dbh,$webvar{parentid}));
   }
@@ -431 +429 @@
                 "Failed deleting record '$rec{host} $typemap{$rec{type}} $rec{val}', TTL $rec{ttl} ($msg)");
       }
-changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec}, del_failed => 1, errmsg => $msg);
+      changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec},
+                del_failed => 1, errmsg => $msg);
       $page->param(del_failed => 1);
       $page->param(errmsg => $msg);
@@ -493 +492 @@
   # do.. uhh.. stuff.. if we have no webvar{action}
   if ($webvar{action} && $webvar{action} eq 'add') {
-        # not gonna provide the 4th param: template-or-clone flag, just yet
     my %newperms;
     foreach (@permtypes) {
@@ -499 +497 @@
       $newperms{$_} = 1 if $webvar{$_} eq 'on';
     }
+    # not gonna provide the 4th param: template-or-clone flag, just yet
     my ($code,$msg) = addGroup($dbh, $webvar{newgroup}, $webvar{pargroup}, \%newperms);
     if ($code eq 'OK') {
@@ -511 +510 @@
     fill_grouplist('pargroup',$webvar{pargroup});
   } else {
-#    $page->param
     fill_grouplist('pargroup',$curgroup);
-  # fill default permissions with immediate parent's current ones
+    # fill default permissions with immediate parent's current ones
     my %parperms;
     getPermissions($dbh, 'group', $curgroup, \%parperms);
@@ -540 +538 @@
       $page->param(curpage => $webvar{page});
       listgroups();
+##fixme: log
     } else {
 ##fixme: need to clean up log when deleting a major container
@@ -603 +602 @@
 
   $page->param(is_admin => $permissions{admin});
+
+  $webvar{action} = '' if !$webvar{action};
 
   if ($webvar{action} eq 'add' or $webvar{action} eq 'update') {
@@ -676 +677 @@
     if ($code eq 'OK') {
 
+##fixme:  log doesn't log.  WTF?  O_o
       logaction(0, $session->param("username"), $webvar{group},
-        ($webvar{action} eq 'add' ? 'Added' : 'Updated')." user $webvar{uname} ($webvar{fname} $webvar{lname})");
+        ($webvar{action} eq 'add' ? 'Added' : 'Updated')." uid $webvar{uid}, user $webvar{uname} ($webvar{fname} $webvar{lname})");
       if ($alterperms) {
         changepage(page => "useradmin", warnmsg =>
@@ -707 +709 @@
       fill_actypelist($webvar{accttype});
       fill_clonemelist();
+##fixme: log
     }
 
@@ -760 +763 @@
   $page->param(grpperms => $grppermlist->output);
 
-} elsif ($webvar{page} eq 'adduser') {
-
-  my ($code,$msg);
-  
-  if ($webvar{pass1} ne $webvar{pass2}) {
-    $code = 'FAIL';
-    $msg = "Passwords don't match";
-  } else {
-# assemble a permission string - far simpler than trying to pass an
-# indeterminate set of permission flags individually
-my $permstring;
-if ($webvar{perms_type} eq 'custom') {
-  $permstring = 'C:,g:,u:,d:,r:';
-  $page->param(perm_custom => 1);
-} elsif ($webvar{perms_type} eq 'clone') {
-  $permstring = 'c:';
-  $page->param(perm_clone => 1);
-} else {
-  $permstring = 'i';
-#  $page->param(perm_inherit => 1);
-}
-    ($code,$msg) = addUser($dbh,$webvar{uname}, $webvar{group}, $webvar{pass1},
-        ($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{accttype}, 
-        $webvar{fname}, $webvar{lname}, $webvar{phone});
-  }
-
-# hokay, a bit of magic to decide which page we hit.
-  if ($code eq 'OK') {
-##log
-    logaction(0, $session->param("username"), $webvar{group},
-        "Added user $webvar{uname} ($webvar{fname} $webvar{lname})");
-    changepage(page => "useradmin");
-  } else {
-# oddity - apparently, xhtml 1.0 strict swallows username as an HTML::Template var.  O_o
-    $page->param(add_failed => 1);
-    $page->param(uname => $webvar{uname});
-    $page->param(fname => $webvar{fname});
-    $page->param(lname => $webvar{lname});
-    $page->param(pass1 => $webvar{pass1});
-    $page->param(pass2 => $webvar{pass2});
-    $page->param(errmsg => $msg);
-    fill_actypelist($webvar{accttype});
-    fill_clonemelist();
-  }
-
-#  $page->param(add_failed => 1);
-
-} elsif ($webvar{page} eq 'deluser') {
-
-  $page->param(id => $webvar{id});
-  # first pass = confirm y/n (sorta)
-  if (!defined($webvar{del})) {
-    $page->param(del_getconf => 1);
-    $page->param(user => userFullName($dbh,$webvar{id}));
-  } elsif ($webvar{del} eq 'ok') {
-##fixme: find group id user is in (for logging) *before* we delete the user
-    my ($code,$msg) = delUser($dbh, $webvar{id});
-    if ($code ne 'OK') {
-# need to find failure mode
-      $page->param(del_failed => 1);
-      $page->param(errmsg => $msg);
-      list_users($curgroup);
-    } else {
-      # success.  go back to the user list, do not pass "GO"
-##log
-      logaction(0, $session->param("username"), $webvar{group}, "Added domain $webvar{domain}");
-      changepage(page => "useradmin");
-    }
-  } else {
-    # cancelled.  whee!
-    changepage(page => "useradmin");
-  }
-
-} elsif ($webvar{page} eq 'edituser') {
+#} elsif ($webvar{page} eq 'adduser') {
+#
+#  my ($code,$msg);
+#  
+#  if ($webvar{pass1} ne $webvar{pass2}) {
+#    $code = 'FAIL';
+#    $msg = "Passwords don't match";
+#  } else {
+## assemble a permission string - far simpler than trying to pass an
+## indeterminate set of permission flags individually
+#my $permstring;
+#if ($webvar{perms_type} eq 'custom') {
+#  $permstring = 'C:,g:,u:,d:,r:';
+#  $page->param(perm_custom => 1);
+#} elsif ($webvar{perms_type} eq 'clone') {
+#  $permstring = 'c:';
+#  $page->param(perm_clone => 1);
+#} else {
+#  $permstring = 'i';
+##  $page->param(perm_inherit => 1);
+#}
+#    ($code,$msg) = addUser($dbh,$webvar{uname}, $webvar{group}, $webvar{pass1},
+#       ($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{accttype}, 
+#       $webvar{fname}, $webvar{lname}, $webvar{phone});
+#  }
+#
+## hokay, a bit of magic to decide which page we hit.
+#  if ($code eq 'OK') {
+###log
+#    logaction(0, $session->param("username"), $webvar{group},
+#       "Added user $webvar{uname} ($webvar{fname} $webvar{lname})");
+#    changepage(page => "useradmin");
+#  } else {
+## oddity - apparently, xhtml 1.0 strict swallows username as an HTML::Template var.  O_o
+#    $page->param(add_failed => 1);
+#    $page->param(uname => $webvar{uname});
+#    $page->param(fname => $webvar{fname});
+#    $page->param(lname => $webvar{lname});
+#    $page->param(pass1 => $webvar{pass1});
+#    $page->param(pass2 => $webvar{pass2});
+#    $page->param(errmsg => $msg);
+#    fill_actypelist($webvar{accttype});
+#    fill_clonemelist();
+#  }
+#
+##  $page->param(add_failed => 1);
+#
+#} elsif ($webvar{page} eq 'deluser') {
+#
+#  $page->param(id => $webvar{id});
+#  # first pass = confirm y/n (sorta)
+#  if (!defined($webvar{del})) {
+#    $page->param(del_getconf => 1);
+#    $page->param(user => userFullName($dbh,$webvar{id}));
+#  } elsif ($webvar{del} eq 'ok') {
+###fixme: find group id user is in (for logging) *before* we delete the user
+#    my ($code,$msg) = delUser($dbh, $webvar{id});
+#    if ($code ne 'OK') {
+## need to find failure mode
+#      $page->param(del_failed => 1);
+#      $page->param(errmsg => $msg);
+#      list_users($curgroup);
+#    } else {
+#      # success.  go back to the user list, do not pass "GO"
+###log
+#      logaction(0, $session->param("username"), $webvar{group}, "Added domain $webvar{domain}");
+#      changepage(page => "useradmin");
+#    }
+#  } else {
+#    # cancelled.  whee!
+#    changepage(page => "useradmin");
+#  }
+#
+#} elsif ($webvar{page} eq 'edituser') {
 
 } elsif ($webvar{page} eq 'dnsq') {
@@ -925 +928 @@
       my ($code,$msg) = importAXFR($dbh, $webvar{ifrom}, $domain, $webvar{group},
         $webvar{domstatus}, $webvar{rwsoa}, $webvar{rwns});
+##fixme: log
       $row{domok} = $msg if $code eq 'OK';
       if ($code eq 'WARN') {