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

Merge branch 'develop' into ent-13085-17271-cifrado-de-contrasena-ldap-en-el-inspector-2

This commit is contained in:
Daniel Cebrian 2024-04-30 09:35:14 +02:00
parent 87c61fd015 ed5ddc1799
commit 2555e12760
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_agents.php
View File

@ -4934,7 +4934,7 @@ function get_resume_agent_concat($id_agente, $all_groups, $agent)
$module_score = modules_get_agentmodule_id(io_safe_input('Hardening - Score'), $agent['id_agente']);
$hardening = '';
if (is_array($module_score) === true && key_exists('id_agente_modulo', $module_score) == true) {
$raw_data_score = modules_get_raw_data($module_score['id_agente_modulo'], 0, time());
$raw_data_score = modules_get_raw_data($module_score['id_agente_modulo'], 0, time(), false);
$hardening = format_numeric($raw_data_score[0]['datos'], 2);
$data = [];
$data[0] = '<b>'.__('Hardening').'</b>';

6
pandora_console/include/functions_filemanager.php
View File

@ -1032,7 +1032,7 @@ function filemanager_file_explorer(
false,
'show_form_create_folder()',
[
'class' => 'margin-right-2 invert_filter secondary',
'class' => 'margin-right-2 primary buttonButton',
'icon' => 'create_directory',
],
true,
@ -1047,7 +1047,7 @@ function filemanager_file_explorer(
false,
'show_create_text_file()',
[
'class' => 'margin-right-2 invert_filter secondary',
'class' => 'margin-right-2 primary buttonButton',
'icon' => 'create_file',
],
true,
@ -1061,7 +1061,7 @@ function filemanager_file_explorer(
false,
'show_upload_file()',
[
'class' => 'margin-right-2 invert_filter secondary',
'class' => 'margin-right-2 primary buttonButton',
'icon' => 'upload_file',
],
true,

4
pandora_console/include/functions_modules.php
View File

@ -1148,12 +1148,12 @@ function modules_get_table_data(?int $id_agent_module, ?int $id_type)
}
function modules_get_raw_data($id_agent_module, $date_init, $date_end)
function modules_get_raw_data($id_agent_module, $date_init, $date_end, $search_in_history_db=true)
{
$table = modules_get_table_data($id_agent_module, null);
$datelimit = ($date_init - $date_end);
$search_in_history_db = db_search_in_history_db($datelimit);
$search_in_history_db = (($search_in_history_db === true) ? db_search_in_history_db($datelimit) : false);
$data = db_get_all_rows_sql(
'

2
pandora_console/include/javascript/jquery.pandora.js
View File

@ -216,7 +216,7 @@ $(document).ready(function() {
});
$("#ok_buttom").click(function() {
$("#license_error_msg_dialog").dialog("close");
$(".ui-dialog-content").dialog("close");
});
}
}