updated nsfw/nsfw.phpw

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index b2ac0d1d9dba4354641e2ce8647fba2f7f69c147..2b9c4a22b63c86c034f1ebce1aa6446e531b04d7 100644 (file)
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -34,126 +34,125 @@ function nsfw_extract_photos($body)
 {
        $new_body = '';
 
 {
        $new_body = '';
 

-       $img_start = strpos($body,'src="data:');
-       $img_end = (($img_start !== false) ? strpos(substr($body,$img_start),'>') : false);
+       $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;
 
        $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 ++;
 
                $cnt ++;

-               $body = substr($body,0,$img_end);
+               $body = substr($body, 0, $img_end);

 
 

-               $img_start = strpos($body,'src="data:');
-               $img_end = (($img_start !== false) ? strpos(substr($body,$img_start),'>') : false);
+               $img_start = strpos($body, 'src="data:');
+               $img_end = (($img_start !== false) ? strpos(substr($body, $img_start), '>') : false);

 
        }
 
 
        }
 

-       if(! $cnt)
+       if (!$cnt) {

                return $body;
                return $body;

-
+       }

        return $new_body;
 }
 
        return $new_body;
 }
 

-
-
-
-function nsfw_addon_settings(&$a,&$s) {
-
-
-       if(! local_user())
+function nsfw_addon_settings(&$a, &$s)
+{
+       if (!local_user()) {

                return;
                return;

+       }

 
 

-    /* Add our stylesheet to the page so we can make our settings look nice */
+       /* 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";
+       $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" ');
-       $words = PConfig::get(local_user(),'nsfw','words');
-       if(! $words)
+       $enable_checked = (intval(PConfig::get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" ');
+       $words = PConfig::get(local_user(), 'nsfw', 'words');
+       if (!$words) {

                $words = 'nsfw,';
                $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('Content Filter (NSFW tag 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('Content Filter (NSFW tag and more)') . '</h3>';
-    $s .= '</span>';
-
-    $s .= '<div id="nsfw-wrapper">';
-    $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 .= '<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('Content Filter (NSFW tag 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('Content Filter (NSFW tag and more)') . '</h3>';
+       $s .= '</span>';
+
+       $s .= '<div id="nsfw-wrapper">';
+       $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>';
        $s .= '<div class="clear"></div>';

-    $s .= '<label id="nsfw-label" for="nsfw-words">' . L10n::t('Comma separated list of keywords to hide') . ' </label>';
-    $s .= '<textarea id="nsfw-words" type="text" name="nsfw-words">' . $words .'</textarea>';
-    $s .= '</div><div class="clear"></div>';
+       $s .= '<label id="nsfw-label" for="nsfw-words">' . L10n::t('Comma separated list of keywords to hide') . ' </label>';
+       $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="' . L10n::t('Save Settings') . '" /></div>';
+       $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>';
        $s .= '<div class="nsfw-desc">' . L10n::t('Use /expression/ to provide regular expressions') . '</div></div>';

-

        return;
        return;

-

 }
 
 }
 

-function nsfw_addon_settings_post(&$a,&$b) {
-
-       if(! local_user())
+function nsfw_addon_settings_post(&$a, &$b)
+{
+       if (!local_user()) {

                return;
                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);
+       if ($_POST['nsfw-submit']) {
+               PConfig::set(local_user(), 'nsfw', 'words', trim($_POST['nsfw-words']));
+               $enable = (x($_POST,'nsfw-enable') ? intval($_POST['nsfw-enable']) : 0);

                $disable = 1-$enable;
                $disable = 1-$enable;

-               PConfig::set(local_user(),'nsfw','disable', $disable);
+               PConfig::set(local_user(), 'nsfw', 'disable', $disable);

                info(L10n::t('NSFW Settings saved.') . EOL);
        }
 }
 
                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;
 
        $words = null;

-       if(PConfig::get(local_user(),'nsfw','disable'))
+       if (PConfig::get(local_user(), 'nsfw', 'disable')) {

                return;
                return;

-
-       if(local_user()) {
-               $words = PConfig::get(local_user(),'nsfw','words');

        }
        }

-       if($words) {
-               $arr = explode(',',$words);
+
+       if (local_user()) {
+               $words = PConfig::get(local_user(), 'nsfw', 'words');

        }
        }

-       else {
+       if ($words) {
+               $arr = explode(',', $words);
+       } else {

                $arr = ['nsfw'];
        }
 
        $found = false;
                $arr = ['nsfw'];
        }
 
        $found = false;

-       if(count($arr)) {
-
+       if (count($arr)) {

                $body = $b['item']['title'] . "\n" . nsfw_extract_photos($b['html']);
 
                $body = $b['item']['title'] . "\n" . nsfw_extract_photos($b['html']);
 

-               foreach($arr as $word) {
+               foreach ($arr as $word) {

                        $word = trim($word);
                        $word = trim($word);

-                       if(! strlen($word)) {
+                       if (!strlen($word)) {

                                continue;
                        }
                                continue;
                        }

-                       if(strpos($word,'/') === 0) {
-                               if(preg_match($word,$body)) {
+                       if (strpos($word,'/') === 0) {
+                               if (preg_match($word, $body)) {

                                        $found = true;
                                        break;
                                }
                                        $found = true;
                                        break;
                                }

-                       }
-                       else {
-                               if(stristr($body,$word)) {
+                       } else {
+                               if (stristr($body, $word)) {

                                        $found = true;
                                        break;
                                }
                                        $found = true;
                                        break;
                                }

-                               if(is_array($b['item']['tags']) && count($b['item']['tags'])) {
-                                       foreach($b['item']['tags'] as $t) {
-                                               if(stristr($t, '>' . $word . '<' )) {
+                               if (is_array($b['item']['tags']) && count($b['item']['tags'])) {
+                                       foreach ($b['item']['tags'] as $t) {
+                                               if (stristr($t, '>' . $word . '<')) {

                                                        $found = true;
                                                        break;
                                                }
                                                        $found = true;
                                                        break;
                                                }


@@ -168,3 +167,4 @@ function nsfw_prepare_body(&$a,&$b) {
                $b['html'] = '<div id="nsfw-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'nsfw-' . $rnd . '\'); >' . L10n::t('%s - Click to open/close', $word) . '</div><div id="nsfw-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>';
        }
 }
                $b['html'] = '<div id="nsfw-wrap-' . $rnd . '" class="fakelink" onclick=openClose(\'nsfw-' . $rnd . '\'); >' . L10n::t('%s - Click to open/close', $word) . '</div><div id="nsfw-' . $rnd . '" style="display: none; " >' . $b['html'] . '</div>';
        }
 }

+