Merge commit 'gallery3-contrib/master'
This commit is contained in:
commit
ae5f3fc8be
@ -239,9 +239,6 @@ class Ldap_User implements User_Definition {
|
|||||||
case "id":
|
case "id":
|
||||||
return $this->ldap_entry["uidnumber"][0];
|
return $this->ldap_entry["uidnumber"][0];
|
||||||
|
|
||||||
case "groups":
|
|
||||||
return IdentityProvider_Ldap_Driver::groups_for($this);
|
|
||||||
|
|
||||||
case "locale": // @todo
|
case "locale": // @todo
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
@ -266,6 +263,10 @@ class Ldap_User implements User_Definition {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function groups() {
|
||||||
|
return IdentityProvider_Ldap_Driver::groups_for($this);
|
||||||
|
}
|
||||||
|
|
||||||
public function avatar_url($size=80, $default=null) {
|
public function avatar_url($size=80, $default=null) {
|
||||||
return sprintf("http://www.gravatar.com/avatar/%s.jpg?s=%d&r=pg%s",
|
return sprintf("http://www.gravatar.com/avatar/%s.jpg?s=%d&r=pg%s",
|
||||||
md5($this->email), $size, $default ? "&d=" . urlencode($default) : "");
|
md5($this->email), $size, $default ? "&d=" . urlencode($default) : "");
|
||||||
|
32
modules/sso/helpers/sso_event.php
Normal file
32
modules/sso/helpers/sso_event.php
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
<?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.
|
||||||
|
*/
|
||||||
|
class sso_event {
|
||||||
|
static function gallery_ready() {
|
||||||
|
$sso_username = Input::instance()->server("REMOTE_USER");
|
||||||
|
$user = Session::instance()->get("user");
|
||||||
|
if (empty($user) || $user->name != $sso_username) {
|
||||||
|
try {
|
||||||
|
identity::set_active_user(identity::lookup_user_by_name($sso_username));
|
||||||
|
} catch (Exception $e) {
|
||||||
|
Kohana_Log::add("error", "Couldn't authenticate as $sso_username: " .
|
||||||
|
$e->getMessage() . "\n" . $e->getTraceAsString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
3
modules/sso/module.info
Normal file
3
modules/sso/module.info
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
name = "SSO"
|
||||||
|
description = "Support single-signon authentication"
|
||||||
|
version = 1
|
Reference in New Issue
Block a user