Fix /edit/server/ always says database unsupported

Author: Flatta

bin/v-list-database-hosts

@@ -28,12 +28,12 @@ json_list() {
         fi
     done
 
-    echo "{"
+    echo "["
     for type in $(echo $DB_SYSTEM |sed -e 's/,/\n/'); do
         if [ -e "$VESTA/conf/$type.conf" ]; then
             for str in $(cat $VESTA/conf/$type.conf); do
                 eval $str
-        echo -n '    "'$HOST'": {
+        echo -n '    {
         "HOST": "'$HOST'",
         "TYPE": "'$type'",
         "CHARSETS": "'$CHARSETS'",
@@ -54,7 +54,7 @@ json_list() {
             done
         fi
     done
-    echo '}'
+    echo ']'
 }
 
 # SHELL list function

web/edit/server/index.php

@@ -46,21 +46,15 @@
     $v_dns_cluster = 'yes';
 }
 
-// List MySQL hosts
-exec (VESTA_CMD."v-list-database-hosts mysql json", $output, $return_var);
-$v_mysql_hosts = json_decode(implode('', $output), true);
+// List Database hosts
+exec (VESTA_CMD."v-list-database-hosts json", $output, $return_var);
+$db_hosts = json_decode(implode('', $output), true);
 unset($output);
-foreach ($v_mysql_hosts as $key => $value) {
-    $v_mysql = 'yes';
-}
-
-// List PostgreSQL hosts
-exec (VESTA_CMD."v-list-database-hosts pgsql json", $output, $return_var);
-$v_pgsql_hosts = json_decode(implode('', $output), true);
-unset($output);
-foreach ($v_pgsql_hosts as $key => $value) {
-    $v_pgsql = 'yes';
-}
+$v_mysql_hosts = array_values(array_filter($db_hosts, function($host){return $host['TYPE'] === 'mysql';}));
+$v_mysql = count($v_mysql_hosts) ? 'yes' : 'no';
+$v_pgsql_hosts = array_values(array_filter($db_hosts, function($host){return $host['TYPE'] === 'pgsql';}));
+$v_pgsql = count($v_pgsql_hosts) ? 'yes' : 'no';
+unset($db_hosts);
 
 // List backup settings
 $v_backup_dir = "/backup";