X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=fromapp%2Ffromapp.php;h=0d5a5b16b1f19ce91e9171b0fe45db3c45750867;hb=3f2cc739369597b2199a5801397443ba03dbfcdc;hp=073b632c7f0b0c4f45ccf165d656a085f50388c3;hpb=147ac6b774d4210f2e2cb7db88edded97e22a128;p=friendica-addons.git

diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 073b632c..0d5a5b16 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'] .= '<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 */
-
-	$fromapp = DI::pConfig()->get(local_user(), 'fromapp', 'app', '');
-
-	$force = intval(DI::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>' . 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>' . DI::l10n()->t('FromApp Settings') . '</h3>';
-	$s .= '</span>';
-	$s .= '<div id="fromapp-wrapper">';
-	$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">' . 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>';
+	$fromapp = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'app', '');
+	$force   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'force'));
 
-	/* provide a submit button */
+	$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 .= '<div class="settings-submit-wrapper" ><input type="submit" name="fromapp-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
+	$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 = DI::pConfig()->get(local_user(), 'fromapp', 'app');
-	$force = intval(DI::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;