| ";
+echo __('Search').''.html_print_input_text(
'search_string',
$search_string,
'',
- 15,
- 255,
+ 5,
+ 5,
true
);
html_print_input_hidden('search', 1);
@@ -73,7 +73,6 @@ echo ' | ';
echo "";
html_print_submit_button(__('Filter'), 'filter', false, 'class="sub search"');
echo ' | ';
-echo " | ";
echo '';
// Check if there is at least one server of each type available to assign that
// kind of modules. If not, do not show server type in combo.
@@ -179,7 +178,7 @@ if (($policy_page) || (isset($agent))) {
// Create module/type combo.
echo '
';
@@ -247,6 +246,8 @@ if ($module_action === 'delete') {
$print_result_msg = true;
$count_correct_delete_modules = 0;
foreach ($id_agent_modules_delete as $id_agent_module_del) {
+ // Before delete the main module, check and delete the childrens from the original module.
+ module_check_childrens_and_delete($id_agent_module_del);
$id_grupo = (int) agents_get_agent_group($id_agente);
$all_groups = agents_get_all_groups_agent($id_agente, $id_grupo);
diff --git a/pandora_console/godmode/agentes/module_manager_editor_network.php b/pandora_console/godmode/agentes/module_manager_editor_network.php
index 4a39db6d75..323c5c1566 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_network.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_network.php
@@ -69,7 +69,7 @@ if (strstr($page, 'policy_modules') === false) {
define('ID_NETWORK_COMPONENT_TYPE', 2);
-if (empty($update_module_id)) {
+if (empty($edit_module)) {
// Function in module_manager_editor_common.php.
add_component_selection(ID_NETWORK_COMPONENT_TYPE);
}
diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
index 62bac54340..c00515de77 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php
@@ -36,7 +36,7 @@ if (strstr($page, 'policy_modules') === false) {
define('ID_NETWORK_COMPONENT_TYPE', 4);
-if (empty($update_module_id)) {
+if (empty($edit_module)) {
// Function in module_manager_editor_common.php
add_component_selection(ID_NETWORK_COMPONENT_TYPE);
} else {
diff --git a/pandora_console/godmode/agentes/module_manager_editor_web.php b/pandora_console/godmode/agentes/module_manager_editor_web.php
index 7812bf808d..683204c88d 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_web.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_web.php
@@ -82,7 +82,7 @@ if ($plugin_pass == '' && !$id_agent_module) {
$plugin_pass = 1;
}
-if (empty($update_module_id)) {
+if (empty($edit_module)) {
// Function in module_manager_editor_common.php
add_component_selection(ID_NETWORK_COMPONENT_TYPE);
} else {
diff --git a/pandora_console/godmode/agentes/module_manager_editor_wmi.php b/pandora_console/godmode/agentes/module_manager_editor_wmi.php
index 9d570fb696..a9de26ac17 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_wmi.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_wmi.php
@@ -34,7 +34,7 @@ $extra_title = __('WMI server module');
define('ID_NETWORK_COMPONENT_TYPE', 6);
-if (empty($update_module_id)) {
+if (empty($edit_module)) {
// Function in module_manager_editor_common.php
add_component_selection(ID_NETWORK_COMPONENT_TYPE);
} else {
diff --git a/pandora_console/godmode/agentes/planned_downtime.editor.php b/pandora_console/godmode/agentes/planned_downtime.editor.php
index ed41aee0ef..08688c623b 100644
--- a/pandora_console/godmode/agentes/planned_downtime.editor.php
+++ b/pandora_console/godmode/agentes/planned_downtime.editor.php
@@ -1842,6 +1842,10 @@ function insert_downtime_agent($id_downtime, $user_groups_ad)
$(document).ready (function () {
populate_agents_selector();
+ // Add data-pendingdelete attribute to exclude delete_pending modules
+ document.querySelector("#id_agents").dataset.pendingdelete = true
+ document.querySelector("#modules_selection_mode").dataset.pendingdelete = true
+
$("#id_agents").change(agent_changed_by_multiple_agents);
$("#modules_selection_mode").change(agent_changed_by_multiple_agents);
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index d2a7e89469..8956ee0528 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -231,7 +231,7 @@ if (strlen(trim($agentName)) > 0) {
}
if ($actionID != -1 && $actionID != '') {
- $where .= ' AND talert_template_modules.id IN (SELECT id_alert_template_module FROM talert_template_module_actions WHERE id_alert_action = '.$actionID.') OR talert_template_modules.id IN (SELECT id FROM talert_template_modules ttm WHERE ttm.id_alert_template IN (SELECT tat.id FROM talert_templates tat WHERE tat.id_alert_action = '.$actionID.'))';
+ $where .= ' AND (talert_template_modules.id IN (SELECT id_alert_template_module FROM talert_template_module_actions WHERE id_alert_action = '.$actionID.') OR talert_template_modules.id IN (SELECT id FROM talert_template_modules ttm WHERE ttm.id_alert_template IN (SELECT tat.id FROM talert_templates tat WHERE tat.id_alert_action = '.$actionID.')))';
}
if ($status_alert === 'disabled') {
diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php
index 7856f68665..196d6024d6 100644
--- a/pandora_console/godmode/groups/group_list.php
+++ b/pandora_console/godmode/groups/group_list.php
@@ -92,6 +92,7 @@ if (is_ajax() === true) {
if ($get_group_agents === true) {
ob_clean();
$id_group = (int) get_parameter('id_group');
+ $id_os = (int) get_parameter('id_os', 0);
$disabled = (int) get_parameter('disabled', 0);
$search = (string) get_parameter('search', '');
$recursion = (int) get_parameter('recursion', 0);
@@ -151,6 +152,10 @@ if (is_ajax() === true) {
$filter['status'] = $status_agents;
}
+ if ($id_os !== 0) {
+ $filter['id_os'] = $id_os;
+ }
+
$_sql_post = ' 1=1 ';
if ($show_void_agents == 0) {
$_sql_post .= ' AND id_agente IN (SELECT a.id_agente FROM tagente a, tagente_modulo b WHERE a.id_agente=b.id_agente AND b.delete_pending=0) AND \'1\'';
@@ -782,18 +787,18 @@ if ($tab == 'tree') {
$form = "';
diff --git a/pandora_console/godmode/setup/setup_general.php b/pandora_console/godmode/setup/setup_general.php
index 93a3d64a27..f7b10f74e7 100644
--- a/pandora_console/godmode/setup/setup_general.php
+++ b/pandora_console/godmode/setup/setup_general.php
@@ -95,11 +95,11 @@ $table->data[$i++][1] = html_print_input_text(
true
);
-$table->data[$i][0] = __('Phantomjs bin directory');
+$table->data[$i][0] = __('Chromium path');
$table->data[$i++][1] = html_print_input_text(
- 'phantomjs_bin',
+ 'chromium_path',
io_safe_output(
- $config['phantomjs_bin']
+ $config['chromium_path']
),
'',
30,
diff --git a/pandora_console/godmode/users/configure_profile.php b/pandora_console/godmode/users/configure_profile.php
index b1db4e26e9..70342f1fea 100644
--- a/pandora_console/godmode/users/configure_profile.php
+++ b/pandora_console/godmode/users/configure_profile.php
@@ -404,6 +404,7 @@ if ($id_profile || $new_profile) {
html_print_input_hidden('create_profile', 1);
} else {
html_print_input_hidden('id', $id_profile);
+ html_print_input_hidden('old_name_profile', $name);
html_print_input_hidden('update_profile', 1);
html_print_submit_button(__('Update'), 'upd', false, 'class="sub upd"');
}
@@ -415,15 +416,53 @@ enterprise_hook('close_meta_frame');
?>
-
diff --git a/pandora_console/include/ajax/alert_list.ajax.php b/pandora_console/include/ajax/alert_list.ajax.php
index ae7ff1501b..a92ba9f9d9 100644
--- a/pandora_console/include/ajax/alert_list.ajax.php
+++ b/pandora_console/include/ajax/alert_list.ajax.php
@@ -654,7 +654,7 @@ if ($get_agent_alerts_datatable === true) {
}
$idGroup = $filter_alert['ag_group'];
- $tag_filter = $filter_alert['tag_filter'];
+ $tag_filter = $filter_alert['tag'];
$action_filter = $filter_alert['action'];
try {
@@ -884,9 +884,9 @@ if ($get_agent_alerts_datatable === true) {
users_get_groups($config['id_user'], $access, false)
);
- $alerts['alerts_simple'] = get_group_alerts($id_groups, $filter_alert, $options_simple, $whereAlertSimple, false, false, $idGroup, false, $strict_user, $tag_filter, $action_filter);
+ $alerts['alerts_simple'] = get_group_alerts($id_groups, $filter_alert, $options_simple, $whereAlertSimple, false, false, $idGroup, false, $strict_user, $tag_filter, $action_filter, false);
- $countAlertsSimple = get_group_alerts($id_groups, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, true, $strict_user, $tag_filter, $action_filter);
+ $countAlertsSimple = get_group_alerts($id_groups, $filter_alert, false, $whereAlertSimple, false, false, $idGroup, true, $strict_user, $tag_filter, $action_filter, false);
}
}
diff --git a/pandora_console/include/ajax/events.php b/pandora_console/include/ajax/events.php
index bdba9acf39..2494a83634 100644
--- a/pandora_console/include/ajax/events.php
+++ b/pandora_console/include/ajax/events.php
@@ -2031,8 +2031,10 @@ if ($total_event_graph) {
include_once $config['homedir'].'/include/functions_graph.php';
- $prueba = grafico_eventos_total('', 280, 150, false, true);
- echo $prueba;
+ $out = '
';
+ $out .= grafico_eventos_total('', 0, 0, false, true);
+ $out .= '
';
+ echo $out;
return;
}
@@ -2041,8 +2043,10 @@ if ($graphic_event_group) {
include_once $config['homedir'].'/include/functions_graph.php';
- $prueba = grafico_eventos_grupo(280, 150, '', false, true);
- echo $prueba;
+ $out = '
';
+ $out .= grafico_eventos_grupo(0, 0, '', false, true);
+ $out .= '
';
+ echo $out;
return;
}
diff --git a/pandora_console/include/ajax/profile.php b/pandora_console/include/ajax/profile.php
new file mode 100644
index 0000000000..56a29fd31d
--- /dev/null
+++ b/pandora_console/include/ajax/profile.php
@@ -0,0 +1,29 @@
+ md5($password_new),
+ 'password' => password_hash($password_new, PASSWORD_BCRYPT),
'last_pass_change' => date('Y/m/d H:i:s', get_system_time()),
],
['id_user' => $user]
@@ -1006,7 +1016,7 @@ function create_user_and_permisions_ldap(
$values['id_user'] = $id_user;
if ($config['ldap_save_password'] || $config['ad_save_password']) {
- $values['password'] = md5($password);
+ $values['password'] = password_hash($password, PASSWORD_BCRYPT);
}
$values['last_connect'] = 0;
@@ -1438,9 +1448,9 @@ function change_local_user_pass_ldap($id_user, $password)
$local_user_pass = db_get_value_filter('password', 'tusuario', ['id_user' => $id_user]);
$return = false;
- if (md5($password) !== $local_user_pass) {
+ if (password_hash($password, PASSWORD_BCRYPT) !== $local_user_pass) {
$values_update = [];
- $values_update['password'] = md5($password);
+ $values_update['password'] = password_hash($password, PASSWORD_BCRYPT);
$return = db_process_sql_update('tusuario', $values_update, ['id_user' => $id_user]);
}
diff --git a/pandora_console/include/chart_generator.php b/pandora_console/include/chart_generator.php
index 764f8ca3ce..c0ba8eb3ac 100644
--- a/pandora_console/include/chart_generator.php
+++ b/pandora_console/include/chart_generator.php
@@ -42,40 +42,23 @@ require_once $config['homedir'].'/include/functions_agents.php';
require_once $config['homedir'].'/include/functions_tags.php';
$data_raw = get_parameter('data');
-$data_decoded = json_decode(base64_decode($data_raw), true);
+$data_decoded = json_decode(io_safe_output($data_raw), true);
if (json_last_error() === JSON_ERROR_NONE) {
- $data = urldecode($data_decoded['data']);
- $session_id = urldecode($data_decoded['session_id']);
- $data_combined = urldecode($data_decoded['data_combined']);
- $data_module_list = urldecode($data_decoded['data_module_list']);
- $type_graph_pdf = urldecode($data_decoded['type_graph_pdf']);
- $viewport_width = urldecode($data_decoded['viewport_width']);
+ $data = $data_decoded['data'];
+ $session_id = $data_decoded['session_id'];
+ $type_graph_pdf = $data_decoded['type_graph_pdf'];
+
+ $data_combined = [];
+ if (isset($data_decoded['data_combined']) === true) {
+ $data_combined = $data_decoded['data_combined'];
+ }
+
+ $data_module_list = [];
+ if (isset($data_decoded['data_module_list']) === true) {
+ $data_module_list = $data_decoded['data_module_list'];
+ }
}
-
-/**
- * Echo to stdout a PhantomJS callback call.
- *
- * @return void
- */
-function echoPhantomCallback()
-{
- ?>
-
-
Access is not granted
-