Changeset 25 for trunk

Timestamp:

11/02/09 16:40:07 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint

• pass all entered data through to addUser()
• copy-munge "delete user" segment
• fill out missing addUser internals
• fill out delUser stub
• add userFullName
• misc tweaks and normalizations

Location:

trunk

Files:

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

trunk/DNSDB.pm

@@ -26 +26 @@
         &addDomain &delDomain &domainName
         &addGroup &delGroup &getChildren &groupName
-        &addUser &delUser
+        &addUser &delUser &userFullName
         &getSOA &getRecLine &getDomRecs
         &addRec &updateRec &delRec
@@ -38 +38 @@
                 &addDomain &delDomain &domainName
                 &addGroup &delGroup &getChildren &groupName
-                &addUser &delUser
+                &addUser &delUser &userFullName
                 &getSOA &getRecLine &getDomRecs
                 &addRec &updateRec &delRec
@@ -442 +442 @@
   my $pass = shift;
   return ('FAIL',"Missing password") if !defined($pass);
-
   my $state = shift;
   return ('FAIL',"Need account status") if !defined($state);
-  my $fname = shift || '';
+
+  my $type = shift || 'u';      # create limited users by default - fwiw, not sure yet how this will interact with ACLs
+  
+  my $fname = shift || $username;
   my $lname = shift || '';
+  my $phone = shift || '';      # not going format-check
 
   my $user_id;
@@ -458 +461 @@
   eval {
     # insert the user...
-    my $sth = $dbh->prepare("INSERT INTO users (email,group_id,password,status) VALUES (?,?,?,?)");
-    $sth->execute($username,$group,$pass,$state);
-die "user fail\n";
+    my $sth = $dbh->prepare("INSERT INTO users (group_id,username,password,firstname,lastname,phone,type,status) ".
+        "VALUES (?,?,?,?,?,?,?,?)");
+    $sth->execute($group,$username,$pass,$fname,$lname,$phone,$type,$state);
 
     # get the ID...
@@ -466 +469 @@
     $sth->execute($username);
     ($user_id) = $sth->fetchrow_array();
+
+##fixme: add another table to hold name/email for log table?
 
     # once we get here, we should have suceeded.
@@ -484 +489 @@
 #
 sub delUser {
+  my $dbh = shift;
+  return ('FAIL',"Need database handle") if !$dbh;
+  my $userid = shift;
+  return ('FAIL',"Missing userid") if !defined($userid);
+
+  my $sth = $dbh->prepare("delete from users where user_id=?");
+  $sth->execute($userid);
+
+  return ('FAIL',"Couldn't remove user: ".$sth->errstr) if $sth->err;
+
+  return ('OK','OK');
+
 } # end delUser
+
+
+## DNSDB::userFullName()
+# Return a pretty string!
+# Takes a user_id and optional printf-ish string to indicate which pieces where:
+# %u for the username
+# %f for the first name
+# %l for the last name
+# All other text in the passed string will be left as-is.
+##fixme:  need a "smart" option too, so that missing/null/blank first/last names don't give funky output
+sub userFullName {
+  $errstr = '';
+  my $dbh = shift;
+  my $userid = shift;
+  my $fullformat = shift || '%f %l (%u)';
+  my $sth = $dbh->prepare("select username,firstname,lastname from users where user_id=?");
+  $sth->execute($userid);
+  my ($uname,$fname,$lname) = $sth->fetchrow_array();
+  $errstr = $DBI::errstr if !$uname;
+
+  $fullformat =~ s/\%u/$uname/g;
+  $fullformat =~ s/\%f/$fname/g;
+  $fullformat =~ s/\%l/$lname/g;
+
+  return $fullformat;
+} # end userFullName
 
 

trunk/dns.cgi

@@ -445 +445 @@
   } else {
     ($code,$msg) = addUser($dbh,$webvar{username}, $webvar{group}, $webvar{pass1},
-        ($webvar{makeactive} eq 'on' ? 1 : 0), $webvar{fname}, $webvar{lname});
+        ($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') {
-# redirect to dns.cgi?etc&page=reclist
     changepage(page => "useradmin");
-#    $page = HTML::Template->new(filename => "$templatedir/reclist.tmpl");
-#    showdomain(0,$msg);
-##work
   } else {
 # oooh, yeah, this is supposed to be a redirect.  er, maybe.  whee.
@@ -469 +466 @@
 
   $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') {
+    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 domain list, do not pass "GO"
+      changepage(page => "useradmin");
+    }
+  } else {
+    # cancelled.  whee!
+    changepage(page => "useradmin");
+  }
+
 }
 
@@ -821 +842 @@
 
   my @userlist;
-  $sth = $dbh->prepare("SELECT u.user_id, u.email, u.firstname, u.lastname, u.type, g.group_name, u.status ".
+  $sth = $dbh->prepare("SELECT u.user_id, u.username, u.firstname, u.lastname, u.type, g.group_name, u.status ".
         "FROM users u ".
         "INNER JOIN groups g ON u.group_id=g.group_id ".

trunk/templates/useradmin.tmpl

@@ -29 +29 @@
         <td class="underline" align="center" nowrap><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=domlist&offset=<TMPL_VAR NAME=offset>">Group<TMPL_IF NAME=sortuser>&nbsp;<img border=0 alt='<TMPL_VAR NAME=sortorder>' src="images/<TMPL_VAR NAME=sortorder>.png"></TMPL_IF></a></td>
 <TMPL_ELSE>
-        <td class="underline" nowrap>User</td>
-        <td class="underline" nowrap>Name</td>
+        <td class="underline" nowrap>Username</td>
+        <td class="underline" nowrap>Full name</td>
         <td class="underline" nowrap>Type</td>
         <td class="underline" nowrap width="5%">Group</td>