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

2009-05-11 Esteban Sánchez <estebans@artica.es> 

* godmode/agentes/agent_manager.php: Show "None" if no server is assigned.
	Fixes #2768723
	
	* godmode/agentes/configurar_agente.php: Removed direct link to
	farscap.artica.es server. Fixed group tab selection.
	
	* godmode/alerts/alert_list.php: Fixed a notice when there are no agents.
	Fixes #2786519.
	
	* general/header.php: Fixed an error when updating agent configuration
	which was showing all the config in the header. Should be improved for
	other textarea fields.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1680 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Esteban Sanchez 2009-05-11 13:24:27 +00:00
parent 810da3218e
commit 4da1121f4d
5 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/ChangeLog
View File

@ -1,3 +1,18 @@
2009-05-11 Esteban Sánchez <estebans@artica.es>
* godmode/agentes/agent_manager.php: Show "None" if no server is assigned.
Fixes #2768723
* godmode/agentes/configurar_agente.php: Removed direct link to
farscap.artica.es server. Fixed group tab selection.
* godmode/alerts/alert_list.php: Fixed a notice when there are no agents.
Fixes #2786519.
* general/header.php: Fixed an error when updating agent configuration
which was showing all the config in the header. Should be improved for
other textarea fields.
2009-05-07 Esteban Sánchez <estebans@artica.es>
* include/funtions_ui.php: Added get_full_url(). Some changes in

10
pandora_console/general/header.php
View File

@ -81,12 +81,15 @@ echo "</a>";
// Third column
// Autorefresh
echo '</td><td width="20%">';
$ignored_params = array ('agent_config' => false);
if ($config["refr"]) {
echo '<a id="autorefresh" class="white_grey_bold" href="'.get_url_refresh (array ('refr' => 0)).'"><img src="images/page_lightning.png" class="bot" alt="lightning" />&nbsp;'. __('Autorefresh');
$ignored_params['refr'] = 0;
echo '<a id="autorefresh" class="white_grey_bold" href="'.get_url_refresh ($ignored_params).'"><img src="images/page_lightning.png" class="bot" alt="lightning" />&nbsp;'. __('Autorefresh');
echo ' (<span id="refrcounter">'.date ("i:s", $config["refr"]).'</span>)';
echo '</a>';
} else {
echo '<a id="autorefresh" class="white_bold" href="'.get_url_refresh (array ('refr' => '')).'"><img src="images/page_lightning.png" class="bot" alt="lightning" />&nbsp;'.__('Autorefresh').'</a>';
} else {
$ignored_params['refr'] = '';
echo '<a id="autorefresh" class="white_bold" href="'.get_url_refresh ($ignored_params).'"><img src="images/page_lightning.png" class="bot" alt="lightning" />&nbsp;'.__('Autorefresh').'</a>';
$values = array ('5' => '5 '.__('seconds'),
'10' => '10 '.__('seconds'),
'15' => '15 '.__('seconds'),
@ -99,6 +102,7 @@ if ($config["refr"]) {
'3600' => '1 '.__('hour'));
echo '<span id="combo_refr" style="display: none">';
print_select ($values, 'ref', '', '', __('Select'), '0', false, false, false);
unset ($values);
echo '</span>';
}

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

@ -118,10 +118,12 @@ $table->data[5][1] .= print_os_icon ($id_os, false, true);
$table->data[5][1] .= '</span>';
// Network server
$none = '';
if ($server_name == '' && $id_agente)
$none = __('None');
$table->data[6][0] = __('Server');
$table->data[6][1] = print_select (get_server_names (),
'server_name', $server_name, '', '', 0, true);
'server_name', $server_name, '', $none, 0, true);
// Custom ID
$table->data[7][0] = __('Custom ID');

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

@ -216,8 +216,8 @@ if ($id_agente) {
enterprise_hook ('inventory_tab');
echo '<li class="'.($tab == "template" ? 'nomn_high' : 'nomn').'">';
echo '<a href="http://farscape.artica.es/pandora_console/index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&ag_group='.$group.'">';
echo '<li class="nomn">';
echo '<a href="index.php?sec=gagente&sec2=godmode/agentes/modificar_agente&ag_group='.$group.'">';
print_image ("images/god4.png", false, $img_style);
echo '&nbsp; '.__('Group').'</a></li>';

14
pandora_console/godmode/alerts/alert_list.php
View File

@ -198,12 +198,14 @@ if ($id_agente) {
if ($id_agente) {
$simple_alerts = get_agent_alerts_simple (array_keys ($agents));
} else {
$sql = sprintf ('SELECT COUNT(*) FROM talert_template_modules
WHERE id_agent_module IN (SELECT id_agente_modulo
FROM tagente_modulo WHERE id_agente IN (%s))',
implode (',', array_keys ($agents)));
$total = get_db_sql ($sql);
$total = 0;
if (! empty ($agents)) {
$sql = sprintf ('SELECT COUNT(*) FROM talert_template_modules
WHERE id_agent_module IN (SELECT id_agente_modulo
FROM tagente_modulo WHERE id_agente IN (%s))',
implode (',', array_keys ($agents)));
$total = get_db_sql ($sql);
}
pagination ($total, 'index.php?sec=gagente&sec2=godmode/alerts/alert_list');
$simple_alerts = get_agent_alerts_simple (array_keys ($agents), '',
array ('offset' => (int) get_parameter ('offset'),