X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=ldapauth%2Fldapauth.php;h=d06874b7cbfaf1696e7a0416a4ee0c7ee28c2573;hb=842050b54fca213232c45baa559746987e279544;hp=39be69108742791aa1fdd8e816ad02b454548eac;hpb=51e43d6dca15159dd6ba1eda86728ab137ceaf22;p=friendica-addons.git

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
old mode 100755
new mode 100644
index 39be6910..d06874b7
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -52,19 +52,18 @@
  *
  * ...etc.
  */
-
-require_once('include/user.php');
-
+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)
@@ -91,7 +90,7 @@ function ldapauth_authenticate($username, $password)
 	$ldap_autocreateaccount_emailattribute = Config::get('ldapauth', 'ldap_autocreateaccount_emailattribute');
 	$ldap_autocreateaccount_nameattribute  = Config::get('ldapauth', 'ldap_autocreateaccount_nameattribute');
 
-	if (!((strlen($password)) && (function_exists('ldap_connect')) && (strlen($ldap_server)))) {
+	if (!(strlen($password) && function_exists('ldap_connect') && strlen($ldap_server))) {
 		logger("ldapauth: not configured or missing php-ldap module");
 		return false;
 	}
@@ -178,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 = create_user($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");