Skip to content

O
OHR Support
Commit c2edd624 authored by Holger Just's avatar Holger Just
Browse files
Options

Fix trailing whitespace

parent 5e171001
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
extra/svn/Redmine.pm
View file @ c2edd624
...@@ -49,7 +49,7 @@ Authen::Simple::LDAP (and IO::Socket::SSL if LDAPS is used): ...@@ -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
...@@ -227,31 +227,31 @@ my @directives = ( ...@@ -227,31 +227,31 @@ 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
hashed_password, salt, auth_source_id, permissions hashed_password, salt, auth_source_id, permissions
FROM members, projects, users, roles, member_roles FROM members, projects, users, roles, member_roles
WHERE WHERE
projects.id=members.project_id projects.id=members.project_id
AND member_roles.member_id=members.id AND member_roles.member_id=members.id
AND users.id=members.user_id AND users.id=members.user_id
AND roles.id=member_roles.role_id AND roles.id=member_roles.role_id
AND users.status=1 AND users.status=1
AND login=? AND login=?
AND identifier=? "; AND identifier=? ";
$self->{RedmineQuery} = trim($query); $self->{RedmineQuery} = trim($query);
} }
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;
...@@ -325,10 +325,10 @@ sub access_handler { ...@@ -325,10 +325,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 {
...@@ -355,7 +355,7 @@ sub is_authentication_forced { ...@@ -355,7 +355,7 @@ sub is_authentication_forced {
} }
$sth->finish(); $sth->finish();
undef $sth; undef $sth;
$dbh->disconnect(); $dbh->disconnect();
undef $dbh; undef $dbh;
...@@ -365,7 +365,7 @@ sub is_authentication_forced { ...@@ -365,7 +365,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;
} }
...@@ -392,12 +392,12 @@ sub is_public_project { ...@@ -392,12 +392,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) {
...@@ -409,7 +409,7 @@ sub anonymous_role_allows_browse_repository { ...@@ -409,7 +409,7 @@ sub anonymous_role_allows_browse_repository {
undef $sth; undef $sth;
$dbh->disconnect(); $dbh->disconnect();
undef $dbh; undef $dbh;
$ret; $ret;
} }
...@@ -504,7 +504,7 @@ sub is_member { ...@@ -504,7 +504,7 @@ sub is_member {
sub get_project_identifier { sub get_project_identifier {
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);
my $location = $r->location; my $location = $r->location;
my ($identifier) = $r->uri =~ m{$location/*([^/]+)}; my ($identifier) = $r->uri =~ m{$location/*([^/]+)};
...@@ -514,7 +514,7 @@ sub get_project_identifier { ...@@ -514,7 +514,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});
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment