public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of git@github.com:gallery/gallery3-contrib into talmdal

Browse Source
This commit is contained in:
Tim Almdal 2009-11-01 07:47:15 -08:00
commit 60f26d711f
3 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
modules/ldap/config/gallery.ldif → modules/ldap/config/gallery_sample.ldif
View File

28
modules/ldap/config/ldap.php
View File

@ -1,28 +0,0 @@
<?php defined("SYSPATH") or die("No direct script access.");
/**
* Gallery - a web based photo album viewer and editor
* Copyright (C) 2000-2009 Bharat Mediratta
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
$config = array(
"groups" => array("eng", "google", "prebuild", "guest"),
"everybody_group" => "guest",
"registered_users_group" => "google",
"admins" => array("mediratta"),
"url" => "ldaps://ldap.corp.google.com/",
"group_domain" => "ou=Posix,ou=Groups,dc=google,dc=com",
"user_domain" => "ou=People,dc=google,dc=com",
);

2
modules/ldap/libraries/drivers/IdentityProvider/Ldap.php
View File

@ -71,7 +71,7 @@ class IdentityProvider_Ldap_Driver implements IdentityProvider_Driver {
public function is_correct_password($user, $password) {
$connection = ldap_connect(self::$_params["url"]);
ldap_set_option($connection, LDAP_OPT_PROTOCOL_VERSION, 3);
$lbind = ldap_bind($connection, $user->dn, $password);
$lbind = @ldap_bind($connection, $user->dn, $password);
ldap_unbind($connection);
return ($lbind) ? true : false;