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

2012-04-03 Dario Rodriguez <dario.rodriguez@artica.es> 

* operation/agentes/estado_agente.php,
	operation/menu.php,
	godmode/agentes/agent_template.php,
	godmode/agentes/module_manager_editor_common.php,
	godmode/agentes/agent_conf_gis.php,
	godmode/agentes/module_manager.php,
	godmode/agentes/modificar_agente.php,
	godmode/agentes/configurar_agente.php,
	godmode/menu.php: Changed Manage agent menu to Agent detail inside 
	Monitoring menu.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5890 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2012-04-03 16:05:44 +00:00
parent a59ec1c48f
commit b5425ae5aa
10 changed files with 82 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/ChangeLog
View File

@ -1,3 +1,16 @@
2012-04-03 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/agentes/estado_agente.php,
operation/menu.php,
godmode/agentes/agent_template.php,
godmode/agentes/module_manager_editor_common.php,
godmode/agentes/agent_conf_gis.php,
godmode/agentes/module_manager.php,
godmode/agentes/modificar_agente.php,
godmode/agentes/configurar_agente.php,
godmode/menu.php: Changed Manage agent menu to Agent detail inside
Monitoring menu.
2012-04-03 Vanessa Gil <vanessa.gil@artica.es> 2012-04-03 Vanessa Gil <vanessa.gil@artica.es>
* operation/messages/message_edit.php: Show user name * operation/messages/message_edit.php: Show user name

2
pandora_console/godmode/agentes/agent_conf_gis.php
View File

@ -64,7 +64,7 @@ $table->data[4][0] = __('Ignore new GIS data:');
$table->data[4][1] = __('Disabled').' '.html_print_radio_button_extended ("update_gis_data", 1, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true); $table->data[4][1] = __('Disabled').' '.html_print_radio_button_extended ("update_gis_data", 1, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true);
$table->data[4][1] .= __('Enabled').' '.html_print_radio_button_extended ("update_gis_data", 0, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true); $table->data[4][1] .= __('Enabled').' '.html_print_radio_button_extended ("update_gis_data", 0, '', $updateGisData, false, '', 'style="margin-right: 40px;"', true);
$url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=gis&id_agente='.$id_agente; $url = 'index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=gis&id_agente='.$id_agente;
echo "<form method='post' action='" . $url . "' onsubmit ='return validateFormFields();'>"; echo "<form method='post' action='" . $url . "' onsubmit ='return validateFormFields();'>";
html_print_input_hidden('update_gis', 1); html_print_input_hidden('update_gis', 1);
html_print_table($table); html_print_table($table);

6
pandora_console/godmode/agentes/agent_template.php
View File

@ -114,7 +114,7 @@ if (isset ($_POST["template_id"])) {
// ========================== // ==========================
echo "<br>"; echo "<br>";
echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=template&id_agente='.$id_agente.'">'; echo '<form method="post" action="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=template&id_agente='.$id_agente.'">';
$nps = db_get_all_fields_in_table ("tnetwork_profile", "name"); $nps = db_get_all_fields_in_table ("tnetwork_profile", "name");
if ($nps === false) { if ($nps === false) {
@ -183,9 +183,9 @@ foreach ($result as $row) {
} }
$data[2] = mb_substr ($row["descripcion"], 0, 60); $data[2] = mb_substr ($row["descripcion"], 0, 60);
$data[3] = '<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&tab=template&id_agente='.$id_agente.'&delete_module='.$row["id_agente_modulo"].'">' . html_print_image("images/cross.png", true, array("border" => "0", "alt" => __('Delete'), "onclick" => "if (!confirm('".__('Are you sure?') . "')) return false;")) . '</a>&nbsp;&nbsp;'; $data[3] = '<a href="index.php?sec=estado&tab=module&sec2=godmode/agentes/configurar_agente&tab=template&id_agente='.$id_agente.'&delete_module='.$row["id_agente_modulo"].'">' . html_print_image("images/cross.png", true, array("border" => "0", "alt" => __('Delete'), "onclick" => "if (!confirm('".__('Are you sure?') . "')) return false;")) . '</a>&nbsp;&nbsp;';
$data[3] .= '&nbsp;&nbsp;<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&edit_module=1&id_agent_module='.$row["id_agente_modulo"].'">' . html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>'; $data[3] .= '&nbsp;&nbsp;<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&edit_module=1&id_agent_module='.$row["id_agente_modulo"].'">' . html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . '</a>';
array_push ($table->data, $data); array_push ($table->data, $data);
} }

