Changeset 406

Timestamp:

10/05/12 12:44:13 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix the fix for the fixed initRPC(). Usernames should be stored
with the RPC system string to make sure they don't collide with
"normal" users. Also check the right variable to see if we retrieved
an existing user record or not. See #33.
Fix groupID() to actually work; apparently it's not used in the
main UI or this would have been fixed a long time ago.

File:

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

trunk/DNSDB.pm

@@ -1419 +1419 @@
   return if !$args{fullname};
 
-  my $tmpuser = $dbh->selectrow_hashref("SELECT user_id AS userid,group_id,firstname,lastname,status".
+  $args{username} = "$args{username}/$args{rpcsys}";
+
+  my $tmpuser = $dbh->selectrow_hashref("SELECT username,user_id AS userid,group_id,firstname,lastname,status".
         " FROM users WHERE username=?", undef, ($args{username}) );
-  if (!%userdata) {
+  if (!$tmpuser) {
     $dbh->do("INSERT INTO users (username,password,firstname,type) VALUES (?,'RPC',?,'R')", undef,
         ($args{username}, $args{fullname}) );
-    $tmpuser = $dbh->selectrow_hashref("SELECT user_id AS userid,group_id,firstname,lastname,status".
+    $tmpuser = $dbh->selectrow_hashref("SELECT username,user_id AS userid,group_id,firstname,lastname,status".
         " FROM users WHERE username=?", undef, ($args{username}) );
   }
   %userdata = %{$tmpuser};
   $userdata{fullname} = "$userdata{firstname} $userdata{lastname} ($args{rpcsys})";
-  $userdata{username} = "$args{username}/$args{rpcsys}";
-  return 1 if %userdata;
+  return 1 if $tmpuser;
 } # end initRPC()
 
@@ -2557 +2558 @@
   my $dbh = shift;
   my $group = shift;
-  my ($grpid) = $dbh->selectrow_array("SELECT group_id FROM groups WHERE group=?", undef, ($group) );
+  my ($grpid) = $dbh->selectrow_array("SELECT group_id FROM groups WHERE group_name=?", undef, ($group) );
   $errstr = $DBI::errstr if !$grpid;
   return $grpid if $grpid;