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

IniRepository: Don't require a key column before the onInsert trigger 

fixes #13005
This commit is contained in:
Johannes Meyer 2016-10-31 08:35:45 +01:00
parent d207dcbd03
commit 82c7a51050
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/Icinga/Repository/IniRepository.php
View File

@ -186,13 +186,14 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
public function insert($target, array $data) public function insert($target, array $data)
{ {
$newData = $this->requireStatementColumns($target, $data); $newData = $this->requireStatementColumns($target, $data);
$section = $this->extractSectionName($newData); $config = $this->onInsert($target, new ConfigObject($newData));
$section = $this->extractSectionName($config);
if ($this->ds->hasSection($section)) { if ($this->ds->hasSection($section)) {
throw new StatementException(t('Cannot insert. Section "%s" does already exist'), $section); throw new StatementException(t('Cannot insert. Section "%s" does already exist'), $section);
} }
$this->ds->setSection($section, $this->onInsert($target, new ConfigObject($newData))); $this->ds->setSection($section, $config);
try { try {
$this->ds->saveIni(); $this->ds->saveIni();
@ -301,23 +302,25 @@ abstract class IniRepository extends Repository implements Extensible, Updatable
} }
/** /**
* Extract and return the section name off of the given $data * Extract and return the section name off of the given $config
* *
* @param array $data * @param array|ConfigObject $config
* *
* @return string * @return string
* *
* @throws ProgrammingError In case no valid section name is available * @throws ProgrammingError In case no valid section name is available
*/ */
protected function extractSectionName(array & $data) protected function extractSectionName( & $config)
{ {
$keyColumn = $this->ds->getConfigObject()->getKeyColumn(); $keyColumn = $this->ds->getConfigObject()->getKeyColumn();
if (! isset($data[$keyColumn])) { if (! is_array($config) && !$config instanceof ConfigObject) {
throw new ProgrammingError('$data does not provide a value for key column "%s"', $keyColumn); throw new ProgrammingError('$config is neither an array nor a ConfigObject');
} elseif (! isset($config[$keyColumn])) {
throw new ProgrammingError('$config does not provide a value for key column "%s"', $keyColumn);
} }
$section = $data[$keyColumn]; $section = $config[$keyColumn];
unset($data[$keyColumn]); unset($config[$keyColumn]);
return $section; return $section;
} }
} }