lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 18:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Monit, minor cleanups and fixes for https://github.com/opnsense/core/pull/3155

Browse Source
This commit is contained in:
Ad Schellevis 2019-03-01 10:45:23 +01:00
parent 1849a3b61d
commit 5bde17012d
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/opnsense/mvc/app/models/OPNsense/Monit/Monit.php
View File

@ -77,8 +77,8 @@ class Monit extends BaseModel
// test node validations
switch ($node->getInternalXMLTagName()) {
case 'type':
if ($node->isFieldChanged() &&
$this->isTestServiceRelated($parentNode->getAttribute('uuid'))) {
$testUuid = $parentNode->getAttribute('uuid');
if ($node->isFieldChanged() && $this->isTestServiceRelated($testUuid)) {
$messages->appendMessage(new \Phalcon\Validation\Message(
gettext("Cannot change the type. Test is linked to a service."),
$key
@ -203,17 +203,15 @@ class Monit extends BaseModel
/**
* determine if services have links to this test node
* @param uuid of the test node
* @param uuid of the test node
* @return bool
*/
public function isTestServiceRelated($testUUID = null)
{
$serviceNodes = $this->service->getNodes();
foreach ($serviceNodes as $serviceNode) {
if (is_array($serviceNode['tests']) &&
array_key_exists($testUUID, $serviceNode['tests']) &&
$serviceNode['tests'][$testUUID]['selected'] == 1) {
return true;
foreach ($this->service->iterateItems() as $serviceNode) {
if (in_array($testUUID, explode(',', (string)$serviceNode->tests))) {
return true;
}
}
return false;