csolisr/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests 1 Activity

Merge pull request #478 from friendica/revert-477-revert-475-task/4041-fix-register

Browse source 
Revert "Revert "Use Exceptions for User::create""
This commit is contained in:
Michael Vogel 2017-12-13 20:01:48 +01:00 committed by GitHub
parent 28603f86e8 fc62d44e78
commit cb9926c93a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ldapauth/ldapauth.php
View file

@ -177,11 +177,12 @@ function ldap_autocreateaccount($ldap_autocreateaccount, $username, $password, $
if (empty($results)) { if (empty($results)) {
if (strlen($email) > 0 && strlen($name) > 0) { if (strlen($email) > 0 && strlen($name) > 0) {
$arr = array('username' => $name, 'nickname' => $username, 'email' => $email, 'password' => $password, 'verified' => 1); $arr = array('username' => $name, 'nickname' => $username, 'email' => $email, 'password' => $password, 'verified' => 1);
$result = User::create($arr);
if ($result['success']) { try {
User::create($arr);
logger("ldapauth: account " . $username . " created"); logger("ldapauth: account " . $username . " created");
} else { } catch (Exception $ex) {
logger("ldapauth: account " . $username . " was not created ! : " . implode($result)); logger("ldapauth: account " . $username . " was not created ! : " . $ex->getMessage());
} }
} else { } else {
logger("ldapauth: unable to create account, no email or nickname found"); logger("ldapauth: unable to create account, no email or nickname found");