Changeset 26206 for main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl
- Timestamp:
- 2012-09-18T18:10:37+12:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl
r25963 r26206 230 230 # Get the user account information from the usersDB database 231 231 my %users_db_data = (); 232 foreach my $users_db_entry (split(/-{70}/, $users_db_content)) { 233 if ($users_db_entry =~ m/\n?\[(.+)\]\n/) { 232 233 # a line dividing one user entry from another is made up of 70 hyphens for GS2 (37 hyphens for GS3) 234 my $horizontal_divider = ($gsdl_cgi->greenstone_version() == 2) ? q/-{70}/ : q/-{37}/; 235 foreach my $users_db_entry (split($horizontal_divider, $users_db_content)) { 236 if ($users_db_entry =~ m/\n?\[(.+)\]\n/ || $users_db_entry =~ m/\n?USERNAME = ([^\n]*)\n/) { # GS2 and GS3 formats 234 237 $users_db_data{$1} = $users_db_entry; 235 238 } … … 243 246 244 247 # Check password 245 my ($valid_user_password) = ($user_data =~ m/\<password\>(.*)/); 248 my $pwdLine = ($gsdl_cgi->greenstone_version() == 2) ? q/\<password\>(.*)/ : q/\n?PASSWORD = (.*)\n/; 249 my ($valid_user_password) = ($user_data =~ m/$pwdLine/); 246 250 if ($user_password ne $valid_user_password) { 247 251 $gsdl_cgi->generate_error("Authentication failed: incorrect password."); … … 249 253 250 254 # Check group 251 my ($user_groups) = ($user_data =~ m/\<groups\>(.*)/); 255 my $groupLine = ($gsdl_cgi->greenstone_version() == 2) ? q/\<groups\>(.*)/ : q/\n?GROUPS = (.*)\n/; 256 my ($user_groups) = ($user_data =~ m/$groupLine/); 252 257 253 258 if ($collection eq "") {
Note:
See TracChangeset
for help on using the changeset viewer.