ignore embedded photo binary blobs in n-s-f-w processing

diff --git a/impressum.tgz b/impressum.tgz
index d87f17f712fb524ed8467fb51daccf44fd7f3023..8c36df6f2b4afa2bdd1a5c080103f3375cb73389 100755 (executable)
Binary files a/impressum.tgz and b/impressum.tgz differ

diff --git a/jappixmini.tgz b/jappixmini.tgz
index 212bb25e62e6ff3f3c8e3a1adab670901b745776..1e390431e1218943ab36837b40c553266e778a2c 100644 (file)
Binary files a/jappixmini.tgz and b/jappixmini.tgz differ

diff --git a/nsfw.tgz b/nsfw.tgz
index 73870dc3f95647424b8b69a1b7b52eeb276cfd0a..a35ec568c11d4cc7dd0ddac92eee396650de8457 100755 (executable)
Binary files a/nsfw.tgz and b/nsfw.tgz differ

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 60ab458139eb8583a5ca0247fb5e36f03453d993..96e1a9bf8fcc312b396968e3cc106bb857abc720 100755 (executable)
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -24,6 +24,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;
+}
 
 
 
@@ -77,6 +108,7 @@ function nsfw_addon_settings_post(&$a,&$b) {
 
 function nsfw_prepare_body(&$a,&$b) {
 
+
        $words = null;
        if(get_pconfig(local_user(),'nsfw','disable'))
                return;
@@ -93,19 +125,22 @@ function nsfw_prepare_body(&$a,&$b) {
 
        $found = false;
        if(count($arr)) {
+
+               $body = 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;
                                }
@@ -115,6 +150,7 @@ function nsfw_prepare_body(&$a,&$b) {
                                }
                        } 
                }
+               
        }
        if($found) {
                $rnd = random_string(8);