X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=gnot%2Fgnot.php;h=2168f97a2f17b3b8baaccd963639810f9e755c18;hb=d74c5ff0f91a63c014173dca147f07cc4d5c0240;hp=bbdf9d80ebae83e6db5a175e8f1d278986d2470b;hpb=f8d9efe8c7e57976acae3b1416220a7947ff94fc;p=friendica-addons.git

diff --git a/gnot/gnot.php b/gnot/gnot.php
index bbdf9d80..2168f97a 100644
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -7,27 +7,30 @@
  * 
  *
  */
-
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 
 function gnot_install() {
 
-	register_hook('plugin_settings', 'addon/gnot/gnot.php', 'gnot_settings');
-	register_hook('plugin_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
-	register_hook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
+	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("installed gnot");
+	Logger::log("installed gnot");
 }
 
 
 function gnot_uninstall() {
 
-	unregister_hook('plugin_settings', 'addon/gnot/gnot.php', 'gnot_settings');
-	unregister_hook('plugin_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
-	unregister_hook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
+	Hook::unregister('addon_settings', 'addon/gnot/gnot.php', 'gnot_settings');
+	Hook::unregister('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
+	Hook::unregister('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
 
 
-	logger("removed gnot");
+	Logger::log("removed gnot");
 }
 
 
@@ -42,17 +45,17 @@ 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( t('Gnot settings updated.') . EOL);
+	info(L10n::t('Gnot settings updated.') . EOL);
 }
 
 
 /**
  *
- * Called from the Plugin Setting form. 
+ * Called from the Addon Setting form. 
  * Add our own settings info to the page.
  *
  */
@@ -66,7 +69,7 @@ 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";
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/gnot/gnot.css' . '" media="all" />' . "\r\n";
 
 	/* Get the current state of our config variable */
 
@@ -74,20 +77,16 @@ function gnot_settings(&$a,&$s) {
 
 	$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>' . t('Gnot Settings') . '</h3>';
-	$s .= '<div id="gnot-wrapper">';
-	$s .= '<div id="gnot-desc">' . t("Allows threading of email comment notifications on Gmail and anonymising the subject line.") . '</div>';
-	$s .= '<label id="gnot-label" for="gnot">' . t('Enable this plugin/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="' . t('Save Settings') . '" /></div></div>';
-
+	$s .= Renderer::replaceMacros($t, [
+		'$title' => L10n::t('Gnot Settings') ,
+		'$submit' => L10n::t('Save Settings'),
+		'$enable' => L10n::t('Enable this addon?'),
+		'$enabled' => $gnot_checked,
+		'$text' => L10n::t("Allows threading of email comment notifications on Gmail and anonymising the subject line.") 
+	]);
 }
 
 
@@ -95,6 +94,5 @@ function gnot_enotify_mail(&$a,&$b) {
 	if((! $b['uid']) || (! intval(PConfig::get($b['uid'], 'gnot','enable'))))
 		return;
 	if($b['type'] == NOTIFY_COMMENT)
-		$b['subject'] = sprintf( t('[Friendica:Notify] Comment to conversation #%d'), $b['parent']);
+		$b['subject'] = L10n::t('[Friendica:Notify] Comment to conversation #%d', $b['parent']);
 }
-