Sort host list and show hostnames
authorJamie Cameron <jcameron@webmin.com>
Mon, 6 Dec 2010 22:46:55 +0000 (14:46 -0800)
committerJamie Cameron <jcameron@webmin.com>
Mon, 6 Dec 2010 22:46:55 +0000 (14:46 -0800)
cluster-shell/index.cgi

index cf3d82b..5c0ae0b 100755 (executable)
@@ -32,10 +32,12 @@ printf "<option value=ALL %s>%s\n",
        $serv{'ALL'} ? 'selected' : '', $text{'index_all'};
 printf "<option value=* %s>%s\n",
        $serv{'*'} ? 'selected' : '', $text{'index_this'};
-foreach $s (grep { $_->{'user'} } &servers::list_servers()) {
+foreach $s (grep { $_->{'user'} }
+                sort { $a->{'host'} cmp $b->{'host'} }
+                     &servers::list_servers()) {
        printf "<option value=%s %s>%s\n",
                $s->{'host'}, $serv{$s->{'host'}} ? "selected" : "",
-               $s->{'desc'} || $s->{'host'};
+               $s->{'host'}.($s->{'desc'} ? " (".$s->{'desc'}.")" : "");
        }
 foreach $g (&servers::list_all_groups()) {
        $gn = "group_".$g->{'name'};