Mercurial > hg > soundsoftware-site
comparison extra/svn/Redmine.pm @ 1298:4f746d8966dd redmine_2.3_integration
Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author | Chris Cannam |
---|---|
date | Fri, 14 Jun 2013 09:28:30 +0100 |
parents | 622f24f53b42 |
children |
comparison
equal
deleted
inserted
replaced
1297:0a574315af3e | 1298:4f746d8966dd |
---|---|
386 ); | 386 ); |
387 | 387 |
388 $sth->execute($project_id); | 388 $sth->execute($project_id); |
389 my $ret = 0; | 389 my $ret = 0; |
390 if (my @row = $sth->fetchrow_array) { | 390 if (my @row = $sth->fetchrow_array) { |
391 if ($row[0] eq "1" || $row[0] eq "t") { | 391 if ($row[0] eq "1" || $row[0] eq "t") { |
392 $ret = 1; | 392 $ret = 1; |
393 } | 393 } |
394 } | 394 } |
395 $sth->finish(); | 395 $sth->finish(); |
396 undef $sth; | 396 undef $sth; |
397 $dbh->disconnect(); | 397 $dbh->disconnect(); |
398 undef $dbh; | 398 undef $dbh; |
465 if ($project_status eq "9" || ($project_status ne "1" && $access_mode eq "W")) { | 465 if ($project_status eq "9" || ($project_status ne "1" && $access_mode eq "W")) { |
466 last; | 466 last; |
467 } | 467 } |
468 | 468 |
469 unless ($auth_source_id) { | 469 unless ($auth_source_id) { |
470 my $method = $r->method; | 470 my $method = $r->method; |
471 my $salted_password = Digest::SHA::sha1_hex($salt.$pass_digest); | 471 my $salted_password = Digest::SHA::sha1_hex($salt.$pass_digest); |
472 if ($hashed_password eq $salted_password && (($access_mode eq "R" && $permissions =~ /:browse_repository/) || $permissions =~ /:commit_access/) ) { | 472 if ($hashed_password eq $salted_password && (($access_mode eq "R" && $permissions =~ /:browse_repository/) || $permissions =~ /:commit_access/) ) { |
473 $ret = 1; | 473 $ret = 1; |
474 last; | 474 last; |
475 } | 475 } |
476 } elsif ($CanUseLDAPAuth) { | 476 } elsif ($CanUseLDAPAuth) { |
477 my $sthldap = $dbh->prepare( | 477 my $sthldap = $dbh->prepare( |