From: Marcel Werk Date: Tue, 23 Aug 2016 09:44:05 +0000 (+0200) Subject: Removed obsolete PreParser X-Git-Tag: 3.0.0_Beta_1~576^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=de20f77a671d677ca6da86e71dd5fdd4e9dbcd44;p=GitHub%2FWoltLab%2FWCF.git Removed obsolete PreParser --- diff --git a/CHANGELOG.md b/CHANGELOG.md index de2a90e6dc..3be05152df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -135,6 +135,7 @@ * `wcf\system\clipboard\action\UserExtendedClipboardAction` removed. * `wcf\system\event\listener\PreParserAtUserListener` removed. +* `wcf\system\bbcode\PreParser` removed. * `wcf\action\AJAXProxyAction::getData()` removed. * `wcf\system\page\PageManager` removed. * `wcf\system\option\PageMultiSelectOptionType` removed. diff --git a/wcfsetup/install/files/lib/system/bbcode/PreParser.class.php b/wcfsetup/install/files/lib/system/bbcode/PreParser.class.php deleted file mode 100644 index da71844e8f..0000000000 --- a/wcfsetup/install/files/lib/system/bbcode/PreParser.class.php +++ /dev/null @@ -1,379 +0,0 @@ - - * @package WoltLabSuite\Core\System\Bbcode - */ -class PreParser extends SingletonFactory { - /** - * forbidden characters - * @var string - */ - protected static $illegalChars = '[^\x0-\x2C\x2E\x2F\x3A-\x40\x5B-\x60\x7B-\x7F]+'; - - /** - * list of allowed bbcode tags - * @var string[] - */ - public $allowedBBCodes = null; - - /** - * regular expression for source codes - * @var string - */ - protected $sourceCodeRegEx = ''; - - /** - * text - * @var string - */ - public $text = ''; - - /** - * @inheritDoc - */ - protected function init() { - $sourceCodeTags = []; - foreach (BBCodeCache::getInstance()->getBBCodes() as $bbcode) { - if ($bbcode->isSourceCode) $sourceCodeTags[] = $bbcode->bbcodeTag; - } - if (!empty($sourceCodeTags)) $this->sourceCodeRegEx = implode('|', $sourceCodeTags); - } - - /** - * Preparses the given text. - * - * @param string $text - * @param string[] $allowedBBCodes - * @return string - */ - public function parse($text, array $allowedBBCodes = null) { - $this->text = $text; - $this->allowedBBCodes = $allowedBBCodes; - - // cache codes - $this->cacheCodes(); - - // cache url bbcodes - $this->cacheURLBBCodes(); - - // call event - EventHandler::getInstance()->fireAction($this, 'beforeParsing'); - - // parse user mentions - if ($this->allowedBBCodes === null || BBCode::isAllowedBBCode('url', $this->allowedBBCodes)) { - $this->parseUserMentions(); - } - - // parse urls - if ($this->allowedBBCodes === null || BBCode::isAllowedBBCode('media', $this->allowedBBCodes) || BBCode::isAllowedBBCode('url', $this->allowedBBCodes)) { - $this->parseURLs(); - } - - // parse email addresses - if ($this->allowedBBCodes === null || BBCode::isAllowedBBCode('email', $this->allowedBBCodes)) { - $this->parseEmails(); - } - - // call event - EventHandler::getInstance()->fireAction($this, 'afterParsing'); - - // insert cached url bbcodes - $this->insertCachedURLBBCodes(); - - // insert cached codes - $this->insertCachedCodes(); - - return $this->text; - } - - /** - * Handles pre-parsing of email addresses. - */ - protected function parseEmails() { - if (mb_strpos($this->text, '@') === false) return; - - static $emailPattern = null; - if ($emailPattern === null) { - $emailPattern = new Regex(' - (?text = $emailPattern->replace($this->text, '[email]\\0[/email]'); - } - - /** - * Handles pre-parsing of URLs. - */ - protected function parseURLs() { - static $urlPattern = null; - static $callback = null; - if ($urlPattern === null) { - $urlPattern = new Regex(' - (?()\[\]{}\s]* - (?: - [!.,?;(){}]+ [^!.,?;"\'<>()\[\]{}\s]+ - )* - )?', Regex::IGNORE_WHITESPACE | Regex::CASE_INSENSITIVE); - } - if ($callback === null) { - $callback = new Callback(function ($matches) { - if ((PreParser::getInstance()->allowedBBCodes === null || BBCode::isAllowedBBCode('media', PreParser::getInstance()->allowedBBCodes)) && BBCodeMediaProvider::isMediaURL($matches[0])) { - return '[media]'.$matches[0].'[/media]'; - } - - if (PreParser::getInstance()->allowedBBCodes === null || BBCode::isAllowedBBCode('url', PreParser::getInstance()->allowedBBCodes)) { - return '[url]'.$matches[0].'[/url]'; - } - - return $matches[0]; - }); - } - - $this->text = $urlPattern->replace($this->text, $callback); - } - - /** - * Parses user mentions. - * - * @since 3.0 - */ - protected function parseUserMentions() { - static $userRegex = null; - if ($userRegex === null) { - $userRegex = new Regex(" - (?:^|(?<=\s|\])) # either at start of string, or after whitespace - @ - ( - ([^',\s][^,\s]{2,})(?:\s[^@,\s][^,\s]*)? # either at most two strings, - # not containing the whitespace or the comma, - # not starting with a single quote - # the second string not starting with the at sign - # separated by a single whitespace character - | - '(?:''|[^']){3,}' # or a string delimited by single quotes - ) - ", Regex::IGNORE_WHITESPACE); - } - - // cache quotes - // @see \wcf\system\bbcode\BBCodeParser::buildTagArray() - $pattern = '~\[(?:/(?:quote)|(?:quote) - (?:= - (?:\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|[^,\]]*) - (?:,(?:\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|[^,\]]*))* - )?)\]~ix'; - preg_match_all($pattern, $this->text, $quoteMatches); - $textArray = preg_split($pattern, $this->text); - $text = $textArray[0]; - - $openQuotes = 0; - $quote = ''; - foreach ($quoteMatches[0] as $i => $quoteTag) { - if (mb_substr($quoteTag, 1, 1) == '/') { - $openQuotes--; - - $quote .= $quoteTag; - if ($openQuotes) { - $quote .= $textArray[$i + 1]; - } - else { - $text .= StringStack::pushToStringStack($quote, 'preParserUserMentions', '@@@').$textArray[$i + 1]; - $quote = ''; - } - } - else { - $openQuotes++; - $quote .= $quoteTag.$textArray[$i + 1]; - } - } - - if ($quote) { - $text .= $quote; - } - - $userRegex->match($text, true, Regex::ORDER_MATCH_BY_SET); - $matches = $userRegex->getMatches(); - - if (!empty($matches)) { - $usernames = []; - foreach ($matches as $match) { - // we don't care about the full match - array_shift($match); - - foreach ($match as $username) { - $username = self::getUsername($username); - if (!in_array($username, $usernames)) $usernames[] = $username; - } - } - - if (!empty($usernames)) { - // fetch users - $userList = new UserList(); - $userList->getConditionBuilder()->add('user_table.username IN (?)', [$usernames]); - $userList->readObjects(); - $users = []; - foreach ($userList as $user) { - $users[mb_strtolower($user->username)] = $user; - } - - $text = $userRegex->replace($text, new Callback(function ($matches) use ($users) { - // containing the full match - $usernames = [ - 'full' => $matches[1] - ]; - - // containing only the part before the first space - if (isset($matches[2])) $usernames['part'] = $matches[2]; - - $usernames = array_map([PreParser::class, 'getUsername'], $usernames); - - foreach ($usernames as $type => $username) { - if (!isset($users[$username])) continue; - $link = LinkHandler::getInstance()->getLink('User', [ - 'object' => $users[$username] - ]); - - $mention = "[url='".$link."']@".$users[$username]->username.'[/url]'; - - // check if only the part before the first space matched, in that case append the second word - if ($type === 'part') { - $mention .= mb_substr($matches[1], mb_strlen($matches[2])); - } - - return $mention; - } - - return $matches[0]; - })); - } - } - - // reinsert cached quotes - $this->text = StringStack::reinsertStrings($text, 'preParserUserMentions'); - } - - /** - * Caches code bbcodes to avoid parsing inside them. - */ - protected function cacheCodes() { - if (!empty($this->sourceCodeRegEx)) { - static $bbcodeRegex = null; - static $callback = null; - - if ($bbcodeRegex === null) { - $bbcodeRegex = new Regex(" - (\[(".$this->sourceCodeRegEx.") - (?:= - (?:\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|[^,\]]*) - (?:,(?:\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|[^,\]]*))* - )?\]) - (.*?) - (?:\[/\\2\])", Regex::DOT_ALL | Regex::IGNORE_WHITESPACE | Regex::CASE_INSENSITIVE); - - $callback = new Callback(function ($matches) { - return '['.StringStack::pushToStringStack(mb_substr($matches[0], 1, -1), 'preParserCode', "\0\0\0").']'; - }); - } - - $this->text = $bbcodeRegex->replace($this->text, $callback); - } - } - - /** - * Reinserts cached code bbcodes. - */ - protected function insertCachedCodes() { - $this->text = StringStack::reinsertStrings($this->text, 'preParserCode'); - } - - /** - * Caches all bbcodes that contain URLs. - */ - protected function cacheURLBBCodes() { - static $bbcodeRegex = null; - static $callback = null; - - if ($bbcodeRegex === null) { - $bbcodeRegex = new Regex(" - (?:\[quote - (?:= - (?:\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|[^,\]]*) - (?:,(?:\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|[^,\]]*))* - )?\]) - | - (?:\[(url|media|email|img) - (?:= - (?:\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|[^,\]]*) - (?:,(?:\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'|[^,\]]*))* - )?\]) - (.*?) - (?:\[/\\1\])", Regex::DOT_ALL | Regex::IGNORE_WHITESPACE | Regex::CASE_INSENSITIVE); - - $callback = new Callback(function ($matches) { - return '['.StringStack::pushToStringStack(mb_substr($matches[0], 1, -1), 'urlBBCodes', "\0\0\0").']'; - }); - } - - $this->text = $bbcodeRegex->replace($this->text, $callback); - } - - /** - * Reinserts cached url bbcodes. - */ - protected function insertCachedURLBBCodes() { - $this->text = StringStack::reinsertStrings($this->text, 'urlBBCodes'); - } - - /** - * Returns the username for the given regular expression match. - * - * @param string $match - * @return string - * @since 3.0 - */ - public static function getUsername($match) { - // remove escaped single quotation mark - $match = str_replace("''", "'", $match); - - // remove single quotation marks - if ($match{0} == "'") { - $match = mb_substr($match, 1, -1); - } - - return mb_strtolower($match); - } -} diff --git a/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php b/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php index 9767392693..aea75bcec4 100644 --- a/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php +++ b/wcfsetup/install/files/lib/system/message/QuickReplyManager.class.php @@ -7,7 +7,6 @@ use wcf\data\IMessage; use wcf\data\IMessageQuickReplyAction; use wcf\data\IVisitableObjectAction; use wcf\system\bbcode\BBCodeHandler; -use wcf\system\bbcode\PreParser; use wcf\system\event\EventHandler; use wcf\system\exception\ParentClassException; use wcf\system\exception\SystemException; @@ -188,12 +187,6 @@ class QuickReplyManager extends SingletonFactory { $parameters['data']['username'] = WCF::getUser()->username; } - // pre-parse message text - /*if ($parameters['data']['preParse']) { - $parameters['data']['message'] = PreParser::getInstance()->parse($parameters['data']['message'], $this->allowedBBodes); - } - unset($parameters['data']['preParse']);*/ - $parameters['data'] = array_merge($additionalFields, $parameters['data']); // attachment support diff --git a/wcfsetup/install/files/lib/system/option/AboutMeOptionType.class.php b/wcfsetup/install/files/lib/system/option/AboutMeOptionType.class.php index fbe7a3b932..b3bed10fbb 100644 --- a/wcfsetup/install/files/lib/system/option/AboutMeOptionType.class.php +++ b/wcfsetup/install/files/lib/system/option/AboutMeOptionType.class.php @@ -1,7 +1,6 @@ parse($newValue); - } }