From fd3e2e8750a71f0a0510307b0de85e85706a8147 Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Wed, 28 Jan 2015 10:34:41 +0100
Subject: [PATCH] Fixed problem with previous commit
(cherry picked from commit a0eb5728f7df63037e980498d8e04441693fcc44)
---
pandora_console/godmode/servers/servers.build_table.php | 7 ++++++-
pandora_console/include/functions_servers.php | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pandora_console/godmode/servers/servers.build_table.php b/pandora_console/godmode/servers/servers.build_table.php
index 281a991ada..c34a3f857a 100644
--- a/pandora_console/godmode/servers/servers.build_table.php
+++ b/pandora_console/godmode/servers/servers.build_table.php
@@ -82,7 +82,12 @@ foreach ($servers as $server) {
}
// Type
- $data[2] = '<span style="white-space:nowrap;">'.$server["img"].'</span> ('.ucfirst($server["type"]).")";
+ if ($server['type'] == 'data'){
+ $data[2] = '<span style="white-space:nowrap;">'.$server["img"].'</span> (<span style="font-size:8px;">' . $server["version"]. '</span>)';
+ }
+ else{
+ $data[2] = '<span style="white-space:nowrap;">'.$server["img"].'</span> ('.ucfirst($server["type"]).")";
+ }
if ($server["master"] == 1)
$data[2] .= ui_print_help_tip (__("This is a master server"), true);
diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index 8a6e3732d7..7d67a0bf86 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -361,7 +361,7 @@ function servers_get_info ($id_server = -1) {
switch ($server['server_type']) {
case SERVER_TYPE_DATA:
$server["img"] = html_print_image ("images/data.png", true, array ("title" => __('Data server')));
- $server["type"] = "<span style='font-size:8px;'>" . $server['version']. "</span>";
+ $server["type"] = "data";
$id_modulo = 1;
break;
case SERVER_TYPE_NETWORK: