Updated nsfw.php

nsfw/nsfw.php

@@ -51,17 +51,20 @@ function nsfw_extract_photos($body)
 
 	}
 
-	if (!$cnt) {
+	if(! $cnt)
 		return $body;
-	}
+
 	return $new_body;
 }
 
-function nsfw_addon_settings(&$a, &$s)
+
-{
+
-	if (!local_user()) {
+
+function nsfw_addon_settings(&$a,&$s) {
+
+
+	if(! local_user())
 		return;
-	}
 
     /* Add our stylesheet to the page so we can make our settings look nice */
 
@@ -69,20 +72,19 @@ function nsfw_addon_settings(&$a, &$s)
 
 	$enable_checked = (intval(PConfig::get(local_user(),'nsfw','disable')) ? '' : ' checked="checked" ');
 	$words = PConfig::get(local_user(),'nsfw','words');
-	if (!$words) {
+	if(! $words)
 		$words = 'nsfw,';
-	}
 
     $s .= '<span id="settings_nsfw_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
-	$s .= '<h3>' . L10n::t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
+    $s .= '<h3>' . L10n::t('Content Filter (NSFW and more)') . '</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>' . L10n::t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
+    $s .= '<h3>' . L10n::t('Content Filter(#NSFW tag and more)') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="nsfw-wrapper">';
-	$s .= '<p>' . L10n::t('This addon 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 .= '<p>' . L10n::t('This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.') . '</p>';
     $s .= '<label id="nsfw-enable-label" for="nsfw-enable">' . L10n::t('Enable Content filter') . ' </label>';
     $s .= '<input id="nsfw-enable" type="checkbox" name="nsfw-enable" value="1"' . $enable_checked . ' />';
 	$s .= '<div class="clear"></div>';
@@ -92,47 +94,45 @@ function nsfw_addon_settings(&$a, &$s)
 
     $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="nsfw-submit" name="nsfw-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
 	$s .= '<div class="nsfw-desc">' . L10n::t('Use /expression/ to provide regular expressions') . '</div></div>';
+
 	return;
+
 }
 
-function nsfw_addon_settings_post(&$a, &$b)
+function nsfw_addon_settings_post(&$a,&$b) {
-{
+
-	if (!local_user()) {
+	if(! local_user())
 		return;
-	}
 
 	if($_POST['nsfw-submit']) {
 		PConfig::set(local_user(),'nsfw','words',trim($_POST['nsfw-words']));
-		$enable = (x($_POST,'nsfw-enable') ? intval($_POST['nsfw-enable']) : 0);
+		$enable = ((x($_POST,'nsfw-enable')) ? intval($_POST['nsfw-enable']) : 0);
 		$disable = 1-$enable;
 		PConfig::set(local_user(),'nsfw','disable', $disable);
 		info(L10n::t('NSFW Settings saved.') . EOL);
 	}
 }
 
-function nsfw_prepare_body(&$a, &$b)
+function nsfw_prepare_body(&$a,&$b) {
-{
+
-	// Don't do the check when there is a content warning
-	if (!empty($b['item']['content-warning'])) {
-		return;
-	}
 
 	$words = null;
-	if (PConfig::get(local_user(), 'nsfw', 'disable')) {
+	if(PConfig::get(local_user(),'nsfw','disable'))
 		return;
-	}
 
 	if(local_user()) {
 		$words = PConfig::get(local_user(),'nsfw','words');
 	}
 	if($words) {
 		$arr = explode(',',$words);
-	} else {
+	}
+	else {
 		$arr = ['nsfw'];
 	}
 
 	$found = false;
 	if(count($arr)) {
+
 		$body = $b['item']['title'] . "\n" . nsfw_extract_photos($b['html']);
 
 		foreach($arr as $word) {
@@ -145,7 +145,8 @@ function nsfw_prepare_body(&$a, &$b)
 					$found = true;
 					break;
 				}
-			} else {
+			}
+			else {
 				if(stristr($body,$word)) {
 					$found = true;
 					break;