mirror of
https://git.friendi.ca/friendica/friendica-addons.git
synced 2024-11-25 11:03:41 +00:00
Merge pull request #832 from nupplaphil/feature/basepath/hostname_config
Moving/Renaming ConfigCacheLoader to ConfigFileLoader
This commit is contained in:
commit
d29d356362
11 changed files with 22 additions and 11 deletions
|
@ -27,6 +27,7 @@ use Friendica\Core\Hook;
|
||||||
use Friendica\Core\L10n;
|
use Friendica\Core\L10n;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Core\PConfig;
|
use Friendica\Core\PConfig;
|
||||||
|
use Friendica\Util\Config\ConfigFileLoader;
|
||||||
use Friendica\Util\Network;
|
use Friendica\Util\Network;
|
||||||
use Friendica\Util\XML;
|
use Friendica\Util\XML;
|
||||||
|
|
||||||
|
@ -77,7 +78,7 @@ function geonames_uninstall() {
|
||||||
Logger::log("removed geonames");
|
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'));
|
$a->getConfigCache()->load($loader->loadAddonConfig('geonames'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,7 @@ use Friendica\Core\L10n;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
|
use Friendica\Util\Config\ConfigFileLoader;
|
||||||
use Friendica\Util\Strings;
|
use Friendica\Util\Strings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -36,7 +37,7 @@ function gravatar_uninstall() {
|
||||||
Logger::log("unregistered gravatar in avatar_lookup hook");
|
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'));
|
$a->getConfigCache()->load($loader->loadAddonConfig('gravatar'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,6 +13,7 @@ use Friendica\Core\Hook;
|
||||||
use Friendica\Core\L10n;
|
use Friendica\Core\L10n;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
|
use Friendica\Util\Config\ConfigFileLoader;
|
||||||
use Friendica\Util\Proxy as ProxyUtils;
|
use Friendica\Util\Proxy as ProxyUtils;
|
||||||
use Friendica\Util\Strings;
|
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'));
|
$a->getConfigCache()->load($loader->loadAddonConfig('impressum'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,6 +58,7 @@ use Friendica\Core\Config;
|
||||||
use Friendica\Core\Hook;
|
use Friendica\Core\Hook;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Model\User;
|
use Friendica\Model\User;
|
||||||
|
use Friendica\Util\Config\ConfigFileLoader;
|
||||||
|
|
||||||
function ldapauth_install()
|
function ldapauth_install()
|
||||||
{
|
{
|
||||||
|
@ -71,7 +72,7 @@ function ldapauth_uninstall()
|
||||||
Hook::unregister('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate');
|
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'));
|
$a->getConfigCache()->load($loader->loadAddonConfig('ldapauth'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,7 @@ use Friendica\Core\L10n;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
|
use Friendica\Util\Config\ConfigFileLoader;
|
||||||
use Friendica\Util\Strings;
|
use Friendica\Util\Strings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -36,7 +37,7 @@ function libravatar_uninstall()
|
||||||
Logger::log("unregistered libravatar in avatar_lookup hook");
|
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'));
|
$a->getConfigCache()->load($loader->loadAddonConfig('libravatar'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,7 @@ use Friendica\Core\Hook;
|
||||||
use Friendica\Core\L10n;
|
use Friendica\Core\L10n;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
|
use Friendica\Util\Config\ConfigFileLoader;
|
||||||
use Friendica\Util\Network;
|
use Friendica\Util\Network;
|
||||||
use Friendica\Util\Strings;
|
use Friendica\Util\Strings;
|
||||||
|
|
||||||
|
@ -47,7 +48,7 @@ function openstreetmap_uninstall()
|
||||||
Logger::log("removed openstreetmap");
|
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'));
|
$a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,6 +36,7 @@ use Friendica\Core\Hook;
|
||||||
use Friendica\Core\L10n;
|
use Friendica\Core\L10n;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
|
use Friendica\Util\Config\ConfigFileLoader;
|
||||||
use Friendica\Util\Strings;
|
use Friendica\Util\Strings;
|
||||||
|
|
||||||
function piwik_install() {
|
function piwik_install() {
|
||||||
|
@ -52,7 +53,7 @@ function piwik_uninstall() {
|
||||||
Logger::log("uninstalled piwik addon");
|
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'));
|
$a->getConfigCache()->load($loader->loadAddonConfig('piwik'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,7 @@ use Friendica\Core\L10n;
|
||||||
use Friendica\Core\Logger;
|
use Friendica\Core\Logger;
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
|
use Friendica\Util\Config\ConfigFileLoader;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Strings;
|
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');
|
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'));
|
$a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,7 @@ use Friendica\Model\Group;
|
||||||
use Friendica\Model\Item;
|
use Friendica\Model\Item;
|
||||||
use Friendica\Model\Queue;
|
use Friendica\Model\Queue;
|
||||||
use Friendica\Model\User;
|
use Friendica\Model\User;
|
||||||
|
use Friendica\Util\Config\ConfigFileLoader;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Network;
|
use Friendica\Util\Network;
|
||||||
use Friendica\Util\Strings;
|
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'));
|
$a->getConfigCache()->load($loader->loadAddonConfig('pumpio'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,7 @@ use Friendica\Core\Hook;
|
||||||
use Friendica\Core\L10n;
|
use Friendica\Core\L10n;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
use Friendica\Model\User;
|
use Friendica\Model\User;
|
||||||
|
use Friendica\Util\Config\ConfigFileLoader;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
|
|
||||||
function testdrive_install() {
|
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'));
|
$a->getConfigCache()->load($loader->loadAddonConfig('testdrive'));
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,6 +86,7 @@ use Friendica\Model\ItemContent;
|
||||||
use Friendica\Model\Queue;
|
use Friendica\Model\Queue;
|
||||||
use Friendica\Model\User;
|
use Friendica\Model\User;
|
||||||
use Friendica\Object\Image;
|
use Friendica\Object\Image;
|
||||||
|
use Friendica\Util\Config\ConfigFileLoader;
|
||||||
use Friendica\Util\DateTimeFormat;
|
use Friendica\Util\DateTimeFormat;
|
||||||
use Friendica\Util\Network;
|
use Friendica\Util\Network;
|
||||||
use Friendica\Util\Strings;
|
use Friendica\Util\Strings;
|
||||||
|
@ -135,7 +136,7 @@ function twitter_uninstall()
|
||||||
Hook::unregister('addon_settings_post', __FILE__, 'twitter_settings_post');
|
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'));
|
$a->getConfigCache()->load($loader->loadAddonConfig('twitter'));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue