Merge pull request #936 from MrPetovan/bug/notices

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

diff --git a/startpage/startpage.php b/startpage/startpage.php
index 00079f9..11633d4 100644 (file)
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -6,21 +6,23 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  *
  */
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Core\System;
+use Friendica\DI;
 
 function startpage_install() {
-       Addon::registerHook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
-       Addon::registerHook('addon_settings', 'addon/startpage/startpage.php', 'startpage_settings');
-       Addon::registerHook('addon_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
+       Hook::register('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
+       Hook::register('addon_settings', 'addon/startpage/startpage.php', 'startpage_settings');
+       Hook::register('addon_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
 }
 
 function startpage_uninstall()
 {
-       Addon::unregisterHook('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
-       Addon::unregisterHook('addon_settings', 'addon/startpage/startpage.php', 'startpage_settings');
-       Addon::unregisterHook('addon_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
+       Hook::unregister('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
+       Hook::unregister('addon_settings', 'addon/startpage/startpage.php', 'startpage_settings');
+       Hook::unregister('addon_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
 }
 
 function startpage_home_init($a, $b)
@@ -31,7 +33,7 @@ function startpage_home_init($a, $b)
 
        $page = PConfig::get(local_user(), 'startpage', 'startpage');
        if (strlen($page)) {
-               goaway($page);
+               DI::baseUrl()->redirect($page);
        }
        return;
 }
@@ -70,7 +72,7 @@ function startpage_settings(&$a, &$s)
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/startpage/startpage.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/startpage/startpage.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */