[various] Remove App dependency from hook functions

[friendica-addons.git] / irc / irc.php

diff --git a/irc/irc.php b/irc/irc.php
index 206b1e7f89027c1eec5f39e8306147cb1b656289..8bd05fb7cbe4ade0e31338a35be02dc6c57757e9 100644 (file)
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -19,14 +19,14 @@ function irc_install()
        Hook::register('addon_settings_post', 'addon/irc/irc.php', 'irc_addon_settings_post');
 }
 
-function irc_addon_settings(App &$a, array &$data)
+function irc_addon_settings(array &$data)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                return;
        }
 
-       $sitechats = DI::pConfig()->get(local_user(), 'irc', 'sitechats'); /* popular channels */
-       $autochans = DI::pConfig()->get(local_user(), 'irc', 'autochans');  /* auto connect chans */
+       $sitechats = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'irc', 'sitechats'); /* popular channels */
+       $autochans = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'irc', 'autochans');  /* auto connect chans */
 
        $t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/irc/');
        $html = Renderer::replaceMacros($t, [
@@ -42,24 +42,24 @@ function irc_addon_settings(App &$a, array &$data)
        ];
 }
 
-function irc_addon_settings_post(App $a, array &$b)
+function irc_addon_settings_post(array &$b)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                return;
        }
 
        if (!empty($_POST['irc-submit'])) {
                if (isset($_POST['autochans'])) {
-                       DI::pConfig()->set(local_user(), 'irc', 'autochans', trim(($_POST['autochans'])));
+                       DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'irc', 'autochans', trim(($_POST['autochans'])));
                }
                if (isset($_POST['sitechats'])) {
-                       DI::pConfig()->set(local_user(), 'irc', 'sitechats', trim($_POST['sitechats']));
+                       DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'irc', 'sitechats', trim($_POST['sitechats']));
                }
                /* upid pop-up thing */
        }
 }
 
-function irc_app_menu(App $a, array &$b)
+function irc_app_menu(array &$b)
 {
        $b['app_menu'][] = '<div class="app-title"><a href="irc">' . DI::l10n()->t('IRC Chatroom') . '</a></div>';
 }
@@ -71,14 +71,14 @@ function irc_app_menu(App $a, array &$b)
  */
 function irc_module() {}
 
-function irc_content(App $a)
+function irc_content()
 {
        $baseurl = DI::baseUrl()->get() . '/addon/irc';
        $o = '';
 
        /* set the list of popular channels */
-       if (local_user()) {
-               $sitechats = DI::pConfig()->get( local_user(), 'irc', 'sitechats');
+       if (DI::userSession()->getLocalUserId()) {
+               $sitechats = DI::pConfig()->get( DI::userSession()->getLocalUserId(), 'irc', 'sitechats');
                if (!$sitechats) {
                        $sitechats = DI::config()->get('irc', 'sitechats');
                }
@@ -100,8 +100,8 @@ function irc_content(App $a)
        DI::page()['aside'] .= '</ul></div>';
 
         /* setting the channel(s) to auto connect */
-       if (local_user()) {
-           $autochans = DI::pConfig()->get(local_user(), 'irc', 'autochans');
+       if (DI::userSession()->getLocalUserId()) {
+           $autochans = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'irc', 'autochans');
            if (!$autochans)
                $autochans = DI::config()->get('irc','autochans');
        } else {
@@ -124,9 +124,9 @@ EOT;
        return $o;
 }
 
-function irc_addon_admin_post (App $a)
+function irc_addon_admin_post ()
 {
-       if (!$a->isSiteAdmin()) {
+       if (!DI::userSession()->isSiteAdmin()) {
                return;
        }
 
@@ -135,7 +135,7 @@ function irc_addon_admin_post (App $a)
                DI::config()->set('irc', 'sitechats', trim($_POST['sitechats']));
        }
 }
-function irc_addon_admin (App $a, string &$o) {
+function irc_addon_admin (string &$o) {
        $sitechats = DI::config()->get('irc', 'sitechats'); /* popular channels */
        $autochans = DI::config()->get('irc', 'autochans');  /* auto connect chans */
        $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/irc/' );