[showmore] Prevent use with content filters

pull/566/head
Hypolite Petovan 2018-04-01 02:32:58 -04:00
parent 635bea65f7
commit 02eb1b74f7
1 changed files with 22 additions and 16 deletions

View File

@ -107,26 +107,32 @@ function get_body_length($body) {
return strlen($string); return strlen($string);
} }
function showmore_prepare_body(&$a,&$b) { function showmore_prepare_body(\Friendica\App $a, &$hook_data)
{
$words = null; // No combination with content filters
if(PConfig::get(local_user(),'showmore','disable')) if (!empty($hook_data['filter_reasons'])) {
return; return;
}
if (PConfig::get(local_user(), 'showmore', 'disable')) {
return;
}
$chars = (int) PConfig::get(local_user(), 'showmore', 'chars'); $chars = (int) PConfig::get(local_user(), 'showmore', 'chars');
if(!$chars) if (!$chars) {
$chars = 1100; $chars = 1100;
}
if (get_body_length($b['html']) > $chars) { if (get_body_length($hook_data['html']) > $chars) {
$found = true; $found = true;
$shortened = trim(showmore_cutitem($b['html'], $chars))."..."; $shortened = trim(showmore_cutitem($hook_data['html'], $chars)) . "...";
} }
if ($found) { if ($found) {
$rnd = random_string(8); $rnd = random_string(8);
$b['html'] = '<span id="showmore-teaser-'.$rnd.'" class="showmore-teaser" style="display: block;">'.$shortened." ". $hook_data['html'] = '<span id="showmore-teaser-' . $rnd . '" class="showmore-teaser" style="display: block;">' . $shortened . " " .
'<span id="showmore-wrap-' . $rnd . '" style="white-space:nowrap;" class="showmore-wrap fakelink" onclick="openClose(\'showmore-' . $rnd . '\'); openClose(\'showmore-teaser-' . $rnd . '\');" >' . L10n::t('show more') . '</span></span>' . '<span id="showmore-wrap-' . $rnd . '" style="white-space:nowrap;" class="showmore-wrap fakelink" onclick="openClose(\'showmore-' . $rnd . '\'); openClose(\'showmore-teaser-' . $rnd . '\');" >' . L10n::t('show more') . '</span></span>' .
'<div id="showmore-'.$rnd.'" class="showmore-content" style="display: none;">'.$b['html'].'</div>'; '<div id="showmore-' . $rnd . '" class="showmore-content" style="display: none;">' . $hook_data['html'] . '</div>';
} }
} }