tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-02-15 Miguel de Dios <miguel.dedios@artica.es> 

* 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.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7664 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-15 13:22:38 +00:00
parent 0d01eb0dd0
commit 0ce7700493
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-02-15 Miguel de Dios <miguel.dedios@artica.es>
* 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 <sergio.martin@artica.es>
* include/functions_graph.php

14
pandora_console/godmode/servers/modificar_server.php
View File

@ -119,12 +119,11 @@ else {
$table->data = array ();
foreach ($servers as $server) {
$data = array ();
$data[0] = '<span title="'.$server['version'].'">'.$server['name'].'</span>';
$data[0] = '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server='.$server["id_server"].'">'.$server["name"].'</a>';
$data[0] = '<span title="' . $server['version'] . '">' .
$server['name'] . '</span>';
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] = '<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server='.$server["id_server"].'">';
$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] .= '</a>';
$data[8] .= '&nbsp;&nbsp;<a href="index.php?sec=gservers&sec2=godmode/servers/modificar_server&server_del='.$server["id_server"].'&amp;delete=1">';
$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] .= '</a>';
}

8
pandora_console/include/functions_servers.php
View File

@ -301,17 +301,19 @@ function servers_get_info ($id_server = -1) {
// Recon server
else if ($server["server_type"] == 3) {
$server["name"] = '<a href="index.php?sec=estado_server&amp;sec2=operation/servers/recon_view&amp;server_id='.$server["id_server"].'">'.$server["name"].'</a>';
$server["name"] = '<a href="index.php?sec=estado&amp;sec2=operation/servers/recon_view&amp;server_id='.$server["id_server"].'">'.$server["name"].'</a>';
//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"]);