kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged r8015 from trunk

Browse Source 
remove trailing white-spaces except SQL from extra/svn/Redmine.pm.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8016 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-12-01 05:31:19 +00:00
parent 2813b93370
commit 18a30fd942
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
extra/svn/Redmine.pm
View File

@ -49,7 +49,7 @@ Authen::Simple::LDAP (and IO::Socket::SSL if LDAPS is used):
PerlAccessHandler Apache::Authn::Redmine::access_handler PerlAccessHandler Apache::Authn::Redmine::access_handler
PerlAuthenHandler Apache::Authn::Redmine::authen_handler PerlAuthenHandler Apache::Authn::Redmine::authen_handler
## for mysql ## for mysql
RedmineDSN "DBI:mysql:database=databasename;host=my.db.server" RedmineDSN "DBI:mysql:database=databasename;host=my.db.server"
## for postgres ## for postgres
@ -144,7 +144,7 @@ my @directives = (
}, },
); );
sub RedmineDSN { sub RedmineDSN {
my ($self, $parms, $arg) = @_; my ($self, $parms, $arg) = @_;
$self->{RedmineDSN} = $arg; $self->{RedmineDSN} = $arg;
my $query = "SELECT my $query = "SELECT
@ -164,12 +164,12 @@ sub RedmineDSN {
sub RedmineDbUser { set_val('RedmineDbUser', @_); } sub RedmineDbUser { set_val('RedmineDbUser', @_); }
sub RedmineDbPass { set_val('RedmineDbPass', @_); } sub RedmineDbPass { set_val('RedmineDbPass', @_); }
sub RedmineDbWhereClause { sub RedmineDbWhereClause {
my ($self, $parms, $arg) = @_; my ($self, $parms, $arg) = @_;
$self->{RedmineQuery} = trim($self->{RedmineQuery}.($arg ? $arg : "")." "); $self->{RedmineQuery} = trim($self->{RedmineQuery}.($arg ? $arg : "")." ");
} }
sub RedmineCacheCredsMax { sub RedmineCacheCredsMax {
my ($self, $parms, $arg) = @_; my ($self, $parms, $arg) = @_;
if ($arg) { if ($arg) {
$self->{RedmineCachePool} = APR::Pool->new; $self->{RedmineCachePool} = APR::Pool->new;
@ -216,10 +216,10 @@ sub access_handler {
sub authen_handler { sub authen_handler {
my $r = shift; my $r = shift;
my ($res, $redmine_pass) = $r->get_basic_auth_pw(); my ($res, $redmine_pass) = $r->get_basic_auth_pw();
return $res unless $res == OK; return $res unless $res == OK;
if (is_member($r->user, $redmine_pass, $r)) { if (is_member($r->user, $redmine_pass, $r)) {
return OK; return OK;
} else { } else {
@ -246,7 +246,7 @@ sub is_authentication_forced {
} }
$sth->finish(); $sth->finish();
undef $sth; undef $sth;
$dbh->disconnect(); $dbh->disconnect();
undef $dbh; undef $dbh;
@ -256,7 +256,7 @@ sub is_authentication_forced {
sub is_public_project { sub is_public_project {
my $project_id = shift; my $project_id = shift;
my $r = shift; my $r = shift;
if (is_authentication_forced($r)) { if (is_authentication_forced($r)) {
return 0; return 0;
} }
@ -283,12 +283,12 @@ sub is_public_project {
sub anonymous_role_allows_browse_repository { sub anonymous_role_allows_browse_repository {
my $r = shift; my $r = shift;
my $dbh = connect_database($r); my $dbh = connect_database($r);
my $sth = $dbh->prepare( my $sth = $dbh->prepare(
"SELECT permissions FROM roles WHERE builtin = 2;" "SELECT permissions FROM roles WHERE builtin = 2;"
); );
$sth->execute(); $sth->execute();
my $ret = 0; my $ret = 0;
if (my @row = $sth->fetchrow_array) { if (my @row = $sth->fetchrow_array) {
@ -300,7 +300,7 @@ sub anonymous_role_allows_browse_repository {
undef $sth; undef $sth;
$dbh->disconnect(); $dbh->disconnect();
undef $dbh; undef $dbh;
$ret; $ret;
} }
@ -328,7 +328,7 @@ sub is_member {
my $project_id = get_project_identifier($r); my $project_id = get_project_identifier($r);
my $pass_digest = Digest::SHA1::sha1_hex($redmine_pass); my $pass_digest = Digest::SHA1::sha1_hex($redmine_pass);
my $access_mode = defined $read_only_methods{$r->method} ? "R" : "W"; my $access_mode = defined $read_only_methods{$r->method} ? "R" : "W";
my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config); my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config);
@ -397,7 +397,7 @@ sub is_member {
sub get_project_identifier { sub get_project_identifier {
my $r = shift; my $r = shift;
my $location = $r->location; my $location = $r->location;
my ($identifier) = $r->uri =~ m{$location/*([^/]+)}; my ($identifier) = $r->uri =~ m{$location/*([^/]+)};
$identifier; $identifier;
@ -405,7 +405,7 @@ sub get_project_identifier {
sub connect_database { sub connect_database {
my $r = shift; my $r = shift;
my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config); my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config);
return DBI->connect($cfg->{RedmineDSN}, $cfg->{RedmineDbUser}, $cfg->{RedmineDbPass}); return DBI->connect($cfg->{RedmineDSN}, $cfg->{RedmineDbUser}, $cfg->{RedmineDbPass});
} }