Changeset 294 for trunk/DNSDB.pm

Timestamp:

03/29/12 13:22:59 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

"Move action logging for change group default permissions" mutated
into "Move action logging for (change group default permissions),
(add user), (update user), (update user permissions)". See #35.

File:

• trunk/DNSDB.pm (modified) (12 diffs)

trunk/DNSDB.pm

@@ -1115 +1115 @@
   my $inherit = shift || 0;
 
-  my $failmsg = '';
+  my $resultmsg = '';
 
   # see if we're switching from inherited to custom.  for bonus points,
@@ -1121 +1121 @@
   # to set/alter custom perms, and both if we're switching from custom to
   # inherited.
-  my $sth = $dbh->prepare("SELECT (u.permission_id=g.permission_id) AS was_inherited,u.permission_id,g.permission_id".
+  my $sth = $dbh->prepare("SELECT (u.permission_id=g.permission_id) AS was_inherited,u.permission_id,g.permission_id,".
+        ($type eq 'user' ? 'u.group_id,u.username' : 'u.parent_group_id,u.group_name').
         " FROM ".($type eq 'user' ? 'users' : 'groups')." u ".
         " JOIN groups g ON u.".($type eq 'user' ? '' : 'parent_')."group_id=g.group_id ".
@@ -1127 +1128 @@
   $sth->execute($id);
 
-  my ($wasinherited,$permid,$parpermid) = $sth->fetchrow_array;
+  my ($wasinherited,$permid,$parpermid,$parid,$name) = $sth->fetchrow_array;
 
 # hack phtoui
@@ -1168 +1169 @@
     } # (inherited->)? custom
 
+    if ($type eq 'user') {
+      $resultmsg = "Updated permissions for user $name";
+    } else {
+      $resultmsg = "Updated default permissions for group $name";
+    }
+    _log($dbh, (group_id => ($type eq 'user' ? $parid : $id), entry => $resultmsg));
     $dbh->commit;
   }; # end eval
@@ -1173 +1180 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    return ('FAIL',"$failmsg: $msg ($permid)");
-  } else {
-    return ('OK',$permid);
-  }
-
+    return ('FAIL',"Error changing permissions: $msg");
+  }
+
+  return ('OK',$resultmsg);
 } # end changePermissions()
 
@@ -2006 +2012 @@
   local $dbh->{RaiseError} = 1;
 
-  my $failmsg = '';
-
   # Wrap all the SQL in a transaction
   eval {
@@ -2059 +2063 @@
 ##fixme: add another table to hold name/email for log table?
 
+    _log($dbh, (group_id => $group, entry => "Added user $username ($fname $lname)"));
     # once we get here, we should have suceeded.
     $dbh->commit;
@@ -2066 +2071 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    return ('FAIL',$msg." $failmsg");
-  } else {
-    return ('OK',$user_id);
-  }
+    if ($config{log_failures}) {
+      _log($dbh, (group_id => $group, entry => "Error adding user $username: $msg"));
+      $dbh->commit;     # since we enabled transactions earlier
+    }
+    return ('FAIL',"Error adding user $username: $msg");
+  }
+
+  return ('OK',"User $username ($fname $lname) added");
 } # end addUser
 
@@ -2112 +2121 @@
   my $phone = shift || '';      # not going format-check
 
-  my $failmsg = '';
+  my $resultmsg = '';
 
   # Allow transactions, and raise an exception on errors so we can catch it later.
@@ -2124 +2133 @@
   # Actual blank passwords are bad, mm'kay?
   if (!$pass) {
-    $sth = $dbh->prepare("SELECT password FROM users WHERE user_id=?");
-    $sth->execute($uid);
-    ($pass) = $sth->fetchrow_array;
+    ($pass) = $dbh->selectrow_array("SELECT password FROM users WHERE user_id=?", undef, ($uid));
   } else {
     $pass = unix_md5_crypt($pass);
@@ -2132 +2139 @@
 
   eval {
-    my $sth = $dbh->prepare(q(
-        UPDATE users
-        SET username=?, password=?, firstname=?, lastname=?, phone=?, type=?, status=?
-        WHERE user_id=?
-        )
-      );
-    $sth->execute($username, $pass, $fname, $lname, $phone, $type, $state, $uid);
+    $dbh->do("UPDATE users SET username=?, password=?, firstname=?, lastname=?, phone=?, type=?, status=?".
+        " WHERE user_id=?", undef, ($username, $pass, $fname, $lname, $phone, $type, $state, $uid));
+    $resultmsg = "Updated user info for $username ($fname $lname)";
+    _log($dbh, group_id => $group, entry => $resultmsg);
     $dbh->commit;
   };
@@ -2144 +2148 @@
     my $msg = $@;
     eval { $dbh->rollback; };
-    return ('FAIL',"$failmsg: $msg");
-  } else {
-    return ('OK','OK');
-  }
+    if ($config{log_failures}) {
+      _log($dbh, (group_id => $group, entry => "Error updating user $username: $msg"));
+      $dbh->commit;     # since we enabled transactions earlier
+    }
+    return ('FAIL',"Error updating user $username: $msg");
+  }
+
+  return ('OK',$resultmsg);
 } # end updateUser()