Merge pull request #487 from MrPetovan/task/switch-to-array-new-style

[friendica-addons.git] / langfilter / langfilter.php

diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index 9dcb3ed1eb28622876f3330921197626f9b1c0a8..e8e9097542bf83ffef35af9eb11908bbe9b9dd4d 100644 (file)
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -8,8 +8,8 @@
  * License: MIT
  */
 
-require_once('library/langdet/Text/LanguageDetect.php');
 use Friendica\App;
+use Friendica\Core\PConfig;
 
 /* Define the hooks we want to use
  * that is, we have settings, we need to save the settings and we want
@@ -42,25 +42,25 @@ function langfilter_addon_settings(App $a, &$s)
                return;
        }
 
-       $enable_checked = (intval(get_pconfig(local_user(), 'langfilter', 'disable')) ? '' : ' checked="checked" ');
-       $languages      = get_pconfig(local_user(), 'langfilter', 'languages');
-       $minconfidence  = get_pconfig(local_user(), 'langfilter', 'minconfidence') * 100;
-       $minlength      = get_pconfig(local_user(), 'langfilter', 'minlength');
+       $enable_checked = (intval(PConfig::get(local_user(), 'langfilter', 'disable')) ? '' : ' checked="checked" ');
+       $languages      = PConfig::get(local_user(), 'langfilter', 'languages');
+       $minconfidence  = PConfig::get(local_user(), 'langfilter', 'minconfidence') * 100;
+       $minlength      = PConfig::get(local_user(), 'langfilter', 'minlength');
 
        if (!$languages) {
                $languages = 'en,de,fr,it,es';
        }
 
        $t = get_markup_template("settings.tpl", "addon/langfilter/");
-       $s .= replace_macros($t, array(
+       $s .= replace_macros($t, [
                '$title'         => t("Language Filter"),
                '$intro'         => t('This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings.'),
-               '$enabled'       => array('langfilter_enable', t('Use the language filter'), $enable_checked, ''),
-               '$languages'     => array('langfilter_languages', t('I speak'), $languages, t('List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".')),
-               '$minconfidence' => array('langfilter_minconfidence', t('Minimum confidence in language detection'), $minconfidence, 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'     => array('langfilter_minlength', t('Minimum length of message body'), $minlength, t('Minimum length of message body for language filter to be used. Posts shorter than this number of characters will not be filtered.')),
+               '$enabled'       => ['langfilter_enable', t('Use the language filter'), $enable_checked, ''],
+               '$languages'     => ['langfilter_languages', t('I speak'), $languages, t('List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".')],
+               '$minconfidence' => ['langfilter_minconfidence', t('Minimum confidence in language detection'), $minconfidence, 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', t('Minimum length of message body'), $minlength, t('Minimum length of message body for language filter to be used. Posts shorter than this number of characters will not be filtered.')],
                '$submit'        => t('Save Settings'),
-       ));
+       ]);
 
        return;
 }
@@ -78,27 +78,27 @@ function langfilter_addon_settings_post(App $a, &$b)
        }
 
        if ($_POST['langfilter-settings-submit']) {
-               set_pconfig(local_user(), 'langfilter', 'languages', trim($_POST['langfilter_languages']));
+               PConfig::set(local_user(), 'langfilter', 'languages', trim($_POST['langfilter_languages']));
                $enable = ((x($_POST, 'langfilter_enable')) ? intval($_POST['langfilter_enable']) : 0);
                $disable = 1 - $enable;
-               set_pconfig(local_user(), 'langfilter', 'disable', $disable);
+               PConfig::set(local_user(), 'langfilter', 'disable', $disable);
                $minconfidence = 0 + $_POST['langfilter_minconfidence'];
                if (!$minconfidence) {
                        $minconfidence = 0;
-               } else if ($minconfidence < 0) {
+               } elseif ($minconfidence < 0) {
                        $minconfidence = 0;
-               } else if ($minconfidence > 100) {
+               } elseif ($minconfidence > 100) {
                        $minconfidence = 100;
                }
-               set_pconfig(local_user(), 'langfilter', 'minconfidence', $minconfidence / 100.0);
+               PConfig::set(local_user(), 'langfilter', 'minconfidence', $minconfidence / 100.0);
 
                $minlength = 0 + $_POST['langfilter_minlength'];
                if (!$minlength) {
                        $minlength = 32;
-               } else if ($minlengt8h < 0) {
+               } elseif ($minlengt8h < 0) {
                        $minlength = 32;
                }
-               set_pconfig(local_user(), 'langfilter', 'minlength', $minlength);
+               PConfig::set(local_user(), 'langfilter', 'minlength', $minlength);
 
                info(t('Language Filter Settings saved.') . EOL);
        }
@@ -122,18 +122,18 @@ function langfilter_prepare_body(App $a, &$b)
 
        // Never filter own messages
        // TODO: find a better way to extract this
-       $logged_user_profile = $a->config['system']['url'] . '/profile/' . $a->user['nickname'];
+       $logged_user_profile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
        if ($logged_user_profile == $b['item']['author-link']) {
                return;
        }
 
        // Don't filter if language filter is disabled
-       if (get_pconfig($logged_user, 'langfilter', 'disable')) {
+       if (PConfig::get($logged_user, 'langfilter', 'disable')) {
                return;
        }
 
        // Don't filter if body lenght is below minimum
-       $minlen = get_pconfig(local_user(), 'langfilter', 'minlength');
+       $minlen = PConfig::get(local_user(), 'langfilter', 'minlength');
        if (!$minlen) {
                $minlen = 32;
        }
@@ -141,8 +141,8 @@ function langfilter_prepare_body(App $a, &$b)
                return;
        }
 
-       $spoken_config = get_pconfig(local_user(), 'langfilter', 'languages');
-       $minconfidence = get_pconfig(local_user(), 'langfilter', 'minconfidence');
+       $spoken_config = PConfig::get(local_user(), 'langfilter', 'languages');
+       $minconfidence = PConfig::get(local_user(), 'langfilter', 'minconfidence');
 
        // Don't filter if no spoken languages are configured
        if (!$spoken_config)
@@ -177,6 +177,6 @@ function langfilter_prepare_body(App $a, &$b)
 
        if (!$spoken) {
                $rnd = random_string(8);
-               $b['html'] = '<div id="langfilter-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'langfilter-' . $rnd . '\'); >' . sprintf(t('unspoken language %s - Click to open/close'), $lang) . '</div><div id="langfilter-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>';
+               $b['html'] = '<div id="langfilter-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'langfilter-' . $rnd . '\'); >' . t('unspoken language %s - Click to open/close', $lang) . '</div><div id="langfilter-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>';
        }
 }