Fixes Redmine.pm for SQLite (#4205).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3246 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
1052658df2
commit
de2bef606d
|
@ -233,11 +233,16 @@ sub is_public_project {
|
||||||
|
|
||||||
my $dbh = connect_database($r);
|
my $dbh = connect_database($r);
|
||||||
my $sth = $dbh->prepare(
|
my $sth = $dbh->prepare(
|
||||||
"SELECT * FROM projects WHERE projects.identifier=? and projects.is_public=true;"
|
"SELECT is_public FROM projects WHERE projects.identifier = ?;"
|
||||||
);
|
);
|
||||||
|
|
||||||
$sth->execute($project_id);
|
$sth->execute($project_id);
|
||||||
my $ret = $sth->fetchrow_array ? 1 : 0;
|
my $ret = 0;
|
||||||
|
if (my @row = $sth->fetchrow_array) {
|
||||||
|
if ($row[0] eq "1" || $row[0] eq "t") {
|
||||||
|
$ret = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
$sth->finish();
|
$sth->finish();
|
||||||
$dbh->disconnect();
|
$dbh->disconnect();
|
||||||
|
|
||||||
|
@ -295,7 +300,7 @@ sub is_member {
|
||||||
$sthldap->execute($auth_source_id);
|
$sthldap->execute($auth_source_id);
|
||||||
while (my @rowldap = $sthldap->fetchrow_array) {
|
while (my @rowldap = $sthldap->fetchrow_array) {
|
||||||
my $ldap = Authen::Simple::LDAP->new(
|
my $ldap = Authen::Simple::LDAP->new(
|
||||||
host => ($rowldap[2] == 1 || $rowldap[2] eq "t") ? "ldaps://$rowldap[0]" : $rowldap[0],
|
host => ($rowldap[2] eq "1" || $rowldap[2] eq "t") ? "ldaps://$rowldap[0]" : $rowldap[0],
|
||||||
port => $rowldap[1],
|
port => $rowldap[1],
|
||||||
basedn => $rowldap[5],
|
basedn => $rowldap[5],
|
||||||
binddn => $rowldap[3] ? $rowldap[3] : "",
|
binddn => $rowldap[3] ? $rowldap[3] : "",
|
||||||
|
|
Loading…
Reference in New Issue