From 5b6897cc9e5a51dcfef1554f621cf7ebfd3a727d Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Mon, 21 Aug 2017 11:12:24 +0200
Subject: [PATCH] DataTypeDirectorObject: sort by display name

Plus some formatting.

fixes #840
---
 .../DataType/DataTypeDirectorObject.php       | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/library/Director/DataType/DataTypeDirectorObject.php b/library/Director/DataType/DataTypeDirectorObject.php
index 0cdaee1e..be1fc73a 100644
--- a/library/Director/DataType/DataTypeDirectorObject.php
+++ b/library/Director/DataType/DataTypeDirectorObject.php
@@ -20,10 +20,10 @@ class DataTypeDirectorObject extends DataTypeHook
         $display = $type === 'service_set'
             ? 'object_name'
             : 'COALESCE(display_name, object_name)';
-        $query = $db->select()->from($dummy->getTableName(), array(
+        $query = $db->select()->from($dummy->getTableName(), [
             'object_name'  => 'object_name',
             'display_name' => $display
-        ));
+        ])->order($display);
 
         if ($type === 'service_set') {
             $query->where('host_id IS NULL');
@@ -39,11 +39,9 @@ class DataTypeDirectorObject extends DataTypeHook
             $params['sorted'] = true;
             $params = ['multiOptions' => $enum];
         } else {
-            $params = array(
-                'multiOptions' => array(
-                        null => $form->translate('- please choose -'),
-                    ) + $enum,
-            );
+            $params = ['multiOptions' => [
+                    null => $form->translate('- please choose -'),
+                ] + $enum];
             $type = 'select';
         }
 
@@ -52,7 +50,7 @@ class DataTypeDirectorObject extends DataTypeHook
 
     public static function addSettingsFormFields(QuickForm $form)
     {
-        $enum = array(
+        $enum = [
             'host'         => $form->translate('Hosts'),
             'hostgroup'    => $form->translate('Host groups'),
             'service'      => $form->translate('Services'),
@@ -60,9 +58,9 @@ class DataTypeDirectorObject extends DataTypeHook
             'service_set'  => $form->translate('Service Set'),
             'user'         => $form->translate('Users'),
             'usergroup'    => $form->translate('User groups'),
-        );
+        ];
 
-        $form->addElement('select', 'icinga_object_type', array(
+        $form->addElement('select', 'icinga_object_type', [
             'label'        => $form->translate('Object'),
             'description'  => $form->translate(
                 'Please choose a specific Icinga object type'
@@ -70,16 +68,16 @@ class DataTypeDirectorObject extends DataTypeHook
             'required'     => true,
             'multiOptions' => $form->optionalEnum($enum),
             'sorted'       => true,
-        ));
+        ]);
 
-        $form->addElement('select', 'data_type', array(
+        $form->addElement('select', 'data_type', [
             'label' => $form->translate('Target data type'),
-            'multiOptions' => $form->optionalEnum(array(
+            'multiOptions' => $form->optionalEnum([
                 'string' => $form->translate('String'),
-                'array' => $form->translate('Array'),
-            )),
+                'array'  => $form->translate('Array'),
+            ]),
             'required' => true,
-        ));
+        ]);
 
         return $form;
     }