From: Marcel Werk Date: Tue, 25 Dec 2012 21:06:37 +0000 (+0100) Subject: Unified usage of the horizontal ellipsis character X-Git-Tag: 2.0.0_Beta_1~639^2~6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=df27a012fa14632062ca6785b96a63930fa269f3;p=GitHub%2FWoltLab%2FWCF.git Unified usage of the horizontal ellipsis character --- diff --git a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php index 5f64bd3886..393cf893a3 100644 --- a/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php +++ b/wcfsetup/install/files/lib/system/template/plugin/PagesFunctionTemplatePlugin.class.php @@ -176,7 +176,7 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { $html .= $this->makeLink($link, 2, $tagArgs['page']); } else { - $html .= '
  • …
    • '."\n"; + $html .= '
  • '.StringUtil::HELLIP.'
    • '."\n"; } } @@ -191,7 +191,7 @@ class PagesFunctionTemplatePlugin implements IFunctionTemplatePlugin { $html .= $this->makeLink($link, $tagArgs['pages'] - 1, $tagArgs['page']); } else { - $html .= '
  • …
    • '."\n"; + $html .= '
  • '.StringUtil::HELLIP.'
    • '."\n"; } } diff --git a/wcfsetup/install/files/lib/util/StringUtil.class.php b/wcfsetup/install/files/lib/util/StringUtil.class.php index 06a347b5f1..228275b257 100644 --- a/wcfsetup/install/files/lib/util/StringUtil.class.php +++ b/wcfsetup/install/files/lib/util/StringUtil.class.php @@ -5,7 +5,7 @@ use wcf\system\WCF; /** * Contains string-related functions. * - * @author Marcel Werk + * @author Oliver Kliebisch, Marcel Werk * @copyright 2001-2012 WoltLab GmbH * @license GNU Lesser General Public License * @package com.woltlab.wcf @@ -19,6 +19,12 @@ final class StringUtil { ))*\s*/?>~ix'; const HTML_COMMENT_PATTERN = '~~'; + /** + * utf8 bytes of the horizontal ellipsis char + * @var string + */ + const HELLIP = "\xE2\x80\xA6"; + /** * Returns a salted hash of the given value. * @@ -587,7 +593,7 @@ final class StringUtil { * @param boolean $breakWords should words be broken in the middle * @return string */ - public static function truncate($string, $length = 80, $etc = '…', $breakWords = false) { + public static function truncate($string, $length = 80, $etc = StringUtil::HELLIP, $breakWords = false) { if ($length == 0) { return ''; } @@ -606,6 +612,118 @@ final class StringUtil { } } + /** + * Truncates a string containing HTML code and keeps the HTML syntax intact. + * + * @param string $string string which shall be truncated + * @param integer $length string length after truncating + * @param boolean $wordWrap if true words will not be split and the return string might be shorter than $length + * @param string $etc ending string which will be appended after truncating + * @return string truncated string + */ + public static function truncateHTML($string, $length = 500, $wordWrap = true, $etc = StringUtil::HELLIP) { + if (StringUtil::length(StringUtil::stripHTML($string)) <= $length) { + return $string; + } + $openTags = array(); + $truncatedString = ''; + + // initalize length counter with the ending length + $totalLength = StringUtil::length($etc); + + preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $string, $tags, PREG_SET_ORDER); + + foreach ($tags as $tag) { + // filter standalone html tags + if (!preg_match('/area|base|basefont|br|col|frame|hr|img|input|isindex|link|meta|param/s', $tag[2])) { + // look for opening tags + if (preg_match('/<[\w]+[^>]*>/s', $tag[0])) { + array_unshift($openTags, $tag[2]); + } + /** + * look for closing tags and check if this tag has a corresponding opening tag + * and omit the opening tag if it has been closed already + */ + else if (preg_match('/<\/([\w]+)[^>]*>/s', $tag[0], $closeTag)) { + $position = array_search($closeTag[1], $openTags); + if ($position !== false) { + array_splice($openTags, $position, 1); + } + } + } + // append tag + $truncatedString .= $tag[1]; + + // get length of the content without entities. If the content is too long, keep entities intact + $contentLength = StringUtil::length(StringUtil::decodeHTML($tag[3])); + if ($contentLength + $totalLength > $length) { + $left = $length - $totalLength; + $entitiesLength = 0; + if (preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', $tag[3], $entities, PREG_OFFSET_CAPTURE)) { + foreach ($entities[0] as $entity) { + if ($entity[1] + 1 - $entitiesLength <= $left) { + $left--; + $entitiesLength += StringUtil::length($entity[0]); + } + else { + break; + } + } + } + $truncatedString .= StringUtil::substring($tag[3], 0 , $left + $entitiesLength); + break; + } + else { + $truncatedString .= $tag[3]; + $totalLength += $contentLength; + } + if ($totalLength >= $length) { + break; + } + } + + // if word wrap is active search for the last word change + if ($wordWrap) { + $lastWhitespace = StringUtil::lastIndexOf($truncatedString, ' '); + // check if inside a tag + $lastOpeningTag = StringUtil::lastIndexOf($truncatedString, '<'); + if ($lastOpeningTag < $lastWhitespace) { + $lastClosingTag = StringUtil::lastIndexOf($truncatedString, '>'); + if (($lastClosingTag === false || $lastClosingTag > $lastWhitespace) && $lastClosingTag > $lastOpeningTag) { + $lastWhitespace = $lastOpeningTag; + array_shift($openTags); + if ($truncatedString[$lastWhitespace] != ' ') { + $firstPart = StringUtil::substring($truncatedString, 0, $lastWhitespace); + $secondPart = StringUtil::substring($truncatedString, $lastWhitespace + 1); + $truncatedString = $firstPart.' '.$secondPart; + } + } + } + if ($lastWhitespace !== false) { + $endString = StringUtil::substring($truncatedString, $lastWhitespace); + preg_match_all('/<\/([a-z]+)>/', $endString, $tagOverhead, PREG_SET_ORDER); + if (count($tagOverhead)) { + foreach ($tagOverhead as $tag) { + if (!in_array($tag[1], $openTags)) { + array_unshift($openTags, $tag[1]); + } + } + } + $truncatedString = StringUtil::substring($truncatedString, 0, $lastWhitespace); + } + } + + // close all open tags + foreach ($openTags as $tag) { + $truncatedString .= ''; + } + + // add etc + $truncatedString .= $etc; + + return $truncatedString; + } + /** * Splits given string into smaller chunks. * diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 64b5999ff8..f98f68c385 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -372,9 +372,9 @@ - + - + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 0b66f850ae..58dc396cf3 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -312,9 +312,9 @@ - + - +