X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=fromapp%2Ffromapp.php;h=8c01170449c6450338e5370deca8a0c8d9f190af;hb=2e9b8111fb09fd64d06e28128c0fbafa2a448c03;hp=073b632c7f0b0c4f45ccf165d656a085f50388c3;hpb=147ac6b774d4210f2e2cb7db88edded97e22a128;p=friendica-addons.git
diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 073b632c..8c011704 100644
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -6,8 +6,11 @@
* Author: Commander Zot
*
*/
+
+use Friendica\App;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
use Friendica\DI;
function fromapp_install()
@@ -15,74 +18,53 @@ 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::log("installed fromapp");
+ Logger::notice("installed fromapp");
}
-function fromapp_settings_post($a, $post)
+function fromapp_settings_post($post)
{
- if (!local_user() || empty($_POST['fromapp-submit'])) {
+ if (!DI::userSession()->getLocalUserId() || empty($_POST['fromapp-submit'])) {
return;
}
- DI::pConfig()->set(local_user(), 'fromapp', 'app', $_POST['fromapp-input']);
- DI::pConfig()->set(local_user(), 'fromapp', 'force', intval($_POST['fromapp-force']));
+ 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)
+function fromapp_settings(array &$data)
{
- if (!local_user()) {
+ if (!DI::userSession()->getLocalUserId()) {
return;
}
- /* Add our stylesheet to the page so we can make our settings look nice */
-
- DI::page()['htmlhead'] .= '' . "\r\n";
-
- /* Get the current state of our config variable */
-
- $fromapp = DI::pConfig()->get(local_user(), 'fromapp', 'app', '');
-
- $force = intval(DI::pConfig()->get(local_user(), 'fromapp', 'force'));
-
- $force_enabled = (($force) ? ' checked="checked" ' : '');
+ $fromapp = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'app', '');
+ $force = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'force'));
-
- /* Add some HTML to the existing form */
+ $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],
+ ]);
- $s .= '';
- $s .= '' . DI::l10n()->t('FromApp Settings') . '
';
- $s .= '';
- $s .= '