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

Sync: allow to enforce array format

This commit is contained in:
Thomas Gelf 2015-08-28 23:56:54 +02:00
parent 11ffedd6f2
commit 693837004a
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/Director/Import/Sync.php
View File

@ -27,6 +27,17 @@ class Sync
} }
} }
protected function wantArray($value)
{
if (is_array($value)) {
return $value;
} elseif ($value === null) {
return array();
} else {
return array($value);
}
}
protected function fillVariables($string, $row) protected function fillVariables($string, $row)
{ {
if (preg_match('/^\${([A-Za-z0-9_-]+)}$/', $string, $m)) { if (preg_match('/^\${([A-Za-z0-9_-]+)}$/', $string, $m)) {
@ -116,7 +127,12 @@ class Sync
$val = $this->fillVariables($p->source_expression, $row); $val = $this->fillVariables($p->source_expression, $row);
if (substr($prop, 0, 5) === 'vars.') { if (substr($prop, 0, 5) === 'vars.') {
$newVars[substr($prop, 5)] = $val; $varName = substr($prop, 5);
if (substr($varName, -2) === '[]') {
$varName = substr($varName, 0, -2);
$val = $this->wantArray($val);
}
$newVars[$varName] = $val;
} else { } else {
if ($prop === 'import') { if ($prop === 'import') {
$imports[] = $val; $imports[] = $val;