Replace DI::app() with DI::appHelper()

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 329156f1ccf1b3ac4e4bba80a9fa3d3027a5f78d..c03034cd2b70098fb3233e959d854faa534d5f0a 100644 (file)
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -271,7 +271,7 @@ function advancedcontentfilter_content()
                                'rule_expression'   => DI::l10n()->t('Rule Expression'),
                                'cancel'            => DI::l10n()->t('Cancel'),
                        ],
-                       '$current_theme' => DI::app()->getCurrentTheme(),
+                       '$current_theme' => DI::appHelper()->getCurrentTheme(),
                        '$rules' => DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()])),
                        '$form_security_token' => BaseModule::getFormSecurityToken()
                ]);

diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
index 91e524feaf2011181d8a66d1d122b15667bba611..aa4bc34020a710835710ce04be2649f880de85bf 100644 (file)
--- a/bluesky/bluesky.php
+++ b/bluesky/bluesky.php
@@ -98,7 +98,7 @@ function bluesky_install()
 
 function bluesky_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function bluesky_check_item_notification(array &$notification_data)

diff --git a/fancybox/fancybox.php b/fancybox/fancybox.php
index 8608bcd7b589d749775b76fcc25bd205dc4b1ad9..b1a1ff35922a3053e0ced9b87402849a90507695 100644 (file)
--- a/fancybox/fancybox.php
+++ b/fancybox/fancybox.php
@@ -39,7 +39,7 @@ function fancybox_render(array &$b){
                function ($text) use ($gallery) {
                        // This processes images inlined in posts
                        // Frio / Vier hooks für lightbox are un-hooked in fancybox-config.js. So this works for them, too!
-                       //if (!in_array(DI::app()->getCurrentTheme(),['vier','frio']))
+                       //if (!in_array(DI::appHelper()->getCurrentTheme(),['vier','frio']))
                        $text = preg_replace(
                                '#<a[^>]*href="([^"]*)"[^>]*>(<img[^>]*src="[^"]*"[^>]*>)</a>#',
                                '<a data-fancybox="' . $gallery . '" href="$1">$2</a>',

diff --git a/geonames/geonames.php b/geonames/geonames.php
index 668eb0e77815eaca2f1df0a67d73c5775ac8f053..d14b1e8fe9986fa88749e2565d561aba585f4c70 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -34,7 +34,7 @@ function geonames_install()
 
 function geonames_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function geonames_post_hook(array &$item)

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index ca5eaaf082d8cd30dae04baf01ca8bdce6f32315..6007c433eaa72f37c3f8c6ec1b98a10898edf4c8 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -25,7 +25,7 @@ function gravatar_install() {
 
 function gravatar_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**

diff --git a/highlightjs/highlightjs.php b/highlightjs/highlightjs.php
index c1c2aac863dcd56aa7918dd253b2d9d3f51f6806..762f4117a4a0c3c10e7087e5ed7f28ab48521e77 100644 (file)
--- a/highlightjs/highlightjs.php
+++ b/highlightjs/highlightjs.php
@@ -17,7 +17,7 @@ function highlightjs_install()
 
 function highlightjs_head(string &$str)
 {
-       if (DI::app()->getCurrentTheme() == 'frio') {
+       if (DI::appHelper()->getCurrentTheme() == 'frio') {
                $style = 'bootstrap';
        } else {
                $style = 'default';

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 19ade933a5ae5df92805b8ccd03af574c6ab01bf..f61d7182f54adb49c38acc5b107d56c7c1ceb161 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -55,7 +55,7 @@ function impressum_footer(string &$body)
 
 function impressum_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function impressum_show(string &$body)

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 14686e997b17dc9be33a0bd006f72c0906a3ecc1..f834b4d543ee44535e0962db60c1f7a93ec82e18 100644 (file)
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -44,7 +44,7 @@ function ldapauth_install()
 
 function ldapauth_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function ldapauth_hook_authenticate(array &$b)

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index b0b2c214ccc372c44460d5461b3280e423a2bdeb..4cd72c83e6d70c7e71a152fd4bc1d6cbbfec5308 100644 (file)
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -25,7 +25,7 @@ function libravatar_install()
 
 function libravatar_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index c520514c0bae47ad67ef4b979ff57b0a408951a9..fc5ebbbeb7080d5b10bab9ca647b15c3d8b1a513 100644 (file)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -36,7 +36,7 @@ function openstreetmap_install()
 
 function openstreetmap_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function openstreetmap_alterheader(&$navHtml)

diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index 5e137b94e9ba0efedb47a10b7e65c1b464b2c90f..f4bb7753e120d7953eb115462886e0ba8d4a1077 100644 (file)
--- a/phpmailer/phpmailer.php
+++ b/phpmailer/phpmailer.php
@@ -24,7 +24,7 @@ function phpmailer_install()
 
 function phpmailer_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**

diff --git a/piwik/piwik.php b/piwik/piwik.php
index b7b49bd4ab9722c7a87ce13459122d280040e40b..fc459a875145b69fec708d406e5de8cb35a4d49a 100644 (file)
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -50,7 +50,7 @@ function piwik_install() {
 
 function piwik_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function piwik_analytics(string &$b)

diff --git a/pnut/pnut.php b/pnut/pnut.php
index 32f60f6d507188ea43d498aaafc2da83ba6bc2cc..f298997b4de4986c937429e638dbbf9add0cce86 100644 (file)
--- a/pnut/pnut.php
+++ b/pnut/pnut.php
@@ -90,7 +90,7 @@ function pnut_connect()
 
 function pnut_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('pnut'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('pnut'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function pnut_addon_admin(string &$o)

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 5834f42a279d33fc9b06ed3865ba4b4a2e0cae99..eb7af1e7564c0933b82864df590b750ae8ff4656 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -28,7 +28,7 @@ function public_server_install()
 
 function public_server_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function public_server_register_account($b)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index d7c2ac326565b34784a0f2e89769651e69eed809..ffe5f187a9a6e6b9b6bc58f78186e1fd6e17846b 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -319,7 +319,7 @@ function pumpio_settings_post(array &$b)
 
 function pumpio_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function pumpio_hook_fork(array &$b)

diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php
index ae0e783b570acb0dc711219b704134fca4820d1e..4d0a8d421d32fe669d87f335381516f0c9578db6 100644 (file)
--- a/smileybutton/smileybutton.php
+++ b/smileybutton/smileybutton.php
@@ -19,7 +19,7 @@ function smileybutton_install()
 function smileybutton_jot_tool(string &$body)
 {
        // Disable if theme is quattro
-       if (DI::app()->getCurrentTheme() == 'quattro') {
+       if (DI::appHelper()->getCurrentTheme() == 'quattro') {
                return;
        }
 
@@ -96,7 +96,7 @@ function smileybutton_jot_tool(string &$body)
        $s .= '</tr></table>';
 
        //Add css to header
-       $css_file = __DIR__ . '/view/' . DI::app()->getCurrentTheme() . '.css';
+       $css_file = __DIR__ . '/view/' . DI::appHelper()->getCurrentTheme() . '.css';
        if (!file_exists($css_file)) {
                $css_file = __DIR__ . '/view/default.css';
        }
@@ -104,7 +104,7 @@ function smileybutton_jot_tool(string &$body)
        DI::page()->registerStylesheet($css_file);
 
        //Get the correct image for the theme
-       $image = 'addon/smileybutton/view/' . DI::app()->getCurrentTheme() . '.png';
+       $image = 'addon/smileybutton/view/' . DI::appHelper()->getCurrentTheme() . '.png';
        if (!file_exists($image)) {
                $image = 'addon/smileybutton/view/default.png';
        }

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 40f22e0a7edfa7dafa02634937375a52ace72cbf..90fb59188d53fff34bad69c4c97d8d373f8bb3d2 100644 (file)
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -26,7 +26,7 @@ function testdrive_install()
 
 function testdrive_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function testdrive_globaldir_update(array &$b)

diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 1e9f5c7fa843866cb22ee31ff167131d62ef7bf9..580d73e669a6b2fa1357d94677bff18ef2d992b5 100644 (file)
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -65,7 +65,7 @@ function tumblr_install()
 
 function tumblr_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('tumblr'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('tumblr'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function tumblr_check_item_notification(array &$notification_data)

diff --git a/twitter/twitter.php b/twitter/twitter.php
index 10f8a2fb3aed8de774ab9f9fe10adcd7f1f67989..ea4ae356957cd5c3411d1c62746f5c9e0232beb3 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -67,7 +67,7 @@ function twitter_install()
 
 function twitter_load_config(ConfigFileManager $loader)
 {
-       DI::app()->getConfigCache()->load($loader->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+       DI::appHelper()->getConfigCache()->load($loader->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function twitter_jot_nets(array &$jotnets_fields)