Reworded the UI of NSFW to make it more obviously a general purpose content filter

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

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
old mode 100644 (file)
new mode 100755 (executable)
index 22d65d0..41799f1
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -38,19 +38,24 @@ function nsfw_addon_settings(&$a,&$s) {
 
     $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
 
-
+       $enable_checked = (intval(get_pconfig(local_user(),'nsfw','disable')) ? '' : ' checked="checked" ');
        $words = get_pconfig(local_user(),'nsfw','words');
        if(! $words)
                $words = 'nsfw,';
 
     $s .= '<div class="settings-block">';
-    $s .= '<h3>' . t('"Not Safe For Work" Settings') . '</h3>';
+    $s .= '<h3>' . t('Content Filter Settings') . '</h3>';
     $s .= '<div id="nsfw-wrapper">';
-    $s .= '<label id="nsfw-label" for="nsfw-words">' . t('Comma separated words to treat as NSFW') . ' </label>';
+       
+    $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 .= '</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></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="nsfw-desc">' . t('Use /expression/ to provide regular expressions') . '</div></div>';
 
        return;
 
@@ -63,6 +68,9 @@ function nsfw_addon_settings_post(&$a,&$b) {
 
        if($_POST['nsfw-submit']) {
                set_pconfig(local_user(),'nsfw','words',trim($_POST['nsfw-words']));
+               $enable = ((x($_POST,'nsfw-enable')) ? intval($_POST['nsfw-enable']) : 0);
+               $disable = 1-$enable;
+               set_pconfig(local_user(),'nsfw','disable', $disable);
                info( t('NSFW Settings saved.') . EOL);
        }
 }
@@ -70,6 +78,9 @@ function nsfw_addon_settings_post(&$a,&$b) {
 function nsfw_prepare_body(&$a,&$b) {
 
        $words = null;
+       if(get_pconfig(local_user(),'nsfw','disable'))
+               return;
+
        if(local_user()) {
                $words = get_pconfig(local_user(),'nsfw','words');
        }
@@ -86,19 +97,26 @@ function nsfw_prepare_body(&$a,&$b) {
                        if(! strlen(trim($word))) {
                                continue;
                        }
-
-                       if(stristr($b['html'],$word)) {
-                               $found = true;
-                               break;
+                       if(strpos($word,'/') === 0) {
+                               if(preg_match($word,$b['html'])) {
+                                       $found = true;
+                                       break;
+                               }
                        }
-                       if(stristr($b['item']['tag'], ']' . $word . '[' )) {
-                               $found = true;
-                               break;
+                       else {
+                               if(stristr($b['html'],$word)) {
+                                       $found = true;
+                                       break;
+                               }
+                               if(stristr($b['item']['tag'], ']' . $word . '[' )) {
+                                       $found = true;
+                                       break;
+                               }
                        } 
                }
        }
        if($found) {
                $rnd = random_string(8);
-               $b['html'] = '<div id="nsfw-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'nsfw-' . $rnd . '\'); >' . t('NSFW - Click to open/close') . '</div><div id="nsfw-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>';  
+               $b['html'] = '<div id="nsfw-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'nsfw-' . $rnd . '\'); >' . sprintf( t('%s - Click to open/close'),$word ) . '</div><div id="nsfw-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>';  
        }
 }