Replace call for Logger with DI::logger()

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index c03034cd2b70098fb3233e959d854faa534d5f0a..aeeff77c04ee7839763cc288d3ff8608d854ab89 100644 (file)
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -36,7 +36,6 @@
 use Friendica\BaseModule;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
@@ -62,7 +61,7 @@ function advancedcontentfilter_install()
        Hook::add('dbstructure_definition'          , __FILE__, 'advancedcontentfilter_dbstructure_definition');
        DBStructure::performUpdate();
 
-       Logger::notice('installed advancedcontentfilter');
+       DI::logger()->notice('installed advancedcontentfilter');
 }
 
 /*

diff --git a/birdavatar/birdavatar.php b/birdavatar/birdavatar.php
index 9a9dce0a6d518be7bd8350bbde11707b29a15c54..cd49b18355f58c98b456b7a77471dd71f7360b3c 100644 (file)
--- a/birdavatar/birdavatar.php
+++ b/birdavatar/birdavatar.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -27,7 +26,7 @@ function birdavatar_install()
        Hook::register('addon_settings', __FILE__, 'birdavatar_addon_settings');
        Hook::register('addon_settings_post', __FILE__, 'birdavatar_addon_settings_post');
 
-       Logger::info('registered birdavatar');
+       DI::logger()->info('registered birdavatar');
 }
 
 /**

diff --git a/blackout/blackout.php b/blackout/blackout.php
index a3f806ff2245fc6d1670639b588ff7376927fd01..ac1ee3e6432b19ff81455135976d5573971835b3 100644 (file)
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -45,7 +45,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\DI;
@@ -77,7 +76,7 @@ function blackout_redirect ($b)
        }
 
        if (( $date1 <= $now ) && ( $now <= $date2 )) {
-               Logger::notice('redirecting user to blackout page');
+               DI::logger()->notice('redirecting user to blackout page');
                System::externalRedirect($myurl);
        }
 }

diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 2bdf0cca8bea07f88195a9eec56972eb398c7e90..7b5f05c0dc079f326fc902a8c9a29be8f475c76e 100644 (file)
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -27,7 +26,7 @@ function catavatar_install()
        Hook::register('addon_settings', __FILE__, 'catavatar_addon_settings');
        Hook::register('addon_settings_post', __FILE__, 'catavatar_addon_settings_post');
 
-       Logger::notice('registered catavatar');
+       DI::logger()->notice('registered catavatar');
 }
 
 /**

diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 8bd2760607bcc027397fce2ea903f448a423eb6b..bb8a4fe618af512a74475bbf241134f763e09dec 100644 (file)
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -8,7 +8,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -17,7 +16,7 @@ function fromapp_install()
        Hook::register('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
        Hook::register('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
        Hook::register('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
-       Logger::notice("installed fromapp");
+       DI::logger()->notice("installed fromapp");
 }
 
 function fromapp_settings_post($post)

diff --git a/geonames/geonames.php b/geonames/geonames.php
index d14b1e8fe9986fa88749e2565d561aba585f4c70..4c5e54d85f3b2477d1ed0d769e83eacd659d0758 100644 (file)
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -45,7 +44,7 @@ function geonames_post_hook(array &$item)
         *      - The profile owner must have allowed our addon
         */
 
