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

2013-02-28 Sergio Martin <sergio.martin@artica.es> 

* include/functions_html.php
	operation/agentes/estado_generalagente.php: Improve the
	forced title in images and the agent operation view



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7749 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-02-28 15:12:49 +00:00
parent ef8efa9938
commit e0fdd27798
3 changed files with 132 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-02-28 Sergio Martin <sergio.martin@artica.es>
* include/functions_html.php
operation/agentes/estado_generalagente.php: Improve the
forced title in images and the agent operation view
2013-02-28 Dario Rodriguez <dario@artica.es>
* include/functions_api.php: Added new API function to

2
pandora_console/include/functions_html.php
View File

@ -1675,7 +1675,7 @@ function html_print_image ($src, $return = false, $options = false, $return_src
}
// If title is provided activate forced title
if (isset ($options["title"])) {
if (isset ($options["title"]) && $options["title"] != '') {
if (isset ($options['class'])) {
$options['class'] .= ' forced_title';
}

215
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -52,12 +52,12 @@ if (! check_acl ($config["id_user"], $agent["id_grupo"], "AR") && !$is_extra) {
// START: TABLE AGENT BUILD
$table_agent->id = 'agent_details_main';
$table_agent->width = '500px';
$table_agent->width = '100%';
$table_agent->cellspacing = 4;
$table_agent->cellpadding = 4;
$table_agent->class = 'databox_frame';
$table_agent->style[1] = 'width: 100px;';
$table_agent->style[2] = 'width: 16px;';
$table_agent->style[1] = 'width: 100px; text-align:center;';
$table_agent->style[2] = 'width: 16px; text-align:center;';
$data = array();
$agent_name = ui_print_agent_name ($agent["id_agente"], true, 500, "font-size: medium;", true);
@ -98,13 +98,39 @@ if (!empty($addresses)) {
}
$table_agent->cellstyle[1][0] = 'padding-left:50px;';
$data[1] = graph_agent_status ($id_agente, 120, 120, true);
$table_agent->rowspan[1][1] = 5;
$table_agent->colspan[1][1] = 2;
$data[1] = graph_agent_status ($id_agente, 160, 160, true);
$table_agent->rowspan[1][1] = 6;
$table_agent->data[] = $data;
$table_agent->rowclass[] = '';
$data = array();
$data[0] = html_print_image('images/information.png', true, array('title' => __('Agent Version'))) . '&nbsp;&nbsp;';
$data[0] .= $agent["agent_version"];
$table_agent->cellstyle[][0] = 'padding-left:50px;';
$table_agent->data[] = $data;
$table_agent->rowclass[] = '';
$data = array();
$data[0] = ui_print_os_icon ($agent["id_os"], true, array('title' => __('Operating system'))) . '&nbsp;&nbsp;';
$data[0] .= '&nbsp;<i><span title="'.$agent["os_version"].'">'.$agent["os_version"].' </span></i>';
$table_agent->cellstyle[][0] = 'padding-left:50px;';
$table_agent->data[] = $data;
$table_agent->rowclass[] = '';
$data = array();
$data[0] = html_print_image('images/bricks.png', true, array('title' => __('Parent'))) . '&nbsp;&nbsp;';
if ($agent["id_parent"] == 0) {
$data[0] .= '<em>' . __('N/A') . '</em>';
}
else {
$data[0] .= '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$agent["id_parent"].'">'.agents_get_name ($agent["id_parent"]).'</a>';
}
$table_agent->cellstyle[][0] = 'padding-left:50px;';
$table_agent->data[] = $data;
$table_agent->rowclass[] = '';
$data = array();
$data[0] = html_print_image('images/default_list.png', true, array('title' => __('Description'))) . '&nbsp;&nbsp;';
$data[0] .= empty($agent["comentarios"]) ? '<em>' . __('N/A') . '</em>' : $agent["comentarios"];
@ -112,88 +138,57 @@ $table_agent->cellstyle[][0] = 'padding-left:50px;';
$table_agent->data[] = $data;
$table_agent->rowclass[] = '';
$data = array();
$data[0] = html_print_image('images/clock.png', true, array('title' => __('Interval'))) . '&nbsp;&nbsp;';
$data[0] .= human_time_description_raw ($agent["intervalo"]);
$table_agent->cellstyle[][0] = 'padding-left:50px;';
$table_agent->data[] = $data;
$table_agent->rowclass[] = '';
$data[0] = html_print_image('images/go_next.png', true, array('title' => __('Next contact'))) . '&nbsp;&nbsp;';
$progress = agents_get_next_contact($id_agente);
$data[0] .= progress_bar($progress, 200, 20);
$table_agent->cellstyle[][0] = 'padding-left:50px;';
$table_agent->data[] = $data;
$table_agent->rowclass[] = '';
// END: TABLE AGENT BUILD
$table->id = 'agent_details';
$table->width = '100%';
$table->cellspacing = 4;
$table->cellpadding = 4;
$table->class = 'databox';
// START: TABLE CONTACT BUILD
$table_contact->id = 'agent_contact_main';
$table_contact->width = '100%';
$table_contact->cellspacing = 4;
$table_contact->cellpadding = 4;
$table_contact->class = 'databox';
$table_contact->style[0] = 'width: 30%;';
$table_contact->style[1] = 'width: 70%;';
$table_contact->head[0] = html_print_image('images/clock.png', true) . ' <span class="med_data">' . __('Agent contact') . '</span>';
$table_contact->head_colspan[0] = 2;
$data = array();
$data[0] = html_print_table($table_agent, true);
$table->colspan[0][0] = 2;
$table->rowspan[0][0] = 5;
$data[2] = '<b>' . __('Parent') . '</b>';
$data[3] = '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$agent["id_parent"].'">'.agents_get_name ($agent["id_parent"]).'</a>';
$data[4] = '<div style="width:100%; text-align:right">';
$data[4] .= '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;refr=60">' . html_print_image("images/refresh.png", true, array("border" => '0', "title" => __('Refresh data'), "alt" => "")) . '</a>&nbsp;';
$data[4] .= '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;flag_agent=1&amp;id_agente='.$id_agente.'">' . html_print_image("images/target.png", true, array("border" => '0', "title" => __('Force'), "alt" => "")) . '</a>';
$data[4] .= '</div>';
$table->data[] = $data;
$table->rowclass[] = '';
$data[0] = '<b>' . __('Interval') . '</b>';
$data[1] = human_time_description_raw ($agent["intervalo"]);
$table_contact->data[] = $data;
$data = array();
$data[2] = '<b>' . __('OS') . '</b>';
$data[3] = ui_print_os_icon ($agent["id_os"], true, true);
// Want to print last 15 characters of OS version, or start from 0 if smaller
$osversion_offset = strlen($agent["os_version"]);
if ($osversion_offset > 15)
$osversion_offset = $osversion_offset - 15;
else
$osversion_offset = 0;
$data[3] .= '&nbsp;<i><span title="'.$agent["os_version"].'">'.$agent["os_version"].' </span></i>';
$table->data[] = $data;
$table->rowclass[] = '';
$data = array();
$data[2] = '<b>' . __('Agent Version') . '</b>';
$data[3] = $agent["agent_version"];
$table->data[] = $data;
$table->rowclass[] = '';
$data = array();
$data[2] = '<b>' . __('Last contact') . ' / ' . __('Remote') . '</b>';
$data[3] = ui_print_timestamp ($agent["ultimo_contacto"], true);
$data[3] .= " / ";
$data[0] = '<b>' . __('Last contact') . ' / ' . __('Remote') . '</b>';
$data[1] = ui_print_timestamp ($agent["ultimo_contacto"], true);
$data[1] .= " / ";
if ($agent["ultimo_contacto_remoto"] == "01-01-1970 00:00:00") {
$data[3] .= __('Never');
$data[1] .= __('Never');
}
else {
$data[3] .= $agent["ultimo_contacto_remoto"];
$data[1] .= $agent["ultimo_contacto_remoto"];
}
$table->data[] = $data;
$table->rowclass[] = '';
$table_contact->data[] = $data;
$data = array();
$data[0] = '<b>' . __('Events (24h)') . '</b>';
$data[1] = graph_graphic_agentevents ($id_agente, 290, 15, 86400, '', true);
$table->data[] = $data;
$table->rowclass[] = '';
$data[0] = '<b>' . __('Next contact') . '</b>';
$progress = agents_get_next_contact($id_agente);
$data[1] = progress_bar($progress, 200, 20);
$table_contact->data[] = $data;
// END: TABLE CONTACT BUILD
// START: TABLE DATA BUILD
$table_data->id = 'agent_data_main';
$table_data->width = '100%';
$table_data->cellspacing = 4;
$table_data->cellpadding = 4;
$table_data->class = 'databox';
$table_data->style[0] = 'width: 30%;';
$table_data->style[1] = 'width: 70%;';
$table_data->head[0] = html_print_image('images/page_white_text.png', true) . ' <span class="med_data">' . __('Agent info') . '</span>';
$table_data->head_colspan[0] = 2;
if ($config['activate_gis'] || $agent['url_address'] != '') {
$data = array();
@ -226,17 +221,7 @@ if ($config['activate_gis'] || $agent['url_address'] != '') {
$data[$col] = '<a href='.$agent["url_address"].'>' . $agent["url_address"] . '</a>';
}
$table->data[] = $data;
$table->rowclass[] = '';
}
// ACCESS RATE GRAPH
if ($config["agentaccess"]) {
$data = array();
$data[0] = '<b>' . __('Agent access rate (24h)') . '</b>';
$data[1] = graphic_agentaccess($id_agente, 300, 110, 86400, true);
$table->data[] = $data;
$table->rowclass[] = '';
$table_data->data[] = $data;
}
// Timezone Offset
@ -245,7 +230,6 @@ if ($agent['timezone_offset'] != 0) {
$data[0] = '<b>' . __('Timezone Offset') . '</b>';
$data[1] = $agent["timezone_offset"];
$table->data[] = $data;
$table->rowclass[] = '';
}
// Custom fields
@ -259,13 +243,64 @@ foreach ($fields as $field) {
$data[0] = '<b>' . $field['name'] . ui_print_help_tip (__('Custom field'), true) . '</b>';
$custom_value = db_get_value_filter('description', 'tagent_custom_data', array('id_field' => $field['id_field'], 'id_agent' => $id_agente));
if ($custom_value === false || $custom_value == '') {
$custom_value = '<i>-'.__('empty').'-</i>';
$custom_value = '<i>'.__('N/A').'</i>';
}
$data[1] = $custom_value;
$table->data[] = $data;
$table->rowclass[] = '';
$table_data->data[] = $data;
}
// END: TABLE DATA BUILD
$table = null;
$table->id = 'agent_details';
$table->width = '100%';
$table->cellspacing = 4;
$table->cellpadding = 4;
$table->class = 'databox';
$table->style = array_fill(0, 3, 'vertical-align: top;');
$data = array();
$data[0] = html_print_table($table_agent, true);
$data[1] = html_print_table($table_contact, true) . '<br>';
$data[1] .= html_print_table($table_data, true);
$table->rowspan[0][1] = 2;
$data[2] = '<div style="width:100%; text-align:right">';
$data[2] .= '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;id_agente='.$id_agente.'&amp;refr=60">' . html_print_image("images/refresh.png", true, array("border" => '0', "title" => __('Refresh data'), "alt" => "")) . '</a>&nbsp;';
$data[2] .= '<a href="index.php?sec=estado&amp;sec2=operation/agentes/ver_agente&amp;flag_agent=1&amp;id_agente='.$id_agente.'">' . html_print_image("images/target.png", true, array("border" => '0', "title" => __('Force'), "alt" => "")) . '</a>';
$data[2] .= '</div>';
$table->data[] = $data;
$table->rowclass[] = '';
$data = array();
$data[0] = '<fieldset class="databox" style="width:98%;">
<legend style="text-align:left; color: #666;">' .
__('Events (24h)') .
'</legend>' .
'<div style="margin: auto; text-align:center; width: 300px;">' .
graph_graphic_agentevents ($id_agente, 300, 15, 86400, '', true) .
'</div>' .
'</fieldset>';
// ACCESS RATE GRAPH
if ($config["agentaccess"]) {
$data[0] .= '<fieldset class="databox" style="width:98%; position: static;">
<legend style="text-align:left; color: #666;">' .
__('Agent access rate (24h)') .
'</legend>' .
'<div style="margin: auto; text-align:center; width: 300px;">' .
graphic_agentaccess($id_agente, 300, 110, 86400, true) .
'</div>' .
'</fieldset>';
}
$table->cellstyle[1][0] = 'text-align:center;';
$table->data[] = $data;
$table->rowclass[] = '';
html_print_table($table);
unset($table);
?>