diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index 836f6541f..646665e97 100644 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -1,4 +1,5 @@ ') : false); - } if (!$cnt) { @@ -87,7 +86,7 @@ function nsfw_addon_settings(&$a, &$s) $s .= ''; $s .= '
'; $s .= ''; - $s .= ''; + $s .= ''; $s .= ''; $s .= ''; @@ -103,14 +102,14 @@ function nsfw_addon_settings_post(&$a, &$b) 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; + $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(Friendica\App $a, &$b) { // Don't do the check when there is a content warning if (!empty($b['item']['content-warning'])) { @@ -125,17 +124,18 @@ function nsfw_prepare_body(&$a, &$b) if (local_user()) { $words = PConfig::get(local_user(), 'nsfw', 'words'); } + if ($words) { - $arr = explode(',', $words); + $word_list = explode(',', $words); } else { - $arr = ['nsfw']; + $word_list = ['nsfw']; } $found = false; - if (count($arr)) { + if (count($word_list)) { $body = $b['item']['title'] . "\n" . nsfw_extract_photos($b['html']); - foreach ($arr as $word) { + foreach ($word_list as $word) { $word = trim($word); if (!strlen($word)) { continue; @@ -164,6 +164,8 @@ function nsfw_prepare_body(&$a, &$b) if ($found) { $rnd = random_string(8); - $b['html'] = '