-       Logger::notice('geonames invoked');
+        DI::logger()->notice('geonames invoked');
 
        if (!DI::userSession()->getLocalUserId()) {   /* non-zero if this is a logged in user of this system */
                return;

diff --git a/gnot/gnot.php b/gnot/gnot.php
index 5d0919cbd49e662a8e789b6a5ae2ce45b05cc654..3801a21015a618bdfcd95849e5035e5dd66f0df4 100644 (file)
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -9,7 +9,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Notification;
@@ -20,7 +19,7 @@ function gnot_install()
        Hook::register('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
        Hook::register('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
 
-       Logger::notice("installed gnot");
+       DI::logger()->notice("installed gnot");
 }
 
 /**

diff --git a/googlemaps/googlemaps.php b/googlemaps/googlemaps.php
index b83a9cf99b8bc811781eec13877120733d474946..a0bba8adfbcf430b4a80fafafee7425180c46327 100644 (file)
--- a/googlemaps/googlemaps.php
+++ b/googlemaps/googlemaps.php
@@ -8,13 +8,12 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 
 function googlemaps_install()
 {
        Hook::register('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location');
 
-       Logger::notice('installed googlemaps');
+       DI::logger()->notice('installed googlemaps');
 }
 
 function googlemaps_location(&$item)

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 6007c433eaa72f37c3f8c6ec1b98a10898edf4c8..7fe0d95515dd32ae6b044957641678fd1c9e5eb3 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -8,7 +8,6 @@
 
 use Friendica\BaseModule;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -20,7 +19,7 @@ function gravatar_install() {
        Hook::register('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
        Hook::register('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
-       Logger::notice("registered gravatar in avatar_lookup hook");
+       DI::logger()->notice("registered gravatar in avatar_lookup hook");
 }
 
 function gravatar_load_config(ConfigFileManager $loader)

diff --git a/impressum/impressum.php b/impressum/impressum.php
index f61d7182f54adb49c38acc5b107d56c7c1ceb161..0ad34e405335579024a8404234fe3a4ca1eb9c47 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -9,7 +9,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -20,7 +19,7 @@ function impressum_install()
        Hook::register('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
        Hook::register('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
        Hook::register('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
-       Logger::notice("installed impressum Addon");
+       DI::logger()->notice("installed impressum Addon");
 }
 
 /**

diff --git a/keycloakpassword/keycloakpassword.php b/keycloakpassword/keycloakpassword.php
index e9809f86a36adfe4fa4f4a897a4ab1b9e138f74f..11034ffe4590191791748fccfb42c010e061ba47 100644 (file)
--- a/keycloakpassword/keycloakpassword.php
+++ b/keycloakpassword/keycloakpassword.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -37,7 +36,7 @@ function keycloakpassword_request($client_id, $secret, $url, $params = [])
        $res = curl_exec($ch);
 
        if (curl_errno($ch)) {
-               Logger::error(curl_error($ch));
+               DI::logger()->error(curl_error($ch));
        }
        curl_close($ch);
 

diff --git a/krynn/krynn.php b/krynn/krynn.php
index fa9db1331d28c098ffe6f4a9c9140d4bdf85d04e..b57d827e022ac94ee2f52e7846b4b6f95ae56621 100644 (file)
--- a/krynn/krynn.php
+++ b/krynn/krynn.php
@@ -11,7 +11,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -31,7 +30,7 @@ function krynn_install()
        Hook::register('addon_settings', 'addon/krynn/krynn.php', 'krynn_settings');
        Hook::register('addon_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post');
 
-       Logger::notice("installed krynn");
+       DI::logger()->notice("installed krynn");
 }
 
 function krynn_post_hook(&$item)

diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index ec8091acb9127c3c3be8f462e66f9171df1df7fc..891cb6cab800d11e619ddaffd70ebad5d46cd0f3 100644 (file)
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\DI;
 
 function leistungsschutzrecht_install()
@@ -168,7 +167,7 @@ function leistungsschutzrecht_cron($b)
        if ($last) {
                $next = $last + 86400;
                if ($next > time()) {
-                       Logger::notice('poll intervall not reached');
+                       DI::logger()->notice('poll intervall not reached');
                        return;
                }
        }

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 4cd72c83e6d70c7e71a152fd4bc1d6cbbfec5308..6cb3533178a70233f09026b2ecd1b53f525a9ab3 100644 (file)
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -8,7 +8,6 @@
 
 use Friendica\Core\Addon;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -20,7 +19,7 @@ function libravatar_install()
 {
        Hook::register('load_config',   'addon/libravatar/libravatar.php', 'libravatar_load_config');
        Hook::register('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
-       Logger::notice("registered libravatar in avatar_lookup hook");
+       DI::logger()->notice("registered libravatar in avatar_lookup hook");
 }
 
 function libravatar_load_config(ConfigFileManager $loader)

diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index d3b68807a27eabbf7d672e595e9a0cc325867d3c..ba7dfb39230aa8b7ba31f18f9a6cc8680d56edc7 100644 (file)
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -8,7 +8,6 @@
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\User;
@@ -16,7 +15,7 @@ use Friendica\Model\User;
 function newmemberwidget_install()
 {
        Hook::register( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
-       Logger::notice('newmemberwidget installed');
+       DI::logger()->notice('newmemberwidget installed');
 }
 
 function newmemberwidget_network_mod_init ($b)

diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index 66c9b74a1bcca428601938e6931c7bcd2fc1153a..5652c8f0dafaece106410971bde7316c98cc68b9 100644 (file)
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
@@ -16,7 +15,7 @@ function numfriends_install() {
        Hook::register('addon_settings', 'addon/numfriends/numfriends.php', 'numfriends_settings');
        Hook::register('addon_settings_post', 'addon/numfriends/numfriends.php', 'numfriends_settings_post');
 
-       Logger::notice("installed numfriends");
+       DI::logger()->notice("installed numfriends");
 }
 
 /**

diff --git a/opmlexport/opmlexport.php b/opmlexport/opmlexport.php
index 3df7127528901b249fe9dfc08a76ebd11d7dd468..be1d335cfa593e568230fbd139bbc23080fad4f4 100644 (file)
--- a/opmlexport/opmlexport.php
+++ b/opmlexport/opmlexport.php
@@ -9,7 +9,6 @@
 
 use Friendica\DI;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Model\Contact;
 use Friendica\Model\User;
@@ -18,7 +17,7 @@ function opmlexport_install()
 {
        Hook::register('addon_settings',        __FILE__, 'opmlexport_addon_settings');
        Hook::register('addon_settings_post',   __FILE__, 'opmlexport_addon_settings_post');
-       Logger::notice('installed opmlexport Addon');
+       DI::logger()->notice('installed opmlexport Addon');
 }
 
 

diff --git a/piwik/piwik.php b/piwik/piwik.php
index fc459a875145b69fec708d406e5de8cb35a4d49a..b7e9e71c7c115c57ee240df0d2bd008936e54333 100644 (file)
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -36,7 +36,6 @@
  */
 
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Core\Config\Util\ConfigFileManager;
@@ -45,7 +44,7 @@ function piwik_install() {
        Hook::register('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
        Hook::register('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
 
-       Logger::notice("installed piwik addon");
+       DI::logger()->notice("installed piwik addon");
 }
 
 function piwik_load_config(ConfigFileManager $loader)

diff --git a/pumpio/pumpio_sync.php b/pumpio/pumpio_sync.php
index beaf6e81f2886c5bef80c31e82f0628b6f0a4022..09548c6d54b7f2061b40a8e589f09b4a2089b148 100644 (file)
--- a/pumpio/pumpio_sync.php
+++ b/pumpio/pumpio_sync.php
@@ -1,5 +1,5 @@
 <?php
-use Friendica\Core\Logger;
+
 use Friendica\DI;
 
 function pumpio_sync_run(array $argv, int $argc) {
@@ -8,7 +8,7 @@ function pumpio_sync_run(array $argv, int $argc) {
        if (function_exists('sys_getloadavg')) {
                $load = sys_getloadavg();
                if (intval($load[0]) > DI::config()->get('system', 'maxloadavg', 50)) {
-                       Logger::notice('system: load ' . $load[0] . ' too high. Pumpio sync deferred to next scheduled run.');
+                       DI::logger()->notice('system: load ' . $load[0] . ' too high. Pumpio sync deferred to next scheduled run.');
                        return;
                }
        }

diff --git a/securemail/securemail.php b/securemail/securemail.php
index b56c0cbcd487a0e75ea5e6253774a13ab9eb2445..7b41239589d9bdae9b880a70840788783401c8f1 100644 (file)
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -8,7 +8,6 @@
 
 use Friendica\Addon\securemail\SecureTestEmail;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Object\EMail\IEmail;
@@ -22,7 +21,7 @@ function securemail_install()
 
        Hook::register('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare', 10);
 
-       Logger::notice('installed securemail');
+       DI::logger()->notice('installed securemail');
 }
 
 /**