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

2013-08-30 Miguel de Dios <miguel.dedios@artica.es> 

* operation/agentes/estado_generalagente.php: show a warning
	message when the agent has not a assigned server.
	
	* operation/agentes/ver_agente.php: some changes for to make more
	easy the merge with the trunk.
	
	MERGED FROM THE TRUNK.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8718 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-08-30 11:21:51 +00:00
parent 602ceb1941
commit 3b12a6b059
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/estado_generalagente.php: show a warning
message when the agent has not a assigned server.
* operation/agentes/ver_agente.php: some changes for to make more
easy the merge with the trunk.
MERGED FROM THE TRUNK.
2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/groups/group_list.php: fixed pagination mismatch.
@ -18,7 +28,8 @@
* godmode/agentes/module_manager_editor_common.php: added code to
policy module editor with disabled unknown events modules.
2013-08-28 Miguel de Dios <miguel.dedios@artica.es>
2013-08-28 Miguel de Dios <miguel.dedios@artica.
es>
* include/functions_modules.php: fixed the massive copy modules
between agents.

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

@ -32,6 +32,11 @@ $id_agente = get_parameter_get ("id_agente", -1);
$agent = db_get_row ("tagente", "id_agente", $id_agente);
if (empty($agent['server_name'])) {
ui_print_error_message(
__('The agent has not assigned server. Maybe agent does not run fine.'));
}
if ($agent === false) {
ui_print_error_message(__('There was a problem loading agent'));
return;
@ -119,8 +124,9 @@ $table_agent->rowclass[] = '';
$addresses = agents_get_addresses($id_agente);
$address = agents_get_address($id_agente);
foreach ($addresses as $k => $add) {
if($add == $address) {
if ($add == $address) {
unset($addresses[$k]);
}
}

19
pandora_console/operation/agentes/ver_agente.php
View File

@ -347,8 +347,8 @@ if (is_ajax ()) {
if (metaconsole_load_external_db($connection) == NOERR) {
/* Get all agents if no agent was given */
if ($id_agent == 0)
$id_agent = array_keys (
agents_get_group_agents (
$id_agent = array_keys(
agents_get_group_agents(
array_keys (users_get_groups ()), $search, "none"));
$agent_modules = agents_get_modules ($id_agent,
@ -362,14 +362,16 @@ if (is_ajax ()) {
else {
/* Get all agents if no agent was given */
if ($id_agent == 0)
$id_agent = array_keys (agents_get_group_agents (array_keys (users_get_groups ()), $search, "none"));
$id_agent = array_keys(
agents_get_group_agents(
array_keys(users_get_groups ()), $search, "none"));
$agent_modules = agents_get_modules ($id_agent,
($fields != '' ? explode (',', $fields) : "*"),
($filter != '' ? $filter : false), $indexed);
}
foreach($agent_modules as $key => $module) {
foreach ($agent_modules as $key => $module) {
$agent_modules[$key]['nombre'] = io_safe_output($module['nombre']);
}
@ -687,6 +689,7 @@ $tab = get_parameter ("tab", "main");
/* Manage tab */
$managetab = "";
if (check_acl ($config['id_user'],$id_grupo, "AW") || $is_extra) {
$managetab['text'] ='<a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente='.$id_agente.'">'
. html_print_image("images/setup.png", true, array ("title" => __('Manage')))
@ -705,16 +708,19 @@ if (check_acl ($config['id_user'],$id_grupo, "AW") || $is_extra) {
$maintab['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'">'
. html_print_image("images/agent_mc.png", true, array("title" => __('Main')))
. '</a>';
if ($tab == 'main')
$maintab['active'] = true;
else
$maintab['active'] = false;
/* Alert tab */
$alerttab['text'] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$id_agente.'&tab=alert">'
. html_print_image("images/op_alerts.png", true, array("title" => __('Alerts')))
. '</a>';
if ($tab == 'alert')
$alerttab['active'] = true;
else
@ -737,6 +743,7 @@ $policyTab = enterprise_hook('policy_tab');
if ($policyTab == -1)
$policyTab = "";
/* GIS tab */
$gistab="";
if ($config['activate_gis']) {
@ -821,7 +828,7 @@ if ($agent['url_address'] != '') {
}
//Tabs for extensions
foreach($config['extensions'] as $extension) {
foreach ($config['extensions'] as $extension) {
if (isset($extension['extension_ope_tab'])) {
//VMware extension is only available for VMware OS
@ -870,7 +877,7 @@ foreach($config['extensions'] as $extension) {
$extension_tab = array('text' => '<a href="' . $url .'">' . html_print_image ($image, true, array ( "title" => $name)) . '</a>', 'active' => $active);
$onheader = $onheader + array($id => $extension_tab);
$onheader = $onheader + array($id => $extension_tab);
}
}