Fixed a missing position

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

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 96e1a9bf8fcc312b396968e3cc106bb857abc720..af383d20b7cfb6d9f45ebe0e47a704b1bacaa17c 100755 (executable)
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -74,18 +74,24 @@ function nsfw_addon_settings(&$a,&$s) {
        if(! $words)
                $words = 'nsfw,';
 
-    $s .= '<div class="settings-block">';
-    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter) settings') . '</h3>';
+    $s .= '<span id="settings_nsfw_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
+    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_nsfw_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
+    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
+    $s .= '</span>';
+
     $s .= '<div id="nsfw-wrapper">';
     $s .= '<p>' . t ('This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter.') . '</p>';
     $s .= '<label id="nsfw-enable-label" for="nsfw-enable">' . t('Enable Content filter') . ' </label>';
     $s .= '<input id="nsfw-enable" type="checkbox" name="nsfw-enable" value="1"' . $enable_checked . ' />';
        $s .= '<div class="clear"></div>';
     $s .= '<label id="nsfw-label" for="nsfw-words">' . t('Comma separated list of keywords to hide') . ' </label>';
-    $s .= '<input id="nsfw-words" type="text" name="nsfw-words" value="' . $words .'" />';
+    $s .= '<textarea id="nsfw-words" type="text" name="nsfw-words">' . $words .'</textarea>';
     $s .= '</div><div class="clear"></div>';
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="nsfw-submit" name="nsfw-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="nsfw-submit" name="nsfw-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
        $s .= '<div class="nsfw-desc">' . t('Use /expression/ to provide regular expressions') . '</div></div>';
 
        return;
@@ -126,7 +132,7 @@ function nsfw_prepare_body(&$a,&$b) {
        $found = false;
        if(count($arr)) {
 
-               $body = nsfw_extract_photos($b['html']);
+               $body = $b['item']['title'] . "\n" . nsfw_extract_photos($b['html']);
 
                foreach($arr as $word) {
                        $word = trim($word);
@@ -144,13 +150,16 @@ function nsfw_prepare_body(&$a,&$b) {
                                        $found = true;
                                        break;
                                }
-                               if(stristr($b['item']['tag'], ']' . $word . '[' )) {
-                                       $found = true;
-                                       break;
+                               if(is_array($b['item']['tags']) && count($b['item']['tags'])) {
+                                       foreach($b['item']['tags'] as $t) {
+                                               if(stristr($t, '>' . $word . '<' )) {
+                                                       $found = true;
+                                                       break;
+                                               }
+                                       }
                                }
                        } 
-               }
-               
+               }               
        }
        if($found) {
                $rnd = random_string(8);