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

2012-02-28 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_networkmap.php: fixed into the function
	"networkmap_create_agent_node" the creation of url link for the node.

	* godmode/reporting/graphs.php, godmode/reporting/reporting_builder.php,
	include/functions_graph.php, include/functions_reporting.php,
	mobile/operation/agents/view_agents.php, operation/agentes/datos_agente.php,
	operation/incidents/incident_detail.php,
	operation/reporting/reporting_viewer.php: cleaned source code style.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5666 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-02-28 16:08:30 +00:00
parent 9bf73f9357
commit a0230c430c
9 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_console/ChangeLog
View File

@ -1,3 +1,14 @@
2012-02-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php: fixed into the function
"networkmap_create_agent_node" the creation of url link for the node.
* godmode/reporting/graphs.php, godmode/reporting/reporting_builder.php,
include/functions_graph.php, include/functions_reporting.php,
mobile/operation/agents/view_agents.php, operation/agentes/datos_agente.php,
operation/incidents/incident_detail.php,
operation/reporting/reporting_viewer.php: cleaned source code style.
2012-02-28 Miguel de Dios <miguel.dedios@artica.es>
* operation/events/events.php, operation/agentes/datos_agente.php,

11
pandora_console/include/functions_networkmap.php
View File

@ -89,7 +89,8 @@ function networkmap_generate_dot ($pandora_name, $group = 0, $simple = 0, $font_
// Save node parent information to define edges later
if ($agent['id_parent'] != "0") {
$parents[$node_count] = $node_ref[$agent['id_parent']];
} else {
}
else {
$orphans[$node_count] = 1;
}
@ -383,7 +384,8 @@ function networkmap_create_group_node ($group, $simple = 0, $font_size = 10) {
// Set node icon
if (file_exists (html_print_image("images/groups_small/" . $icon . ".png", true, false, true, true))) {
$img_node = html_print_image("images/groups_small/" . $icon . ".png", true, false, false, true);
} else {
}
else {
$img_node = '-';
}
@ -398,7 +400,8 @@ function networkmap_create_group_node ($group, $simple = 0, $font_size = 10) {
<TR><TD>'.$name.'</TD></TR></TABLE>>,
shape="invtrapezium", URL="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id='.$group['id_grupo'].'",
tooltip="ajax.php?page=operation/agentes/ver_agente&get_group_status_tooltip=1&id_group='.$group['id_grupo'].'"];';
} else {
}
else {
$node = $group['id_node'] . ' [ color="'.$status_color.'", fontsize='.$font_size.', shape="invtrapezium", URL="index.php?sec=estado&sec2=operation/agentes/estado_agente&refr=60&group_id='.$group['id_grupo'].'", style="filled", fixedsize=true, width=0.20, height=0.20, label="", tooltip="ajax.php?page=operation/agentes/ver_agente&get_group_status_tooltip=1&id_group='.$group['id_grupo'].'"];';
}
return $node;
@ -438,7 +441,6 @@ function networkmap_create_agent_node ($agent, $simple = 0, $font_size = 10, $cu
if ($simple == 0){
// Set node icon
$img_node = ui_print_os_icon ($agent['id_os'], false, true, true, true, true);
$img_node = str_replace($config['homeurl'] . '/', '', $img_node);
$node = $agent['id_node'].' [ color="'.$status_color.'", fontsize='.$font_size.', style="filled", fixedsize=true, width=0.40, height=0.40, label=<<TABLE CELLPADDING="0" CELLSPACING="0" BORDER="0"><TR><TD>' . html_print_image($img_node, true, false, false, true) . '</TD></TR>
<TR><TD>'.$name.'</TD></TR></TABLE>>,
@ -448,6 +450,7 @@ function networkmap_create_agent_node ($agent, $simple = 0, $font_size = 10, $cu
else {
$node = $agent['id_node'] . ' [ color="' . $status_color . '", fontsize='.$font_size.', shape="doublecircle", URL="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent['id_agente'].'",style="filled", fixedsize=true, width=0.20, height=0.20, label="", tooltip="ajax.php?page=operation/agentes/ver_agente&get_agent_status_tooltip=1&id_agent='.$agent['id_agente'].'"];';
}
return $node;
}

2
pandora_console/include/functions_reporting.php
View File

@ -4637,7 +4637,7 @@ function reporting_get_agentmodule_ttr ($id_agent_module, $period, $date = 0) {
return $critical_period;
}
/*
/**
* Get all the template graphs a user can see.
*
* @param $id_user User id to check.

6
pandora_console/operation/incidents/incident_detail.php
View File

@ -291,7 +291,8 @@ echo '</td></tr><tr><td class="datos"><b>'.__('Priority').'</b></td><td class="d
if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
html_print_select (incidents_get_priorities (), "prioridad_form", $prioridad, '', '', '', false, false, false, 'w135');
} else {
}
else {
html_print_select (incidents_get_priorities (), "prioridad_form", $prioridad, '', '', '', false, false, false, 'w135', true);
}
@ -324,7 +325,8 @@ echo '</td></tr><tr><td class="datos2" colspan="4">';
if ((check_acl ($config["id_user"], $id_grupo, "IM") == 1) OR ($usuario == $config["id_user"])) {
html_print_textarea ("descripcion", 15, 80, $texto, 'style="height:200px;"');
} else {
}
else {
html_print_textarea ("descripcion", 15, 80, $texto, 'style="height:200px;" disabled');
}

4
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -207,7 +207,6 @@ foreach ($contents as $content) {
?>
<script language="javascript" type="text/javascript">
$(document).ready (function () {
$("#loading").slideUp ();
$("#text-time").timeEntry ({spinnerImage: 'images/time-entry.png', spinnerSize: [20, 20, 0]});
@ -225,7 +224,8 @@ $(document).ready (function () {
$("#table1-1-3").css("display", "");
$("#table1-1-4").css("display", "");
$("#table1-1-5").css("display", "none");
}else{
}
else {
$("#table1-1-3").css("display", "none");
$("#table1-1-4").css("display", "none");
$("#table1-1-5").css("display", "");