Addon class

[friendica-addons.git] / ldapauth / ldapauth.php

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index a0b270e38842adbc1cae6322bf7efe82c12ee230..d06874b7cbfaf1696e7a0416a4ee0c7ee28c2573 100644 (file)
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -52,17 +52,18 @@
  *
  * ...etc.
  */
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Model\User;
 
 function ldapauth_install()
 {
-       register_hook('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate');
+       Addon::registerHook('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate');
 }
 
 function ldapauth_uninstall()
 {
-       unregister_hook('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate');
+       Addon::unregisterHook('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate');
 }
 
 function ldapauth_hook_authenticate($a, &$b)
@@ -176,12 +177,13 @@ function ldap_autocreateaccount($ldap_autocreateaccount, $username, $password, $
                $results = get_existing_account($username);
                if (empty($results)) {
                        if (strlen($email) > 0 && strlen($name) > 0) {
-                               $arr = array('username' => $name, 'nickname' => $username, 'email' => $email, 'password' => $password, 'verified' => 1);
-                               $result = User::create($arr);
-                               if ($result['success']) {
+                               $arr = ['username' => $name, 'nickname' => $username, 'email' => $email, 'password' => $password, 'verified' => 1];
+
+                               try {
+                                       User::create($arr);
                                        logger("ldapauth: account " . $username . " created");
-                               } else {
-                                       logger("ldapauth: account " . $username . " was not created ! : " . implode($result));
+                               } catch (Exception $ex) {
+                                       logger("ldapauth: account " . $username . " was not created ! : " . $ex->getMessage());
                                }
                        } else {
                                logger("ldapauth: unable to create account, no email or nickname found");