Cleanup implementation of langfilter_prepare_body, and fix a typo

diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index f7ccd0a6d04d7ef380da131f6fd58705f037646b..d9d35dbe90c36e4baeae7bfb4ce7ebd795c2a6f9 100644 (file)
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -43,7 +43,7 @@ function langfilter_addon_settings(&$a,&$s) {
            '$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 for languages you speak, comma seperated. For excample "de,it".') ),
+           '$languages' => array('langfilter_languages', t('I speak'), $languages, t('List of abbreviations (iso2 codes) for languages you speak, comma separated. For excample "de,it".') ),
            '$submit' => t('Save Settings'),
        ));
 
@@ -63,55 +63,56 @@ function langfilter_addon_settings_post(&$a,&$b) {
                $enable = ((x($_POST,'langfilter_enable')) ? intval($_POST['langfilter_enable']) : 0);
                $disable = 1-$enable;
                set_pconfig(local_user(),'langfilter','disable', $disable);
+               set_pconfig(local_user(),'langfilter','minconfidence', $disable);
                info( t('Language Filter Settings saved.') . EOL);
        }
 }
 /* Actually filter postings by their language
  * 1st check if the user wants to filter postings
  * 2nd get the user settings which languages shall be not filtered out
- * 3rd determine the language of a posting
+ * 3rd extract the language of a posting
  * 4th if the determined language does not fit to the spoken languages
  *     of the user, then collapse the posting, but provide a link to
  *     expand it again.
  */
 function langfilter_prepare_body(&$a,&$b) {
-       if(get_pconfig(local_user(),'langfilter','disable'))
-               return;
 
-       # Never filter own messages
-       # TODO: find a better way to extract this
-       $logged_user_profile = $a->config['system']['url'] . '/profile/' . $a->user['nickname'];
-       if ( $logged_user_profile == $b['item']['author-link'] ) return;
+    $logged_user = local_user();
+    if ( ! $logged_user ) return;
 
-       if(local_user()) {
-               $langs = get_pconfig(local_user(),'langfilter','languages');
-       }
-       if($langs) {
-               $arr = explode(',',$langs);
-       } else {
-               return;
-       }
+    # Never filter own messages
+    # TODO: find a better way to extract this
+    $logged_user_profile = $a->config['system']['url'] . '/profile/' . $a->user['nickname'];
+    if ( $logged_user_profile == $b['item']['author-link'] ) return;
 
-       $found = false;
+    # Don't filter if language filter is disabled
+    if( get_pconfig($logged_user,'langfilter','disable') ) return;
 
+    $spoken_config = get_pconfig(local_user(),'langfilter','languages');
+
+    # Don't filter if no spoken languages are configured 
+    if ( ! $spoken_config ) return;
+    $spoken_languages = explode(',', $spoken_config);
+
+    # Extract the language of the post
     $opts = $b['item']['postopts'];
-    if ( $opts ) {
-      if ( preg_match('/^lang=([^;]*)/', $opts, $matches ) )
-      {
-         $lang = $matches[1];
-        $lng = Text_LanguageDetect_ISO639::nameToCode2($lang);
-      }
+    if ( ! $opts ) return; # no options associated to post
+    if ( ! preg_match('/\blang=([^;]*);([^:]*)/', $opts, $matches ) )
+            return; # no lang options associated to post
+
+    $lang = $matches[1];
+    $confidence = $matches[2];
+
+    # TODO: accept a confidence threshold in settings
+
+    $iso2 = Text_LanguageDetect_ISO639::nameToCode2($lang);
+
+    if ( ! $iso2 ) return;
+    $spoken = in_array($iso2, $spoken_languages);
+
+    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>';
     }
-    if ($lng==null)
-               return;
-    if (! in_array($lng, $arr))
-               $found = true;
-       if ($lng==null)
-               $found = false;
-
-       if($found) {
-               $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>';
-       }
 }
 ?>