X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=nsfw%2Fnsfw.php;h=6d8acbf034d7d440899cbf06609497ca0ccaade5;hb=c3e93f1ed9a487f823bcc75ddd43024334c25bfc;hp=60ab458139eb8583a5ca0247fb5e36f03453d993;hpb=ef8a46da2cd9f73992045104ceaf351cf2a78b87;p=friendica-addons.git

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 60ab4581..6d8acbf0 100755
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -9,6 +9,8 @@
  * 
  */
 
+use Friendica\Core\PConfig;
+
 function nsfw_install() {
 	register_hook('prepare_body', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body', 10);
 	register_hook('plugin_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings');
@@ -24,6 +26,37 @@ function nsfw_uninstall() {
 
 }
 
+// This function isn't perfect and isn't trying to preserve the html structure - it's just a 
+// quick and dirty filter to pull out embedded photo blobs because 'nsfw' seems to come up 
+// inside them quite often. We don't need anything fancy, just pull out the data blob so we can
+// check against the rest of the body. 
+ 
+function nsfw_extract_photos($body) {
+
+	$new_body = '';
+	
+	$img_start = strpos($body,'src="data:');
+	$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);
+	
+		$cnt ++;
+		$body = substr($body,0,$img_end);
+
+		$img_start = strpos($body,'src="data:');
+		$img_end = (($img_start !== false) ? strpos(substr($body,$img_start),'>') : false);
+
+	}
+
+	if(! $cnt)
+		return $body;
+
+	return $new_body;
+}
 
 
 
@@ -38,23 +71,29 @@ 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');
+	$enable_checked = (intval(PConfig::get(local_user(),'nsfw','disable')) ? '' : ' checked="checked" ');
+	$words = PConfig::get(local_user(),'nsfw','words');
 	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;
@@ -67,22 +106,23 @@ function nsfw_addon_settings_post(&$a,&$b) {
 		return;
 
 	if($_POST['nsfw-submit']) {
-		set_pconfig(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);
 		$disable = 1-$enable;
-		set_pconfig(local_user(),'nsfw','disable', $disable);
+		PConfig::set(local_user(),'nsfw','disable', $disable);
 		info( t('NSFW Settings saved.') . EOL);
 	}
 }
 
 function nsfw_prepare_body(&$a,&$b) {
 
+
 	$words = null;
-	if(get_pconfig(local_user(),'nsfw','disable'))
+	if(PConfig::get(local_user(),'nsfw','disable'))
 		return;
 
 	if(local_user()) {
-		$words = get_pconfig(local_user(),'nsfw','words');
+		$words = PConfig::get(local_user(),'nsfw','words');
 	}
 	if($words) {
 		$arr = explode(',',$words);
@@ -93,28 +133,35 @@ function nsfw_prepare_body(&$a,&$b) {
 
 	$found = false;
 	if(count($arr)) {
+
+		$body = $b['item']['title'] . "\n" . nsfw_extract_photos($b['html']);
+
 		foreach($arr as $word) {
 			$word = trim($word);
 			if(! strlen($word)) {
 				continue;
 			}
 			if(strpos($word,'/') === 0) {
-				if(preg_match($word,$b['html'])) {
+				if(preg_match($word,$body)) {
 					$found = true;
 					break;
 				}
 			}
 			else {
-				if(stristr($b['html'],$word)) {
+				if(stristr($body,$word)) {
 					$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);