diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 8289422743..e302739d84 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2013-02-15 Miguel de Dios + + * godmode/servers/modificar_server.php: fixed the column of server + now it is not link and show the version. + + * include/functions_servers.php: fixed the sec parameter for the + link to edit recon server. + 2013-02-15 Sergio Martin * include/functions_graph.php diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index efdf2bf5f2..642de0c4d1 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -119,12 +119,11 @@ else { $table->data = array (); - foreach ($servers as $server) { $data = array (); - $data[0] = ''.$server['name'].''; - $data[0] = ''.$server["name"].''; + $data[0] = '' . + $server['name'] . ''; if ($server['status'] == 0) { $data[1] = ui_print_status_image (STATUS_SERVER_DOWN, '', true); @@ -163,11 +162,14 @@ else { //Only Pandora Administrator can delete servers if (check_acl ($config["id_user"], 0, "PM")) { $data[8] = ''; - $data[8] .= html_print_image ('images/config.png', true, array ('title' => __('Edit'))); + $data[8] .= html_print_image ('images/config.png', true, + array('title' => __('Edit'))); $data[8] .= ''; - + $data[8] .= '  '; - $data[8] .= html_print_image ('images/cross.png', true, array ('title' => __('Delete'), 'onclick' => "if (! confirm ('" . __('Modules run by this server will stop working. Do you want to continue?') ."')) return false")); + $data[8] .= html_print_image ('images/cross.png', true, + array('title' => __('Delete'), + 'onclick' => "if (! confirm ('" . __('Modules run by this server will stop working. Do you want to continue?') ."')) return false")); $data[8] .= ''; } diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php index 2cc55745e2..43a4e3b172 100644 --- a/pandora_console/include/functions_servers.php +++ b/pandora_console/include/functions_servers.php @@ -301,17 +301,19 @@ function servers_get_info ($id_server = -1) { // Recon server else if ($server["server_type"] == 3) { - $server["name"] = ''.$server["name"].''; + $server["name"] = ''.$server["name"].''; //Total jobs running on this recon server - $server["modules"] = db_get_sql ("SELECT COUNT(id_rt) FROM trecon_task WHERE id_recon_server = ".$server["id_server"]); + $server["modules"] = db_get_sql ("SELECT COUNT(id_rt) + FROM trecon_task + WHERE id_recon_server = ".$server["id_server"]); //Total recon jobs (all servers) $server["modules_total"] = db_get_sql ("SELECT COUNT(status) FROM trecon_task"); //Lag (take average active time of all active tasks) $server["module_lag"] = 0; - + switch ($config["dbtype"]) { case "mysql": $server["lag"] = db_get_sql ("SELECT UNIX_TIMESTAMP() - utimestamp from trecon_task WHERE UNIX_TIMESTAMP() > (utimestamp + interval_sweep) AND id_recon_server = ".$server["id_server"]);