X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=gnot%2Fgnot.php;h=ca32d6d5e6134ef932ee2d713e13a1d2b4ca1b4d;hb=ca4c76ce413d52660c4019f4a693ed732ecaed58;hp=87d28063b591ac29589b61f8c73e99a0c8fc881c;hpb=39dd3dffe07efd69fa1ac6d0bd243c7fc0e3a66f;p=friendica-addons.git

diff --git a/gnot/gnot.php b/gnot/gnot.php
index 87d28063..ca32d6d5 100644
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -7,32 +7,22 @@
  * 
  *
  */
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 
-function gnot_install() {
-
-	Addon::registerHook('addon_settings', 'addon/gnot/gnot.php', 'gnot_settings');
-	Addon::registerHook('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
-	Addon::registerHook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
-
-	logger("installed gnot");
-}
-
-
-function gnot_uninstall() {
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\DI;
+use Friendica\Model\Notification;
 
-	Addon::unregisterHook('addon_settings', 'addon/gnot/gnot.php', 'gnot_settings');
-	Addon::unregisterHook('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
-	Addon::unregisterHook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
+function gnot_install() {
 
+	Hook::register('addon_settings', 'addon/gnot/gnot.php', 'gnot_settings');
+	Hook::register('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
+	Hook::register('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
 
-	logger("removed gnot");
+	Logger::log("installed gnot");
 }
 
-
-
 /**
  *
  * Callback from the settings post function.
@@ -43,11 +33,10 @@ function gnot_uninstall() {
  */
 
 function gnot_settings_post($a,$post) {
-	if(! local_user() || (! x($_POST,'gnot-submit')))
+	if(! local_user() || empty($_POST['gnot-submit']))
 		return;
 
-	PConfig::set(local_user(),'gnot','enable',intval($_POST['gnot']));
-	info(L10n::t('Gnot settings updated.') . EOL);
+	DI::pConfig()->set(local_user(),'gnot','enable',intval($_POST['gnot']));
 }
 
 
@@ -67,34 +56,30 @@ function gnot_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->get_baseurl() . '/addon/gnot/gnot.css' . '" media="all" />' . "\r\n";
+	DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/gnot/gnot.css' . '" media="all" />' . "\r\n";
 
 	/* Get the current state of our config variable */
 
-	$gnot = intval(get_pconfig(local_user(),'gnot','enable'));
+	$gnot = intval(DI::pConfig()->get(local_user(),'gnot','enable'));
 
 	$gnot_checked = (($gnot) ? ' checked="checked" ' : '' );
 	
+	$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/gnot/');
 	/* Add some HTML to the existing form */
 
-	$s .= '<div class="settings-block">';
-	$s .= '<h3>' . L10n::t('Gnot Settings') . '</h3>';
-	$s .= '<div id="gnot-wrapper">';
-	$s .= '<div id="gnot-desc">' . L10n::t("Allows threading of email comment notifications on Gmail and anonymising the subject line.") . '</div>';
-	$s .= '<label id="gnot-label" for="gnot">' . L10n::t('Enable this addon?') . '</label>';
-	$s .= '<input id="gnot-input" type="checkbox" name="gnot" value="1"'.  $gnot_checked . '/>';
-	$s .= '</div><div class="clear"></div>';
-
-	/* provide a submit button */
-
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="gnot-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
-
+	$s .= Renderer::replaceMacros($t, [
+		'$title' => DI::l10n()->t('Gnot Settings') ,
+		'$submit' => DI::l10n()->t('Save Settings'),
+		'$enable' => DI::l10n()->t('Enable this addon?'),
+		'$enabled' => $gnot_checked,
+		'$text' => DI::l10n()->t("Allows threading of email comment notifications on Gmail and anonymising the subject line.")
+	]);
 }
 
 
 function gnot_enotify_mail(&$a,&$b) {
-	if((! $b['uid']) || (! intval(get_pconfig($b['uid'], 'gnot','enable'))))
+	if((! $b['uid']) || (! intval(DI::pConfig()->get($b['uid'], 'gnot','enable'))))
 		return;
-	if($b['type'] == NOTIFY_COMMENT)
-		$b['subject'] = L10n::t('[Friendica:Notify] Comment to conversation #%d', $b['parent']);
+	if($b['type'] == Notification\Type::COMMENT)
+		$b['subject'] = DI::l10n()->t('[Friendica:Notify] Comment to conversation #%d', $b['parent']);
 }