tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PluginOutput: fix links only if there is any HTML 

refs #11796
This commit is contained in:
Alexander A. Klimov 2016-05-20 13:11:09 +02:00
parent ac96d16af0
commit 7cfdbfccdb
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
modules/monitoring/application/views/helpers/PluginOutput.php
View File

@ -52,6 +52,13 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
*/ */
protected $zeroWidthSpace; protected $zeroWidthSpace;
/**
* The encoded character ​
*
* @var string
*/
protected $zeroWidthSpaceEnt = '​';
/** /**
* Create a new Zend_View_Helper_PluginOutput * Create a new Zend_View_Helper_PluginOutput
*/ */
@ -59,7 +66,7 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
{ {
// This is actually not required as the value is constant, // This is actually not required as the value is constant,
// but as its (visual) length is 0, it's likely to be mixed up with the empty string. // but as its (visual) length is 0, it's likely to be mixed up with the empty string.
$this->zeroWidthSpace = html_entity_decode('​', ENT_NOQUOTES, 'UTF-8'); $this->zeroWidthSpace = html_entity_decode($this->zeroWidthSpaceEnt, ENT_NOQUOTES, 'UTF-8');
} }
/** /**
@ -84,16 +91,23 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
$this->getPurifier()->purify($output) $this->getPurifier()->purify($output)
); );
$isHtml = true; $isHtml = true;
$useDom = true;
} else { } else {
// Plaintext // Plaintext
$count = 0;
$output = preg_replace( $output = preg_replace(
self::$txtPatterns, self::$txtPatterns,
self::$txtReplacements, self::$txtReplacements,
$this->view->escape($output) $this->view->escape($output),
-1,
$count
); );
$isHtml = false; $isHtml = false;
$useDom = (bool) $count;
} }
$output = $this->fixLinksAndWrapping($output);
$output = $useDom ? $this->fixLinksAndWrapping($output) : $this->fixWrapping($output, $this->zeroWidthSpaceEnt);
// Help browsers to break words in plugin output // Help browsers to break words in plugin output
$output = trim($output); $output = trim($output);
// Add space after comma where missing // Add space after comma where missing
@ -184,14 +198,27 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
protected function fixWrappingRecursive(DOMNode $node) protected function fixWrappingRecursive(DOMNode $node)
{ {
if ($node instanceof DOMText) { if ($node instanceof DOMText) {
// Add zero width space after ')', ']', ':', '.', '_' and '-' if not surrounded by whitespaces $node->data = $this->fixWrapping($node->data, $this->zeroWidthSpace);
$data = preg_replace('/([^\s])([\\)\\]:._-])([^\s])/', '$1$2' . $this->zeroWidthSpace . '$3', $node->data);
// Add zero width space before '(' and '[' if not surrounded by whitespaces
$node->data = preg_replace('/([^\s])([([])([^\s])/', '$1' . $this->zeroWidthSpace . '$2$3', $data);
} elseif ($node->childNodes !== null) { } elseif ($node->childNodes !== null) {
foreach ($node->childNodes as $childNode) { foreach ($node->childNodes as $childNode) {
$this->fixWrappingRecursive($childNode); $this->fixWrappingRecursive($childNode);
} }
} }
} }
/**
* Add zero width space to make wrapping easier for the user agent
*
* @param string $output
* @param string $zeroWidthSpace
*
* @return string
*/
protected function fixWrapping($output, $zeroWidthSpace)
{
// Add zero width space after ')', ']', ':', '.', '_' and '-' if not surrounded by whitespaces
$output = preg_replace('/([^\s])([\\)\\]:._-])([^\s])/', '$1$2' . $zeroWidthSpace . '$3', $output);
// Add zero width space before '(' and '[' if not surrounded by whitespaces
return preg_replace('/([^\s])([([])([^\s])/', '$1' . $zeroWidthSpace . '$2$3', $output);
}
} }