14
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -226,7 +226,7 @@ if ($id_agente) {
$viewtab['active'] = false; $viewtab['active'] = false;
/* Main tab */ /* Main tab */
$maintab['text'] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=main&amp;id_agente='.$id_agente.'">' $maintab['text'] = '<a href="index.php?sec=estado&amp;sec2=godmode/agentes/configurar_agente&amp;tab=main&amp;id_agente='.$id_agente.'">'
. html_print_image ("images/cog.png", true, array ("title" =>__('Setup'))) . html_print_image ("images/cog.png", true, array ("title" =>__('Setup')))
. '</a>'; . '</a>';
if($tab == 'main') if($tab == 'main')
@ -236,7 +236,7 @@ if ($id_agente) {
$maintab['active'] = false; $maintab['active'] = false;
/* Module tab */ /* Module tab */
$moduletab['text'] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=module&amp;id_agente='.$id_agente.'">' $moduletab['text'] = '<a href="index.php?sec=estado&amp;sec2=godmode/agentes/configurar_agente&amp;tab=module&amp;id_agente='.$id_agente.'">'
. html_print_image ("images/brick.png", true, array ("title" =>__('Modules'))) . html_print_image ("images/brick.png", true, array ("title" =>__('Modules')))
. '</a>'; . '</a>';
@ -246,7 +246,7 @@ if ($id_agente) {
$moduletab['active'] = false; $moduletab['active'] = false;
/* Alert tab */ /* Alert tab */
$alerttab['text'] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=alert&amp;id_agente='.$id_agente.'">' $alerttab['text'] = '<a href="index.php?sec=estado&amp;sec2=godmode/agentes/configurar_agente&amp;tab=alert&amp;id_agente='.$id_agente.'">'
. html_print_image ("images/bell.png", true, array ("title" =>__('Alerts'))) . html_print_image ("images/bell.png", true, array ("title" =>__('Alerts')))
. '</a>'; . '</a>';
@ -256,7 +256,7 @@ if ($id_agente) {
$alerttab['active'] = false; $alerttab['active'] = false;
/* Template tab */ /* Template tab */
$templatetab['text'] = '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;tab=template&amp;id_agente='.$id_agente.'">' $templatetab['text'] = '<a href="index.php?sec=estado&amp;sec2=godmode/agentes/configurar_agente&amp;tab=template&amp;id_agente='.$id_agente.'">'
. html_print_image ("images/network.png", true, array ("title" =>__('Module templates'))) . html_print_image ("images/network.png", true, array ("title" =>__('Module templates')))
. '</a>'; . '</a>';
@ -280,7 +280,7 @@ if ($id_agente) {
/* Group tab */ /* Group tab */
$grouptab['text'] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&ag_group='.$group.'">' $grouptab['text'] = '<a href="index.php?sec=estado&sec2=godmode/agentes/modificar_agente&ag_group='.$group.'">'
. html_print_image ("images/agents_group.png", true, array( "title" => __('Group'))) . html_print_image ("images/agents_group.png", true, array( "title" => __('Group')))
. '</a>'; . '</a>';
@ -291,7 +291,7 @@ if ($id_agente) {
/* GIS tab */ /* GIS tab */
if ($config['activate_gis']) { if ($config['activate_gis']) {
$gistab['text'] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=gis&id_agente='.$id_agente.'">' $gistab['text'] = '<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=gis&id_agente='.$id_agente.'">'
. html_print_image ("images/world.png", true, array ( "title" => __('GIS data'))) . html_print_image ("images/world.png", true, array ( "title" => __('GIS data')))
. '</a>'; . '</a>';
@ -339,7 +339,7 @@ if ($id_agente) {
$active = false; $active = false;
} }
$url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=extension&id_agente='.$id_agente . '&id_extension=' . $id; $url = 'index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=extension&id_agente='.$id_agente . '&id_extension=' . $id;
$extension_tab = array('text' => '<a href="' . $url .'">' . html_print_image ($image, true, array ( "title" => $name)) . '</a>', 'active' => $active); $extension_tab = array('text' => '<a href="' . $url .'">' . html_print_image ($image, true, array ( "title" => $name)) . '</a>', 'active' => $active);

38
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -98,11 +98,11 @@ if (isset($result)) {
if (isset($_POST["ag_group"])) { if (isset($_POST["ag_group"])) {
$ag_group = get_parameter_post ("ag_group"); $ag_group = get_parameter_post ("ag_group");
echo "<form method='post' echo "<form method='post'
action='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&ag_group_refresh=".$ag_group."'>"; action='index.php?sec=estado&sec2=godmode/agentes/modificar_agente&ag_group_refresh=".$ag_group."'>";
} }
else { else {
echo "<form method='post' echo "<form method='post'
action='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente'>"; action='index.php?sec=estado&sec2=godmode/agentes/modificar_agente'>";
} }
echo "<table cellpadding='4' cellspacing='4' class='databox' width='98%'><tr>"; echo "<table cellpadding='4' cellspacing='4' class='databox' width='98%'><tr>";
@ -129,14 +129,14 @@ echo __('Free text for search (*)');
echo "</td><td>"; echo "</td><td>";
// Show group selector // Show group selector
echo "<form method='post' action='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&refr=60&ag_group_refresh=$ag_group&recursion=$recursion'>"; echo "<form method='post' action='index.php?sec=estado&sec2=godmode/agentes/modificar_agente&refr=60&ag_group_refresh=$ag_group&recursion=$recursion'>";
echo "<input type=text name='search' size='15' value='$search' >"; echo "<input type=text name='search' size='15' value='$search' >";
echo "</td><td valign='top'>"; echo "</td><td valign='top'>";
echo "<input name='srcbutton' type='submit' class='sub search' value='".__('Search')."'>"; echo "<input name='srcbutton' type='submit' class='sub search' value='".__('Search')."'>";
echo "</form>"; echo "</form>";
echo "<td>"; echo "<td>";
echo '<form method="post" action="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente">'; echo '<form method="post" action="index.php?sec=estado&amp;sec2=godmode/agentes/configurar_agente">';
html_print_input_hidden ('new_agent', 1); html_print_input_hidden ('new_agent', 1);
html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"'); html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"');
echo "</form>"; echo "</form>";
@ -343,24 +343,24 @@ if (($config['dbtype'] == 'oracle') && ($agents !== false)) {
} }
// Prepare pagination // Prepare pagination
ui_pagination ($total_agents, "index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id=$ag_group&recursion=$recursion&search=$search&sort_field=$sortField&sort=$sort", $offset); ui_pagination ($total_agents, "index.php?sec=estado&sec2=godmode/agentes/modificar_agente&group_id=$ag_group&recursion=$recursion&search=$search&sort_field=$sortField&sort=$sort", $offset);
echo "<div style='height: 20px'> </div>"; echo "<div style='height: 20px'> </div>";
if ($agents !== false) { if ($agents !== false) {
echo "<table cellpadding='4' id='agent_list' cellspacing='4' width='98%' class='databox'>"; echo "<table cellpadding='4' id='agent_list' cellspacing='4' width='98%' class='databox'>";
echo "<th>".__('Agent name') . ' ' . echo "<th>".__('Agent name') . ' ' .
'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=name&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '</a>' . '<a href="index.php?sec=estado&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=name&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectNameUp)) . '</a>' .
'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=name&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown)) . '</a>'; '<a href="index.php?sec=estado&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=name&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectNameDown)) . '</a>';
echo "</th>"; echo "</th>";
echo "<th title='".__('Remote agent configuration')."'>".__('R')."</th>"; echo "<th title='".__('Remote agent configuration')."'>".__('R')."</th>";
echo "<th>".__('OS'). ' ' . echo "<th>".__('OS'). ' ' .
'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=os&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectOsUp)) . '</a>' . '<a href="index.php?sec=estado&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=os&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectOsUp)) . '</a>' .
'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=os&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectOsDown)) . '</a>'; '<a href="index.php?sec=estado&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=os&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectOsDown)) . '</a>';
echo "</th>"; echo "</th>";
echo "<th>".__('Group'). ' ' . echo "<th>".__('Group'). ' ' .
'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=group&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectGroupUp)) . '</a>' . '<a href="index.php?sec=estado&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=group&sort=up">' . html_print_image("images/sort_up.png", true, array("style" => $selectGroupUp)) . '</a>' .
'<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=group&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectGroupDown)) . '</a>'; '<a href="index.php?sec=estado&sec2=godmode/agentes/modificar_agente&group_id='.$ag_group.'&recursion='.$recursion.'&search='.$search .'&offset='.$offset.'&sort_field=group&sort=down">' . html_print_image("images/sort_down.png", true, array("style" => $selectGroupDown)) . '</a>';
echo "</th>"; echo "</th>";
echo "<th>".__('Description')."</th>"; echo "<th>".__('Description')."</th>";
echo "<th>".__('Delete')."</th>"; echo "<th>".__('Delete')."</th>";
@ -400,7 +400,7 @@ if ($agents !== false) {
echo "<em>"; echo "<em>";
} }
echo '<span class="left">'; echo '<span class="left">';
echo "<strong><a class='item_drag_shortcut' href='index.php?sec=gagente& echo "<strong><a href='index.php?sec=estado&
sec2=godmode/agentes/configurar_agente&tab=main& sec2=godmode/agentes/configurar_agente&tab=main&
id_agente=".$agent["id_agente"]."'>" . ui_print_truncate_text($agent["nombre"], 60, true, true, true, '[&hellip;]', 'font-size: 7pt')."</a></strong>"; id_agente=".$agent["id_agente"]."'>" . ui_print_truncate_text($agent["nombre"], 60, true, true, true, '[&hellip;]', 'font-size: 7pt')."</a></strong>";
if ($agent["disabled"]) { if ($agent["disabled"]) {
@ -408,15 +408,15 @@ if ($agents !== false) {
echo "</em>"; echo "</em>";
} }
echo '</span><div class="left actions" style="visibility: hidden; clear: left">'; echo '</span><div class="left actions" style="visibility: hidden; clear: left">';
echo '<a href="index.php?sec=gagente& echo '<a href="index.php?sec=estado&
sec2=godmode/agentes/configurar_agente&tab=main& sec2=godmode/agentes/configurar_agente&tab=main&
id_agente='.$agent["id_agente"].'">'.__('Edit').'</a>'; id_agente='.$agent["id_agente"].'">'.__('Edit').'</a>';
echo ' | '; echo ' | ';
echo '<a href="index.php?sec=gagente& echo '<a href="index.php?sec=estado&
sec2=godmode/agentes/configurar_agente&tab=module& sec2=godmode/agentes/configurar_agente&tab=module&
id_agente='.$agent["id_agente"].'">'.__('Modules').'</a>'; id_agente='.$agent["id_agente"].'">'.__('Modules').'</a>';
echo ' | '; echo ' | ';
echo '<a href="index.php?sec=gagente& echo '<a href="index.php?sec=estado&
sec2=godmode/agentes/configurar_agente&tab=alert& sec2=godmode/agentes/configurar_agente&tab=alert&
id_agente='.$agent["id_agente"].'">'.__('Alerts').'</a>'; id_agente='.$agent["id_agente"].'">'.__('Alerts').'</a>';
echo ' | '; echo ' | ';
@ -431,7 +431,7 @@ if ($agents !== false) {
// Has remote configuration ? // Has remote configuration ?
$agent_md5 = md5 ($agent["nombre"], false); $agent_md5 = md5 ($agent["nombre"], false);
if (file_exists ($config["remote_config"]."/md5/".$agent_md5.".md5")) { if (file_exists ($config["remote_config"]."/md5/".$agent_md5.".md5")) {
echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=".$agent["id_agente"]."&disk_conf=1'>"; echo "<a href='index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=".$agent["id_agente"]."&disk_conf=1'>";
echo html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Edit remote config'))); echo html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Edit remote config')));
echo "</a>"; echo "</a>";
} }
@ -453,13 +453,13 @@ if ($agents !== false) {
else else
$offsetArg = $offset; $offsetArg = $offset;
echo "<td class='$tdcolor' align='center' valign='middle'><a href='index.php?sec=gagente&sec2=godmode/agentes/modificar_agente& echo "<td class='$tdcolor' align='center' valign='middle'><a href='index.php?sec=estado&sec2=godmode/agentes/modificar_agente&
borrar_agente=".$agent["id_agente"]."&group_id=$ag_group&recursion=$recursion&search=$search&offset=$offsetArg&sort_field=$sortField&sort=$sort'"; borrar_agente=".$agent["id_agente"]."&group_id=$ag_group&recursion=$recursion&search=$search&offset=$offsetArg&sort_field=$sortField&sort=$sort'";
echo ' onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'; echo ' onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
echo html_print_image('images/cross.png', true, array("border" => '0')) . "</a></td>"; echo html_print_image('images/cross.png', true, array("border" => '0')) . "</a></td>";
} }
echo "</table>"; echo "</table>";
ui_pagination ($total_agents, "index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&group_id=$ag_group&search=$search&sort_field=$sortField&sort=$sort", $offset); ui_pagination ($total_agents, "index.php?sec=estado&sec2=godmode/agentes/modificar_agente&group_id=$ag_group&search=$search&sort_field=$sortField&sort=$sort", $offset);
echo "<table width='95%'><tr><td align='right'>"; echo "<table width='95%'><tr><td align='right'>";
} }
else { else {
@ -469,7 +469,7 @@ else {
// Create agent button // Create agent button
echo '<a name="bottom">'; echo '<a name="bottom">';
echo '<form method="post" action="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente">'; echo '<form method="post" action="index.php?sec=estado&amp;sec2=godmode/agentes/configurar_agente">';
html_print_input_hidden ('new_agent', 1); html_print_input_hidden ('new_agent', 1);
html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"'); html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"');
echo "</form></td></tr></table>"; echo "</form></td></tr></table>";

14
pandora_console/godmode/agentes/module_manager.php
View File

@ -15,7 +15,7 @@
/* You can redefine $url and unset $id_agente to reuse the form. Dirty (hope temporal) hack */ /* You can redefine $url and unset $id_agente to reuse the form. Dirty (hope temporal) hack */
if (isset ($id_agente)) { if (isset ($id_agente)) {
$url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente='.$id_agente; $url = 'index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=module&id_agente='.$id_agente;
} }
@ -192,7 +192,7 @@ if ($multiple_delete) {
// MODULE VISUALIZATION TABLE // MODULE VISUALIZATION TABLE
// ========================== // ==========================
$url = 'index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=module&id_agente=' . $id_agente; $url = 'index.php?sec=estado&sec2=godmode/agentes/configurar_agente&tab=module&id_agente=' . $id_agente;
$selectNameUp = ''; $selectNameUp = '';
$selectNameDown = ''; $selectNameDown = '';
$selectServerUp = ''; $selectServerUp = '';
@ -445,7 +445,7 @@ foreach ($modules as $module) {
$data = array (); $data = array ();
} }
$data[0] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&edit_module=1&id_agent_module='.$module['id_agente_modulo'].'">'; $data[0] = '<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&edit_module=1&id_agent_module='.$module['id_agente_modulo'].'">';
if ($module["disabled"]) if ($module["disabled"])
$data[0] .= '<em class="disabled_module">' . ui_print_truncate_text($module['nombre'], 50, false, true, true, '[&hellip;]', 'font-size: 7.2pt').'</em>'; $data[0] .= '<em class="disabled_module">' . ui_print_truncate_text($module['nombre'], 50, false, true, true, '[&hellip;]', 'font-size: 7.2pt').'</em>';
else else
@ -528,12 +528,12 @@ foreach ($modules as $module) {
// Delete module // Delete module
$data[8] = html_print_checkbox('id_delete[]', $module['id_agente_modulo'], false, true); $data[8] = html_print_checkbox('id_delete[]', $module['id_agente_modulo'], false, true);
$data[8] .= '&nbsp;<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&delete_module='.$module['id_agente_modulo'].'" $data[8] .= '&nbsp;<a href="index.php?sec=estado&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&delete_module='.$module['id_agente_modulo'].'"
onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'; onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
$data[8] .= html_print_image ('images/cross.png', true, $data[8] .= html_print_image ('images/cross.png', true,
array ('title' => __('Delete'))); array ('title' => __('Delete')));
$data[8] .= '</a> '; $data[8] .= '</a> ';
$data[8] .= '&nbsp;<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&duplicate_module='.$module['id_agente_modulo'].'" $data[8] .= '&nbsp;<a href="index.php?sec=estado&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&duplicate_module='.$module['id_agente_modulo'].'"
onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'; onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
$data[8] .= html_print_image ('images/copy.png', true, $data[8] .= html_print_image ('images/copy.png', true,
array ('title' => __('Duplicate'))); array ('title' => __('Duplicate')));
@ -543,7 +543,7 @@ foreach ($modules as $module) {
if (isset($numericModules[$type])) { if (isset($numericModules[$type])) {
if ($numericModules[$type] === true) { if ($numericModules[$type] === true) {
$data[8] .= '&nbsp;<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&fix_module='.$module['id_agente_modulo'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'; $data[8] .= '&nbsp;<a href="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module&fix_module='.$module['id_agente_modulo'].'" onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
$data[8] .= html_print_image ('images/chart_curve.png', true, $data[8] .= html_print_image ('images/chart_curve.png', true,
array ('title' => __('Normalize'))); array ('title' => __('Normalize')));
$data[8] .= '</a>'; $data[8] .= '</a>';
@ -553,7 +553,7 @@ foreach ($modules as $module) {
array_push ($table->data, $data); array_push ($table->data, $data);
} }
echo '<form method="post" action="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module" echo '<form method="post" action="index.php?sec=estado&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&tab=module"
onsubmit="if (! confirm (\''.__('Are you sure?').'\')) return false">'; onsubmit="if (! confirm (\''.__('Are you sure?').'\')) return false">';
html_print_table ($table); html_print_table ($table);
echo '<div class="action-buttons" style="width: '.$table->width.'">'; echo '<div class="action-buttons" style="width: '.$table->width.'">';

2
pandora_console/godmode/agentes/module_manager_editor_common.php
View File

@ -126,7 +126,7 @@ $table_simple->data[0][0] = __('Name');
$table_simple->data[0][1] = html_print_input_text ('name', io_safe_output($name), '', 45, 100, true, $disabledBecauseInPolicy); $table_simple->data[0][1] = html_print_input_text ('name', io_safe_output($name), '', 45, 100, true, $disabledBecauseInPolicy);
if (!empty($id_agent_module) && isset($id_agente)) { if (!empty($id_agent_module) && isset($id_agente)) {
$table_simple->data[0][1] .= '&nbsp;<a href="index.php?sec=gagente&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&delete_module='.$id_agent_module.'" $table_simple->data[0][1] .= '&nbsp;<a href="index.php?sec=estado&tab=module&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'&delete_module='.$id_agent_module.'"
onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">'; onClick="if (!confirm(\' '.__('Are you sure?').'\')) return false;">';
$table_simple->data[0][1] .= html_print_image ('images/cross.png', true, $table_simple->data[0][1] .= html_print_image ('images/cross.png', true,
array ('title' => __('Delete module'))); array ('title' => __('Delete module')));

4
pandora_console/godmode/menu.php
View File

@ -25,8 +25,8 @@ $menu = array ();
$menu['class'] = 'godmode'; $menu['class'] = 'godmode';
if (check_acl ($config['id_user'], 0, "AW")) { if (check_acl ($config['id_user'], 0, "AW")) {
$menu["gagente"]["text"] = __('Manage agents'); $menu["gagente"]["text"] = __('Manage monitoring');
$menu["gagente"]["sec2"] = "godmode/agentes/modificar_agente"; $menu["gagente"]["sec2"] = "godmode/agentes/manage_config_remote";
$menu["gagente"]["id"] = "god-agents"; $menu["gagente"]["id"] = "god-agents";
$sub = array (); $sub = array ();

21
pandora_console/operation/agentes/estado_agente.php
View File

@ -129,7 +129,7 @@ if (check_acl ($config['id_user'], 0, "AW")) {
$tab = 'setup'; $tab = 'setup';
/* Setup tab */ /* Setup tab */
$setuptab['text'] = '<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente">' $setuptab['text'] = '<a href="index.php?sec=estado&sec2=godmode/agentes/modificar_agente">'
. html_print_image ("images/setup.png", true, array ("title" =>__('Setup'))) . html_print_image ("images/setup.png", true, array ("title" =>__('Setup')))
. '</a>'; . '</a>';
@ -181,7 +181,16 @@ echo '</td><td style="white-space:nowrap;">';
html_print_submit_button (__('Search'), "srcbutton", '', array ("class" => "sub search")); html_print_submit_button (__('Search'), "srcbutton", '', array ("class" => "sub search"));
echo '</td><td style="width:5%;">&nbsp;</td></tr></table></form>'; echo '</td><td style="width:5%;">&nbsp;</form></td>';
echo '<td>';
echo '<form method="post" action="index.php?sec=estado&sec2=godmode/agentes/configurar_agente">';
html_print_input_hidden ('new_agent', 1);
html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"');
echo "</form>";
echo '</td>';
echo '</tr></table>';
if ($search != ""){ if ($search != ""){
$filter = array ("string" => '%' . $search . '%'); $filter = array ("string" => '%' . $search . '%');
@ -398,15 +407,15 @@ foreach ($agents as $agent) {
$data[0] .= '<div class="left actions" style="visibility: hidden; clear: left">'; $data[0] .= '<div class="left actions" style="visibility: hidden; clear: left">';
$data[0] .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'">'.__('View').'</a>'; $data[0] .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'">'.__('View').'</a>';
$data[0] .= ' | '; $data[0] .= ' | ';
$data[0] .= '<a href="index.php?sec=gagente&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'&tab=data">'.__('Data').'</a>'; $data[0] .= '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'&tab=data">'.__('Data').'</a>';
if (check_acl ($config['id_user'], $agent["id_grupo"], "AW")) { if (check_acl ($config['id_user'], $agent["id_grupo"], "AW")) {
$data[0] .= ' | '; $data[0] .= ' | ';
$data[0] .= '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$agent["id_agente"].'">'.__('Edit').'</a>'; $data[0] .= '<a href="index.php?sec=estado&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$agent["id_agente"].'">'.__('Edit').'</a>';
} }
$data[0] .= '</div>'; $data[0] .= '</div>';
/*if (check_acl ($config['id_user'], $agent["id_grupo"], "AW")) { /*if (check_acl ($config['id_user'], $agent["id_grupo"], "AW")) {
$data[0] .= '<a href="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$agent["id_agente"].'">'; $data[0] .= '<a href="index.php?sec=estado&amp;sec2=godmode/agentes/configurar_agente&amp;id_agente='.$agent["id_agente"].'">';
$data[0] .= html_print_image ("images/setup.png", true, array ("border" => 0, "width" => 16)); $data[0] .= html_print_image ("images/setup.png", true, array ("border" => 0, "width" => 16));
$data[0] .= '</a>&nbsp;'; $data[0] .= '</a>&nbsp;';
}*/ }*/
@ -477,7 +486,7 @@ if (check_acl ($config['id_user'], 0, "LM") || check_acl ($config['id_user'], 0,
|| check_acl ($config['id_user'], 0, "PM") || check_acl ($config['id_user'], 0, "DM") || check_acl ($config['id_user'], 0, "PM") || check_acl ($config['id_user'], 0, "DM")
|| check_acl ($config['id_user'], 0, "UM")) { || check_acl ($config['id_user'], 0, "UM")) {
echo '<form method="post" action="index.php?sec=gagente&amp;sec2=godmode/agentes/configurar_agente">'; echo '<form method="post" action="index.php?sec=estado&amp;sec2=godmode/agentes/configurar_agente">';
html_print_input_hidden ('new_agent', 1); html_print_input_hidden ('new_agent', 1);
html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"'); html_print_submit_button (__('Create agent'), 'crt', false, 'class="sub next"');
echo '</form>'; echo '</form>';

14
pandora_console/operation/menu.php
View File

@ -45,6 +45,20 @@ if (check_acl ($config['id_user'], 0, "AR")) {
$sub["operation/agentes/estado_agente"]["text"] = __('Agent detail'); $sub["operation/agentes/estado_agente"]["text"] = __('Agent detail');
$sub["operation/agentes/estado_agente"]["refr"] = 0; $sub["operation/agentes/estado_agente"]["refr"] = 0;
$sub["operation/agentes/estado_agente"]["subsecs"] = array("godmode/agentes/agent_conf_gis",
"godmode/agentes/agent_disk_conf_editor",
"godmode/agentes/agent_template",
"godmode/agentes/configurar_agente",
"godmode/agentes/modificar_agente",
"godmode/agentes/module_manager",
"godmode/agentes/module_manager_editor",
"godmode/agentes/module_manager_editor_common",
"godmode/agentes/module_manager_editor_data",
"godmode/agentes/module_manager_editor_network",
"godmode/agentes/module_manager_editor_plugin",
"godmode/agentes/module_manager_editor_prediction",
"godmode/agentes/module_manager_editor_wmi",
"operation/agentes/ver_agente");
$sub["operation/agentes/alerts_status"]["text"] = __('Alert detail'); $sub["operation/agentes/alerts_status"]["text"] = __('Alert detail');
$sub["operation/agentes/alerts_status"]["refr"] = 0; $sub["operation/agentes/alerts_status"]["refr"] = 0;