Merge pull request 'Audon audioplayer App' (#1414) from loma-one/friendica-addons...

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

diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 4872e2a08aaad26e01edbc0740729fcf0b05c398..0d5a5b16b1f19ce91e9171b0fe45db3c45750867 100644 (file)
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -6,94 +6,65 @@
  * Author: Commander Zot
  *
  */
-use Friendica\Core\Addon;
-use Friendica\Core\PConfig;
 
-function fromapp_install() {
+use Friendica\App;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\DI;
 
-       Addon::registerHook('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
-       Addon::registerHook('plugin_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
-       Addon::registerHook('plugin_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
-
-       logger("installed fromapp");
-}
-
-
-function fromapp_uninstall() {
-
-       Addon::unregisterHook('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
-       Addon::unregisterHook('plugin_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
-       Addon::unregisterHook('plugin_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
-
-
-       logger("removed fromapp");
+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");
 }
 
-function fromapp_settings_post($a,$post) {
-       if(! local_user() || (! x($_POST,'fromapp-submit')))
+function fromapp_settings_post($post)
+{
+       if (!DI::userSession()->getLocalUserId() || 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( t('Fromapp settings updated.') . EOL);
+       DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'fromapp', 'app', $_POST['fromapp-input']);
+       DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'fromapp', 'force', intval($_POST['fromapp-force']));
 }
 
-function fromapp_settings(&$a,&$s) {
-
-       if(! local_user())
+function fromapp_settings(array &$data)
+{
+       if (!DI::userSession()->getLocalUserId()) {
                return;
+       }
 
-       /* 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/fromapp/fromapp.css' . '" media="all" />' . "\r\n";
-
-       /* Get the current state of our config variable */
-
-       $fromapp = PConfig::get(local_user(),'fromapp', 'app', '');
-
-       $force = intval(PConfig::get(local_user(),'fromapp','force'));
-
-       $force_enabled = (($force) ? ' checked="checked" ' : '');
-
-       
-       /* 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>' . 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>' . t('FromApp Settings') . '</h3>';
-       $s .= '</span>';
-       $s .= '<div id="fromapp-wrapper">';
-       $s .= '<label id="fromapp-label" for="fromapp-input">' . t('The application name you would like to show your posts originating from.') . '</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">' . 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 */
+       $fromapp = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'app', '');
+       $force   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'force'));
 
-       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="fromapp-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+       $t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/fromapp/');
+       $html = Renderer::replaceMacros($t, [
+               '$fromapp' => ['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.'), $fromapp],
+               '$force'   => ['fromapp-force', DI::l10n()->t('Use this application name even if another application was used.'), $force],
+       ]);
 
+       $data = [
+               'addon' => 'fromapp',
+               'title' => DI::l10n()->t('FromApp Settings'),
+               'html'  => $html,
+       ];
 }
 
-function fromapp_post_hook(&$a, &$item)
+function fromapp_post_hook(&$item)
 {
-       if (! local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                return;
        }
 
-       if (local_user() != $item['uid']) {
+       if (DI::userSession()->getLocalUserId() != $item['uid']) {
                return;
        }
 
-       $app = PConfig::get(local_user(), 'fromapp', 'app');
-       $force = intval(PConfig::get(local_user(), 'fromapp', 'force'));
+       $app = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'app');
+       $force = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'force'));
 
        if (is_null($app) || (! strlen($app))) {
                return;