X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=langfilter%2Flangfilter.php;h=456a2d1ca5888c09d35186c2de66692f9293367d;hb=3157c99ea7c281286ddbf711f4bc1ef62de25ca4;hp=798e1a0494ce7e39d0e33a218d47a65770a39472;hpb=f2fc22227a0dfae8f5c85f24f1c5bfa6e5c4c245;p=friendica-addons.git

diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index 798e1a04..456a2d1c 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -25,14 +25,6 @@ function langfilter_install()
 	Hook::register('addon_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post');
 }
 
-function langfilter_uninstall()
-{
-	Hook::unregister('prepare_body_content_filter', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body_content_filter');
-	Hook::unregister('prepare_body', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body');
-	Hook::unregister('addon_settings', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings');
-	Hook::unregister('addon_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post');
-}
-
 /* The settings
  * 1st check if somebody logged in is calling
  * 2nd get the current settings
@@ -45,17 +37,20 @@ function langfilter_addon_settings(App $a, &$s)
 		return;
 	}
 
-	$enable_checked = (intval(DI::pConfig()->get(local_user(), 'langfilter', 'disable')) ? '' : ' checked="checked" ');
+	$enabled = DI::pConfig()->get(local_user(), 'langfilter', 'enable',
+		!DI::pConfig()->get(local_user(), 'langfilter', 'disable'));
+
+	$enable_checked = $enabled ? ' checked="checked"' : '';
 	$languages      = DI::pConfig()->get(local_user(), 'langfilter', 'languages');
-	$minconfidence  = DI::pConfig()->get(local_user(), 'langfilter', 'minconfidence') * 100;
-	$minlength      = DI::pConfig()->get(local_user(), 'langfilter', 'minlength');
+	$minconfidence  = DI::pConfig()->get(local_user(), 'langfilter', 'minconfidence', 0) * 100;
+	$minlength      = DI::pConfig()->get(local_user(), 'langfilter', 'minlength'    , 32);
 
 	$t = Renderer::getMarkupTemplate("settings.tpl", "addon/langfilter/");
 	$s .= Renderer::replaceMacros($t, [
 		'$title'         => DI::l10n()->t("Language Filter"),
-		'$intro'         => DI::l10n()->t('This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them.'),
+		'$intro'         => DI::l10n()->t('This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'),
 		'$enabled'       => ['langfilter_enable', DI::l10n()->t('Use the language filter'), $enable_checked, ''],
-		'$languages'     => ['langfilter_languages', DI::l10n()->t('Able to read'), $languages, DI::l10n()->t('List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".')],
+		'$languages'     => ['langfilter_languages', DI::l10n()->t('Able to read'), $languages, DI::l10n()->t('List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".')],
 		'$minconfidence' => ['langfilter_minconfidence', DI::l10n()->t('Minimum confidence in language detection'), $minconfidence, DI::l10n()->t('Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.')],
 		'$minlength'     => ['langfilter_minlength', DI::l10n()->t('Minimum length of message body'), $minlength, DI::l10n()->t('Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).')],
 		'$submit'        => DI::l10n()->t('Save Settings'),
@@ -77,29 +72,18 @@ function langfilter_addon_settings_post(App $a, &$b)
 	}
 
 	if (!empty($_POST['langfilter-settings-submit'])) {
-		DI::pConfig()->set(local_user(), 'langfilter', 'languages', trim($_POST['langfilter_languages']));
-		$enable = (!empty($_POST['langfilter_enable']) ? intval($_POST['langfilter_enable']) : 0);
-		$disable = 1 - $enable;
-		DI::pConfig()->set(local_user(), 'langfilter', 'disable', $disable);
-		$minconfidence = 0 + $_POST['langfilter_minconfidence'];
-		if (!$minconfidence) {
-			$minconfidence = 0;
-		} elseif ($minconfidence < 0) {
-			$minconfidence = 0;
-		} elseif ($minconfidence > 100) {
-			$minconfidence = 100;
-		}
-		DI::pConfig()->set(local_user(), 'langfilter', 'minconfidence', $minconfidence / 100.0);
-
-		$minlength = 0 + $_POST['langfilter_minlength'];
-		if (!$minlength) {
-			$minlength = 32;
-		} elseif ($minlength < 0) {
+		$enable        = intval($_POST['langfilter_enable'] ?? 0);
+		$languages     = trim($_POST['langfilter_languages'] ?? '');
+		$minconfidence = max(0, min(100, intval($_POST['langfilter_minconfidence'] ?? 0))) / 100;
+		$minlength     = intval($_POST['langfilter_minlength'] ?? 32);
+		if ($minlength <= 0) {
 			$minlength = 32;
 		}
-		DI::pConfig()->set(local_user(), 'langfilter', 'minlength', $minlength);
 
-		info(DI::l10n()->t('Language Filter Settings saved.') . EOL);
+		DI::pConfig()->set(local_user(), 'langfilter', 'enable'       , $enable);
+		DI::pConfig()->set(local_user(), 'langfilter', 'languages'    , $languages);
+		DI::pConfig()->set(local_user(), 'langfilter', 'minconfidence', $minconfidence);
+		DI::pConfig()->set(local_user(), 'langfilter', 'minlength'    , $minlength);
 	}
 }
 
@@ -127,7 +111,9 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
 	}
 
 	// Don't filter if language filter is disabled
-	if (DI::pConfig()->get($logged_user, 'langfilter', 'disable')) {
+	if (!DI::pConfig()->get($logged_user, 'langfilter', 'enable',
+		!DI::pConfig()->get($logged_user, 'langfilter', 'disable'))
+	) {
 		return;
 	}
 
@@ -152,6 +138,8 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
 	}
 	$read_languages_array = explode(',', $read_languages_string);
 
+	$iso639 = new Matriphe\ISO639\ISO639;
+
 	// Extract the language of the post
 	if (!empty($hook_data['item']['language'])) {
 		$languages = json_decode($hook_data['item']['language'], true);
@@ -167,7 +155,7 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
 			return;
 		}
 
-		$lang = Text_LanguageDetect_ISO639::code2ToName($iso2);
+		$lang = $iso639->languageByCode1($iso2);
 	} else {
 		$opts = $hook_data['item']['postopts'];
 		if (!$opts) {
@@ -183,7 +171,7 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data)
 		$lang = $matches[1];
 		$confidence = $matches[2];
 
-		$iso2 = Text_LanguageDetect_ISO639::nameToCode2($lang);
+		$iso2 = $iso639->code1ByLanguage($lang);
 	}
 
 	// Do not filter if language detection confidence is too low