Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ticket/634] Move get_sub_taged_string to fetch_posts

Browse Source 
B3P-634
This commit is contained in:
Marc Alexander
2015-06-23 16:02:08 +02:00
parent 1eb4dc0e8e
commit 668040b48e
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
includes/functions.php
View File

@@ -128,27 +128,6 @@ function character_limit(&$title, $limit = 0)
}
}
/**
* Cut post text to given length
*
* @param string $message post text
* @param string $bbcode_uid bbcode uid
* @param int $length The desired length
*
* @return string Shortened message
*/
function get_sub_taged_string($message, $bbcode_uid, $length)
{
if (class_exists('\Nickvergessen\TrimMessage\TrimMessage'))
{
$trim = new \Nickvergessen\TrimMessage\TrimMessage($message, $bbcode_uid, $length);
$message = $trim->message();
unset($trim);
}
return $message;
}
function ap_validate($str)
{
$s = str_replace('<br />', '<br/>', $str);

23
portal/fetch_posts.php
View File

@@ -627,7 +627,7 @@ class fetch_posts
if ($text_length > 0 && (strlen($row['post_text']) > $text_length))
{
$message = str_replace(array("\n", "\r"), array('<br />', "\n"), $row['post_text']);
$message = get_sub_taged_string($message, $row['bbcode_uid'], $text_length);
$message = $this->shorten_message($message, $row['bbcode_uid'], $text_length);
$posts_striped = true;
}
else
@@ -637,4 +637,25 @@ class fetch_posts
return $message;
}
/**
* Shorten message to specified length
*
* @param string $message Post text
* @param string $bbcode_uid BBCode UID
* @param int $length Length the text should have after shortening
*
* @return string Shortened messsage
*/
public function shorten_message($message, $bbcode_uid, $length)
{
if (class_exists('\Nickvergessen\TrimMessage\TrimMessage'))
{
$trim = new \Nickvergessen\TrimMessage\TrimMessage($message, $bbcode_uid, $length);
$message = $trim->message();
unset($trim);
}
return $message;
}
}

3
tests/unit/portal/fetch_posts_test.php
View File

@@ -10,6 +10,9 @@
require_once(dirname(__FILE__) . '/../../../../../../includes/functions_acp.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/functions.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/utf/utf_tools.php');
require_once(dirname(__FILE__) . '/../../../vendor/nickvergessen/phpbb-tool-trimmessage/src/Nickvergessen/TrimMessage/TrimMessage.php');
require_once(dirname(__FILE__) . '/../../../vendor/nickvergessen/phpbb-tool-trimmessage/src/Nickvergessen/TrimMessage/PhpbbBbcodes.php');
class phpbb_portal_fetch_posts_test extends \board3\portal\tests\testframework\database_test_case
{