Update obsolete App::getBaseUrl calls to DI::baseUrl

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

diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index f2b0f1fcdc6fceb76f2bca76b28a157392e90d78..dd48e7403cb67b91672189841dbc35fbee8a4607 100644 (file)
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -6,31 +6,32 @@
  * Author: Commander Zot
  *
  */
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\DI;
 
 function fromapp_install()
 {
-       Addon::registerHook('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
-       Addon::registerHook('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
-       Addon::registerHook('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
+       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::log("installed fromapp");
 }
 
 
 function fromapp_uninstall()
 {
-       Addon::unregisterHook('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
-       Addon::unregisterHook('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
-       Addon::unregisterHook('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
+       Hook::unregister('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
+       Hook::unregister('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
+       Hook::unregister('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
        Logger::log("removed fromapp");
 }
 
 function fromapp_settings_post($a, $post)
 {
-       if (!local_user() || (! x($_POST, 'fromapp-submit'))) {
+       if (!local_user() || empty($_POST['fromapp-submit'])) {
                return;
        }
 
@@ -48,7 +49,7 @@ function fromapp_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->getBaseURL() . '/addon/fromapp/fromapp.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/fromapp/fromapp.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 
@@ -69,7 +70,7 @@ function fromapp_settings(&$a, &$s)
        $s .= '<h3>' . L10n::t('FromApp Settings') . '</h3>';
        $s .= '</span>';
        $s .= '<div id="fromapp-wrapper">';
-       $s .= '<label id="fromapp-label" for="fromapp-input">' . L10n::t('The application name you would like to show your posts originating from.') . '</label>';
+       $s .= '<label id="fromapp-label" for="fromapp-input">' . L10n::t('The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.') . '</label>';
        $s .= '<input id="fromapp-input" type="text" name="fromapp-input" value="' . $fromapp . '" ' . '/>';
        $s .= '<div class="clear"></div>';