perdedora/leftypol
1
0
Fork 0
forked from leftypol/leftypol
Code Pull requests Activity

bug fix causing reported post controls to be truncated/omitted

Browse source
This commit is contained in:
Savetheinternet 2011-06-04 20:18:03 +10:00
parent c7f44d5b25
commit 3d86bc9bc3
2 changed files with 34 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
inc/display.php
View file

@ -131,20 +131,23 @@
return sprintf($config['capcode'], $cap);
}
function truncate($body, $url) {
function truncate($body, $url, $max_lines = false, $max_chars = false) {
global $config;
if($max_lines === false)
$max_lines = $config['body_truncate'];
if($max_chars === false)
$max_chars = $config['body_truncate_char'];
$original_body = $body;
$lines = substr_count($body, '<br/>');
// Limit line count
if($lines > $config['body_truncate']) {
if(preg_match('/(((.*?)<br\/>){' . $config['body_truncate'] . '})/', $body, $m))
if($lines > $max_lines) {
if(preg_match('/(((.*?)<br\/>){' . $max_lines . '})/', $body, $m))
$body = $m[0];
}
$body = substr($body, 0, $config['body_truncate_char']);
$body = substr($body, 0, $max_chars);
if($body != $original_body) {
// Remove any corrupt tags at the end
@ -347,8 +350,8 @@
// Thumbnail
'<a href="' . $config['uri_img'] . $this->file.'"><img src="' . $config['uri_thumb'] . $this->thumb.'" style="width:'.$this->thumbx.'px;height:'.$this->thumby.'px;" alt="" /></a>';
} elseif($this->file == 'deleted') {
$built .= '<img src="' . $config['image_deleted'] . '" alt="" />';
} elseif($this->file == 'deleted') {
$built .= '<img src="' . $config['image_deleted'] . '" alt="" />';
}
$built .= $this->postControls();
@ -442,7 +445,11 @@
if($this->mod['type'] >= $config['mod']['bandelete'])
$built .= ' <a title="Ban & Delete" href="?/' . $board['uri'] . '/ban&amp;delete/' . $this->id . '">' . $config['mod']['link_bandelete'] . '</a>';
// Stickies
// Delete file (keep post)
if(!empty($this->file) && $this->file != 'deleted' && $this->mod['type'] >= $config['mod']['deletefile'])
$built .= ' <a title="Remove file" href="?/' . $board['uri'] . '/deletefile/' . $this->id . '">' . $config['mod']['link_deletefile'] . '</a>';
// Sticky
if($this->mod['type'] >= $config['mod']['sticky'])
if($this->sticky)
$built .= ' <a title="Make thread not sticky" href="?/' . $board['uri'] . '/unsticky/' . $this->id . '">' . $config['mod']['link_desticky'] . '</a>';
@ -456,7 +463,6 @@
else
$built .= ' <a title="Unlock thread" href="?/' . $board['uri'] . '/lock/' . $this->id . '">' . $config['mod']['link_lock'] . '</a>';
$built .= '</span>';
}
return $built;
@ -470,7 +476,7 @@
$built =
// Actual embedding
$this->embed;
} else {
} elseif(!empty($this->file) && $this->file != 'deleted') {
// Image, not embedded shit
$built =
// File link
@ -490,6 +496,8 @@
$built .= ', ' . $this->filename . ')</span></p>' .
// Thumbnail
'<a href="' . $config['uri_img'] . $this->file.'"><img src="' . $config['uri_thumb'] . $this->thumb.'" style="width:'.$this->thumbx.'px;height:'.$this->thumby.'px;" alt="" /></a>';
} elseif($this->file == 'deleted') {
$built = '<img src="' . $config['image_deleted'] . '" alt="" />';
}
$built .= '<div class="post op"><p class="intro"' . (!$index?' id="' . $this->id . '"':'') . '>';