Merge pull request #1046 from annando/twitter-fix-reshare

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

diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 5a18ab5..073b632 100644 (file)
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -7,9 +7,7 @@
  *
  */
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 
 function fromapp_install()
@@ -20,25 +18,14 @@ function fromapp_install()
        Logger::log("installed fromapp");
 }
 
-
-function fromapp_uninstall()
-{
-       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() || empty($_POST['fromapp-submit'])) {
                return;
        }
 
-       PConfig::set(local_user(), 'fromapp', 'app', $_POST['fromapp-input']);
-       PConfig::set(local_user(), 'fromapp', 'force', intval($_POST['fromapp-force']));
-
-       info(L10n::t('Fromapp settings updated.') . EOL);
+       DI::pConfig()->set(local_user(), 'fromapp', 'app', $_POST['fromapp-input']);
+       DI::pConfig()->set(local_user(), 'fromapp', 'force', intval($_POST['fromapp-force']));
 }
 
 function fromapp_settings(&$a, &$s)
@@ -63,25 +50,25 @@ function fromapp_settings(&$a, &$s)
        /* Add some HTML to the existing form */
 
        $s .= '<span id="settings_fromapp_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromapp_expanded\'); openClose(\'settings_fromapp_inflated\');">';
-       $s .= '<h3>' . L10n::t('FromApp Settings') . '</h3>';
+       $s .= '<h3>' . DI::l10n()->t('FromApp Settings') . '</h3>';
        $s .= '</span>';
        $s .= '<div id="settings_fromapp_expanded" class="settings-block" style="display: none;">';
        $s .= '<span class="fakelink" onclick="openClose(\'settings_fromapp_expanded\'); openClose(\'settings_fromapp_inflated\');">';
-       $s .= '<h3>' . L10n::t('FromApp Settings') . '</h3>';
+       $s .= '<h3>' . DI::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. Separate different app names with a comma. A random one will then be selected for every posting.') . '</label>';
+       $s .= '<label id="fromapp-label" for="fromapp-input">' . DI::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>';
 
-       $s .= '<label id="fromapp-force-label" for="fromapp-force">' . L10n::t('Use this application name even if another application was used.') . '</label>';
+       $s .= '<label id="fromapp-force-label" for="fromapp-force">' . DI::l10n()->t('Use this application name even if another application was used.') . '</label>';
        $s .= '<input id="fromapp-force" type="checkbox" name="fromapp-force" value="1" ' . $force_enabled . '/>';
 
        $s .= '</div><div class="clear"></div>';
 
        /* provide a submit button */
 
-       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="fromapp-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="fromapp-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
 }
 
 function fromapp_post_hook(&$a, &$item)