diff options
Diffstat (limited to 'library/Director/Resolver')
-rw-r--r-- | library/Director/Resolver/CommandUsage.php | 4 | ||||
-rw-r--r-- | library/Director/Resolver/IcingaObjectResolver.php | 10 | ||||
-rw-r--r-- | library/Director/Resolver/TemplateTree.php | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/library/Director/Resolver/CommandUsage.php b/library/Director/Resolver/CommandUsage.php index 7e3e0c5..49fc31b 100644 --- a/library/Director/Resolver/CommandUsage.php +++ b/library/Director/Resolver/CommandUsage.php @@ -75,7 +75,7 @@ class CommandUsage $suffix = $urlSuffix[$objectType]; $links[] = Link::create( sprintf($caption, $res->$objectType), - "director/${type}s$suffix", + "director/{$type}s$suffix", ['command' => $name] ); } @@ -96,7 +96,7 @@ class CommandUsage $query = $this->db->select()->from("icinga_$table", $columns); foreach ($rels as $rel) { - $query->orWhere("${rel}_id = ?", $id); + $query->orWhere("{$rel}_id = ?", $id); } return $this->db->fetchRow($query); diff --git a/library/Director/Resolver/IcingaObjectResolver.php b/library/Director/Resolver/IcingaObjectResolver.php index 540e2c2..c751476 100644 --- a/library/Director/Resolver/IcingaObjectResolver.php +++ b/library/Director/Resolver/IcingaObjectResolver.php @@ -176,7 +176,7 @@ class IcingaObjectResolver $object->groups = $groups; } - $templates = $this->getTemplateNamesById($id); + $templates = $this->getTemplateNamesByID($id); if (! empty($templates)) { $object->templates = \array_reverse($templates); } @@ -198,7 +198,7 @@ class IcingaObjectResolver } $query = $this->db->select() ->from([ - 'oi' => "${baseTable}_inheritance" + 'oi' => "{$baseTable}_inheritance" ], [ $relColumn, $groupColumn @@ -494,12 +494,12 @@ class IcingaObjectResolver { $type = $this->getType(); $groupsTable = $this->baseTable . 'group'; - $groupMembershipTable = "${groupsTable}_$type"; + $groupMembershipTable = "{$groupsTable}_$type"; if ($resolved) { $groupMembershipTable .= '_resolved'; } - $oRef = "${type}_id"; - $gRef = "${type}group_id"; + $oRef = "{$type}_id"; + $gRef = "{$type}group_id"; return $this->db->select() ->from(['gm' => $groupMembershipTable], [ diff --git a/library/Director/Resolver/TemplateTree.php b/library/Director/Resolver/TemplateTree.php index f8d8fed..bf941e2 100644 --- a/library/Director/Resolver/TemplateTree.php +++ b/library/Director/Resolver/TemplateTree.php @@ -80,13 +80,13 @@ class TemplateTree $map = []; $db = $this->db; $type = $this->type; - $table = "icinga_${type}_inheritance"; + $table = "icinga_{$type}_inheritance"; $query = $db->select()->from( ['i' => $table], [ - 'object' => "i.${type}_id", - 'parent' => "i.parent_${type}_id", + 'object' => "i.{$type}_id", + 'parent' => "i.parent_{$type}_id", ] )->order('i.weight'); @@ -439,12 +439,12 @@ class TemplateTree if ($type === 'command') { $joinCondition = $db->quoteInto( - "p.id = i.parent_${type}_id", + "p.id = i.parent_{$type}_id", 'template' ); } else { $joinCondition = $db->quoteInto( - "p.id = i.parent_${type}_id AND p.object_type = ?", + "p.id = i.parent_{$type}_id AND p.object_type = ?", 'template' ); } @@ -466,7 +466,7 @@ class TemplateTree ['p' => $table], $joinCondition, [] - )->order('o.id')->order('i.weight'); + )->order('o.object_name')->order('i.weight'); if ($type !== 'command') { $query->where( |