X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=ldapauth%2Fldapauth.php;h=f99f6eeee88daab5b5d96e1a2716c85a4803e05c;hb=14c09c1bbba1324bd03f58d6af123ba53b29070c;hp=77d963c07f99eb0659d3709d9341f556a1e53106;hpb=5535fa9fd2898571b702dc6c343de68d3d813f6c;p=friendica-addons.git

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 77d963c0..f99f6eee 100644
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -53,26 +53,22 @@
  *
  * ...etc.
  */
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
+
+use Friendica\Core\Hook;
 use Friendica\Core\Logger;
+use Friendica\DI;
 use Friendica\Model\User;
+use Friendica\Util\ConfigFileLoader;
 
 function ldapauth_install()
 {
-	Addon::registerHook('load_config',  'addon/ldapauth/ldapauth.php', 'ldapauth_load_config');
-	Addon::registerHook('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate');
-}
-
-function ldapauth_uninstall()
-{
-	Addon::unregisterHook('load_config',  'addon/ldapauth/ldapauth.php', 'ldapauth_load_config');
-	Addon::unregisterHook('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate');
+	Hook::register('load_config',  'addon/ldapauth/ldapauth.php', 'ldapauth_load_config');
+	Hook::register('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate');
 }
 
-function ldapauth_load_config(\Friendica\App $a)
+function ldapauth_load_config(\Friendica\App $a, ConfigFileLoader $loader)
 {
-	$a->loadConfigFile(__DIR__ . '/config/ldapauth.config.php');
+	$a->getConfigCache()->load($loader->loadAddonConfig('ldapauth'));
 }
 
 function ldapauth_hook_authenticate($a, &$b)
@@ -89,15 +85,15 @@ function ldapauth_hook_authenticate($a, &$b)
 
 function ldapauth_authenticate($username, $password)
 {
-	$ldap_server   = Config::get('ldapauth', 'ldap_server');
-	$ldap_binddn   = Config::get('ldapauth', 'ldap_binddn');
-	$ldap_bindpw   = Config::get('ldapauth', 'ldap_bindpw');
-	$ldap_searchdn = Config::get('ldapauth', 'ldap_searchdn');
-	$ldap_userattr = Config::get('ldapauth', 'ldap_userattr');
-	$ldap_group    = Config::get('ldapauth', 'ldap_group');
-	$ldap_autocreateaccount = Config::get('ldapauth', 'ldap_autocreateaccount');
-	$ldap_autocreateaccount_emailattribute = Config::get('ldapauth', 'ldap_autocreateaccount_emailattribute');
-	$ldap_autocreateaccount_nameattribute  = Config::get('ldapauth', 'ldap_autocreateaccount_nameattribute');
+	$ldap_server   = DI::config()->get('ldapauth', 'ldap_server');
+	$ldap_binddn   = DI::config()->get('ldapauth', 'ldap_binddn');
+	$ldap_bindpw   = DI::config()->get('ldapauth', 'ldap_bindpw');
+	$ldap_searchdn = DI::config()->get('ldapauth', 'ldap_searchdn');
+	$ldap_userattr = DI::config()->get('ldapauth', 'ldap_userattr');
+	$ldap_group    = DI::config()->get('ldapauth', 'ldap_group');
+	$ldap_autocreateaccount = DI::config()->get('ldapauth', 'ldap_autocreateaccount');
+	$ldap_autocreateaccount_emailattribute = DI::config()->get('ldapauth', 'ldap_autocreateaccount_emailattribute');
+	$ldap_autocreateaccount_nameattribute  = DI::config()->get('ldapauth', 'ldap_autocreateaccount_nameattribute');
 
 	if (!(strlen($password) && function_exists('ldap_connect') && strlen($ldap_server))) {
 		Logger::log("ldapauth: not configured or missing php-ldap module");