Allow passing customvar names in upper and lower case

Fix that customvar names are not properly lowercased in all places. refs #10172
Icinga · Sep 28, 2015 · feaa92c · feaa92c
1 parent ff5696e
commit feaa92c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
@@ -832,7 +832,7 @@ protected function joinCustomvar($customvar)
         list($type, $name) = $this->customvarNameToTypeName($customvar);
         $alias = ($type === 'host' ? 'hcv_' : 'scv_') . $name;
 
-        $this->customVars[$customvar] = $alias;
+        $this->customVars[strtolower($customvar)] = $alias;
 
         if ($this->hasJoinedVirtualTable('services')) {
             $leftcol = 's.' . $type . '_object_id';

diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
@@ -82,7 +82,7 @@ protected function getRestriction($name)
             'service_description',
             'servicegroup_name',
             function ($c) {
-                return preg_match('/^_(?:host|service)_/', $c);
+                return preg_match('/^_(?:host|service)_/i', $c);
             }
         ));
         foreach ($this->getRestrictions($name) as $filter) {

diff --git a/modules/monitoring/library/Monitoring/DataView/DataView.php b/modules/monitoring/library/Monitoring/DataView/DataView.php
@@ -186,7 +186,7 @@ public static function fromParams(array $params, array $columns = null)
     public function isValidFilterTarget($column)
     {
         // Customvar
-        if ($column[0] === '_' && preg_match('/^_(?:host|service)_/', $column)) {
+        if ($column[0] === '_' && preg_match('/^_(?:host|service)_/i', $column)) {
             return true;
         }
         return in_array($column, $this->getColumns()) || in_array($column, $this->getStaticFilterColumns());