X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=ldapauth%2Fldapauth.php;h=6110799653b8fa8f029bb22067a37a2888529971;hb=b5759d24ee8db7e558fb1214e01fd26c105f4391;hp=eb8cafc41720c181cc801eed8b5ed5feb3619f23;hpb=49eff56e5d1969a10bcc37c4aa0d8ae74c9f939d;p=friendica-addons.git

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index eb8cafc4..61107996 100644
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -26,7 +26,7 @@
  * Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site
  * ldap.conf file to the signing cert for your LDAP server.
  *
- * The configuration options for this module may be set in the config/addon.ini.php file
+ * The configuration options for this module may be set in the config/addon.config.php file
  * e.g.:
  *
  * [ldapauth]
@@ -53,26 +53,28 @@
  *
  * ...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');
+	Hook::register('load_config',  'addon/ldapauth/ldapauth.php', 'ldapauth_load_config');
+	Hook::register('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::unregister('load_config',  'addon/ldapauth/ldapauth.php', 'ldapauth_load_config');
+	Hook::unregister('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.ini.php');
+	$a->getConfigCache()->load($loader->loadAddonConfig('ldapauth'));
 }
 
 function ldapauth_hook_authenticate($a, &$b)
@@ -89,15 +91,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");