[system] / trunk / webwork2 / lib / WeBWorK / DB / Auth.pm Repository:
ViewVC logotype

Diff of /trunk/webwork2/lib/WeBWorK/DB/Auth.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 349 Revision 350
38 38
39# ----- 39# -----
40 40
41sub getUsers($) { 41sub getUsers($) {
42 my $self = shift; 42 my $self = shift;
43 my @password_users, @permissions_users, @keys_users; 43 my %all_users;
44 if ($self->{password_db}->connect("ro")) { 44 if ($self->{password_db}->connect("ro")) {
45 @password_users = keys %{$self->{password_db}->hashRef}; 45 $all_users{$_}++ foreach keys %{$self->{password_db}->hashRef};
46 $self->{password_db}->disconnect; 46 $self->{password_db}->disconnect;
47 } 47 }
48 if ($self->{permissions_db}->connect("ro")) { 48 if ($self->{permissions_db}->connect("ro")) {
49 @permissions_users = keys %{$self->{permissions_db}->hashRef}; 49 $all_users{$_}++ foreach keys %{$self->{permissions_db}->hashRef};
50 $self->{permissions_db}->disconnect; 50 $self->{permissions_db}->disconnect;
51 } 51 }
52 if ($self->{keys_db}->connect("ro")) { 52 if ($self->{keys_db}->connect("ro")) {
53 @keys_users = keys %{$self->{keys_db}->hashRef}; 53 $all_users{$_}++ foreach keys %{$self->{keys_db}->hashRef};
54 $self->{keys_db}->disconnect; 54 $self->{keys_db}->disconnect;
55 }
56 my %all_users;
57 foreach (@password_users, @permissions_users, @keys_users) {
58 $all_users{$_}++;
59 } 55 }
60 return keys %all_users; 56 return keys %all_users;
61} 57}
62 58
63# ----- 59# -----

Legend:
Removed from v.349  
changed lines
  Added in v.350

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9