IcingaConfigHelper: Use config renderer and escape strings
This commit is contained in:
parent
61414cbadc
commit
e9e9f91fee
|
@ -92,17 +92,25 @@ class IcingaConfigHelper
|
||||||
return '"' . $string . '"';
|
return '"' . $string . '"';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Requires an array of CustomVariable objects
|
// Requires an array
|
||||||
public static function renderArray($array)
|
public static function renderArray($array)
|
||||||
{
|
{
|
||||||
$str = '[ ' . implode(', ', $array) . ' ]';
|
$data = array();
|
||||||
|
foreach ($array as $entry) {
|
||||||
|
if ($entry instanceof IcingaConfigRenderer) {
|
||||||
|
$data[] = $entry;
|
||||||
|
} else {
|
||||||
|
$data[] = self::renderString($entry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$str = '[ ' . implode(', ', $data) . ' ]';
|
||||||
|
|
||||||
if (strlen($str) < 60) {
|
if (strlen($str) < 60) {
|
||||||
return $str;
|
return $str;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prefix for toConfigString?
|
// Prefix for toConfigString?
|
||||||
return "[\n " . implode(",\n ", $array) . "\n]";
|
return "[\n " . implode(",\n ", $data) . "\n]";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue