Merge pull request #832 from nupplaphil/feature/basepath/hostname_config

Moving/Renaming ConfigCacheLoader to ConfigFileLoader
pull/833/head
Hypolite Petovan 2019-03-24 20:15:17 -04:00 committed by GitHub
commit d29d356362
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 22 additions and 11 deletions

View File

@ -27,6 +27,7 @@ use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Util\Config\ConfigFileLoader;
use Friendica\Util\Network;
use Friendica\Util\XML;
@ -77,7 +78,7 @@ function geonames_uninstall() {
Logger::log("removed geonames");
}
function geonames_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
function geonames_load_config(\Friendica\App $a, ConfigFileLoader $loader)
{
$a->getConfigCache()->load($loader->loadAddonConfig('geonames'));
}

View File

@ -14,6 +14,7 @@ use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\Util\Config\ConfigFileLoader;
use Friendica\Util\Strings;
/**
@ -36,7 +37,7 @@ function gravatar_uninstall() {
Logger::log("unregistered gravatar in avatar_lookup hook");
}
function gravatar_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
function gravatar_load_config(App $a, ConfigFileLoader $loader)
{
$a->getConfigCache()->load($loader->loadAddonConfig('gravatar'));
}

View File

@ -13,6 +13,7 @@ use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Util\Config\ConfigFileLoader;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
@ -52,7 +53,7 @@ function impressum_footer($a, &$b) {
}
}
function impressum_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
function impressum_load_config(\Friendica\App $a, ConfigFileLoader $loader)
{
$a->getConfigCache()->load($loader->loadAddonConfig('impressum'));
}

View File

@ -58,6 +58,7 @@ use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Model\User;
use Friendica\Util\Config\ConfigFileLoader;
function ldapauth_install()
{
@ -71,7 +72,7 @@ function ldapauth_uninstall()
Hook::unregister('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate');
}
function ldapauth_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
function ldapauth_load_config(\Friendica\App $a, ConfigFileLoader $loader)
{
$a->getConfigCache()->load($loader->loadAddonConfig('ldapauth'));
}

View File

@ -14,6 +14,7 @@ use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\Util\Config\ConfigFileLoader;
use Friendica\Util\Strings;
/**
@ -36,7 +37,7 @@ function libravatar_uninstall()
Logger::log("unregistered libravatar in avatar_lookup hook");
}
function libravatar_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
function libravatar_load_config(App $a, ConfigFileLoader $loader)
{
$a->getConfigCache()->load($loader->loadAddonConfig('libravatar'));
}

View File

@ -15,6 +15,7 @@ use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Util\Config\ConfigFileLoader;
use Friendica\Util\Network;
use Friendica\Util\Strings;
@ -47,7 +48,7 @@ function openstreetmap_uninstall()
Logger::log("removed openstreetmap");
}
function openstreetmap_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
function openstreetmap_load_config(\Friendica\App $a, ConfigFileLoader $loader)
{
$a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'));
}

View File

@ -36,6 +36,7 @@ use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Util\Config\ConfigFileLoader;
use Friendica\Util\Strings;
function piwik_install() {
@ -52,7 +53,7 @@ function piwik_uninstall() {
Logger::log("uninstalled piwik addon");
}
function piwik_load_config(\Friendica\App $a, Config\Cache\ConfigCacheLoader $loader)
function piwik_load_config(\Friendica\App $a, ConfigFileLoader $loader)
{
$a->getConfigCache()->load($loader->loadAddonConfig('piwik'));
}

View File

@ -14,6 +14,7 @@ use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\Util\Config\ConfigFileLoader;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
@ -35,7 +36,7 @@ function public_server_uninstall()
Hook::unregister('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
}
function public_server_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
function public_server_load_config(App $a, ConfigFileLoader $loader)
{
$a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
}

View File

@ -23,6 +23,7 @@ use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\Queue;
use Friendica\Model\User;
use Friendica\Util\Config\ConfigFileLoader;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Strings;
@ -377,7 +378,7 @@ function pumpio_settings_post(App $a, array &$b)
}
}
function pumpio_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
function pumpio_load_config(App $a, ConfigFileLoader $loader)
{
$a->getConfigCache()->load($loader->loadAddonConfig('pumpio'));
}

View File

@ -12,6 +12,7 @@ use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Database\DBA;
use Friendica\Model\User;
use Friendica\Util\Config\ConfigFileLoader;
use Friendica\Util\DateTimeFormat;
function testdrive_install() {
@ -35,7 +36,7 @@ function testdrive_uninstall() {
}
function testdrive_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
function testdrive_load_config(App $a, ConfigFileLoader $loader)
{
$a->getConfigCache()->load($loader->loadAddonConfig('testdrive'));
}

View File

@ -86,6 +86,7 @@ use Friendica\Model\ItemContent;
use Friendica\Model\Queue;
use Friendica\Model\User;
use Friendica\Object\Image;
use Friendica\Util\Config\ConfigFileLoader;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\Strings;
@ -135,7 +136,7 @@ function twitter_uninstall()
Hook::unregister('addon_settings_post', __FILE__, 'twitter_settings_post');
}
function twitter_load_config(App $a, Config\Cache\ConfigCacheLoader $loader)
function twitter_load_config(App $a, ConfigFileLoader $loader)
{
$a->getConfigCache()->load($loader->loadAddonConfig('twitter'));
}