Merge pull request #543 from annando/nsfw-cw

nsfw now ignores content warning posts and the code has been reformatted

nsfw/nsfw.php

@@ -34,46 +34,44 @@ function nsfw_extract_photos($body)
 {
 	$new_body = '';
 
-	$img_start = strpos($body,'src="data:');
+	$img_start = strpos($body, 'src="data:');
-	$img_end = (($img_start !== false) ? strpos(substr($body,$img_start),'>') : false);
+	$img_end = (($img_start !== false) ? strpos(substr($body, $img_start), '>') : false);
 
 	$cnt = 0;
 
 	while($img_end !== false) {
 		$img_end += $img_start;
-		$new_body = $new_body . substr($body,0,$img_start);
+		$new_body = $new_body . substr($body, 0, $img_start);
 
 		$cnt ++;
-		$body = substr($body,0,$img_end);
+		$body = substr($body, 0, $img_end);
 
-		$img_start = strpos($body,'src="data:');
+		$img_start = strpos($body, 'src="data:');
-		$img_end = (($img_start !== false) ? strpos(substr($body,$img_start),'>') : false);
+		$img_end = (($img_start !== false) ? strpos(substr($body, $img_start), '>') : false);
 
 	}
 
-	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 */
 
 	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
 
-	$enable_checked = (intval(PConfig::get(local_user(),'nsfw','disable')) ? '' : ' checked="checked" ');
+	$enable_checked = (intval(PConfig::get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" ');
-	$words = PConfig::get(local_user(),'nsfw','words');
+	$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>';
@@ -94,66 +92,67 @@ 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']) {
+	if ($_POST['nsfw-submit']) {
-		PConfig::set(local_user(),'nsfw','words',trim($_POST['nsfw-words']));
+		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);
+		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()) {
+	if (local_user()) {
-		$words = PConfig::get(local_user(),'nsfw','words');
+		$words = PConfig::get(local_user(), 'nsfw', 'words');
 	}
-	if($words) {
+	if ($words) {
-		$arr = explode(',',$words);
+		$arr = explode(',', $words);
-	}
+	} else {
-	else {
 		$arr = ['nsfw'];
 	}
 
 	$found = false;
-	if(count($arr)) {
+	if (count($arr)) {
-
 		$body = $b['item']['title'] . "\n" . nsfw_extract_photos($b['html']);
 
-		foreach($arr as $word) {
+		foreach ($arr as $word) {
 			$word = trim($word);
-			if(! strlen($word)) {
+			if (!strlen($word)) {
 				continue;
 			}
-			if(strpos($word,'/') === 0) {
+			if (strpos($word,'/') === 0) {
-				if(preg_match($word,$body)) {
+				if (preg_match($word, $body)) {
 					$found = true;
 					break;
 				}
-			}
+			} else {
-			else {
+				if (stristr($body, $word)) {
-				if(stristr($body,$word)) {
 					$found = true;
 					break;
 				}
-				if(is_array($b['item']['tags']) && count($b['item']['tags'])) {
+				if (is_array($b['item']['tags']) && count($b['item']['tags'])) {
-					foreach($b['item']['tags'] as $t) {
+					foreach ($b['item']['tags'] as $t) {
-						if(stristr($t, '>' . $word . '<' )) {
+						if (stristr($t, '>' . $word . '<')) {
 							$found = true;
 							break;
 						}