Merge branch 'master' of github.com:gallery/gallery3-contrib
This commit is contained in:
commit
ac28b85c5f
@ -49,7 +49,7 @@ class Gallery3 {
|
|||||||
* @param string authentication token
|
* @param string authentication token
|
||||||
* @return object Gallery3
|
* @return object Gallery3
|
||||||
*/
|
*/
|
||||||
public function factory($url=null, $token=null) {
|
static function factory($url=null, $token=null) {
|
||||||
$obj = new Gallery3();
|
$obj = new Gallery3();
|
||||||
$obj->token = $token;
|
$obj->token = $token;
|
||||||
$obj->url = $url;
|
$obj->url = $url;
|
||||||
|
@ -178,13 +178,16 @@ class IdentityProvider_Ldap_Driver implements IdentityProvider_Driver {
|
|||||||
public function groups() {
|
public function groups() {
|
||||||
$groups = array();
|
$groups = array();
|
||||||
foreach (self::$_params["groups"] as $group_name) {
|
foreach (self::$_params["groups"] as $group_name) {
|
||||||
$root = item::root();
|
|
||||||
$groups[] = $this->lookup_group_by_name($group_name);
|
$groups[] = $this->lookup_group_by_name($group_name);
|
||||||
}
|
}
|
||||||
return $groups;
|
return $groups;
|
||||||
}
|
}
|
||||||
|
|
||||||
static function groups_for($user) {
|
static function groups_for($user) {
|
||||||
|
if ($user->guest) {
|
||||||
|
return $user->groups;
|
||||||
|
}
|
||||||
|
|
||||||
$result = ldap_search(self::$_connection, self::$_params["group_domain"],
|
$result = ldap_search(self::$_connection, self::$_params["group_domain"],
|
||||||
"(memberUid=$user->name)");
|
"(memberUid=$user->name)");
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ class register_Controller extends Controller {
|
|||||||
} else {
|
} else {
|
||||||
print json_encode(
|
print json_encode(
|
||||||
array("result" => "error",
|
array("result" => "error",
|
||||||
"form" => $form->__toString()));
|
"form" => (string) $form));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -78,20 +78,14 @@ class register_Core {
|
|||||||
static function create_new_user($id) {
|
static function create_new_user($id) {
|
||||||
$user = ORM::factory("pending_user", $id);
|
$user = ORM::factory("pending_user", $id);
|
||||||
|
|
||||||
$password = md5(rand());
|
$password = md5(uniqid(mt_rand(), true));
|
||||||
$new_user = identity::create_user($user->name, $user->full_name, $password);
|
$new_user = identity::create_user($user->name, $user->full_name, $password, $user->email);
|
||||||
$new_user->email = $user->email;
|
|
||||||
$new_user->url = $user->url;
|
$new_user->url = $user->url;
|
||||||
$new_user->admin = false;
|
$new_user->admin = false;
|
||||||
$new_user->guest = false;
|
$new_user->guest = false;
|
||||||
$new_user->save();
|
$new_user->save();
|
||||||
|
|
||||||
$default_group = module::get_var("registration", "default_group");
|
$user->hash = md5(uniqid(mt_rand(), true));
|
||||||
if (!empty($default_group)) {
|
|
||||||
identity::add_user_to_group($new_user, $default_group);
|
|
||||||
}
|
|
||||||
|
|
||||||
$user->hash = md5(rand());
|
|
||||||
$user->state = 2;
|
$user->state = 2;
|
||||||
$user->save();
|
$user->save();
|
||||||
self::send_user_created_confirmation($user, $password);
|
self::send_user_created_confirmation($user, $password);
|
||||||
|
Reference in New Issue
Block a user