Fix nested group : when no server set and printTitle issue
authorJulien Rouhaud <julien.rouhaud@free.fr>
Wed, 29 Aug 2012 19:22:55 +0000 (21:22 +0200)
committerJulien Rouhaud <julien.rouhaud@free.fr>
Wed, 29 Aug 2012 19:22:55 +0000 (21:22 +0200)
classes/Misc.php
servers.php

index 735be483ab914251edc7fe0b1512f10ec8e1319b..2dc1b8a6c3339ee00bb55123b52bb9067ed67565 100644 (file)
                        $srvs = array();
 
                        if (($group !== false) and ($group !== 'all'))
-                               $group = array_fill_keys(explode(',', preg_replace('/\s/', '',
-                                       $conf['srv_groups'][$group]['servers'])), 1);
+                               if (isset($conf['srv_groups'][$group]['servers']))
+                                       $group = array_fill_keys(explode(',', preg_replace('/\s/', '',
+                                               $conf['srv_groups'][$group]['servers'])), 1);
+                               else
+                                       $group = '';
                        
                        foreach($conf['servers'] as $idx => $info) {
                                $server_id = $info['host'].':'.$info['port'].':'.$info['sslmode'];
index 3632eccb2d046466804311939652beda7bdfd4f8..746a5c4d72e9a3e4440a38caca6332a2f7a73f3d 100644 (file)
@@ -50,7 +50,7 @@
                        $misc->printTitle(sprintf($lang['strgroupgroups'],htmlentities($conf['srv_groups'][$group]['desc'], ENT_QUOTES, 'UTF-8')));
                }
 
-               $misc->printTable($groups, $columns, $actions);
+               $misc->printTable($groups, $columns, $actions,'servers-servers');
 
                $servers = $misc->getServers(true, $group);