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

Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center

This commit is contained in:
Daniel Barbero Martin 2021-05-07 08:33:56 +02:00
parent 51f38f3589 454e6120e4
commit 77693b6c6d
42 changed files with 272 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extras/deploy-scripts/pandora_deploy_community.sh
View File

@ -270,10 +270,10 @@ vmware_dependencies=" \
execute_cmd "yum install -y $vmware_dependencies" "Installing SDK VMware perl dependencies"
# Instant client Oracle
oracle_dependencier=" \
oracle_dependencies=" \
https://download.oracle.com/otn_software/linux/instantclient/19800/oracle-instantclient19.8-basic-19.8.0.0.0-1.x86_64.rpm \
https://download.oracle.com/otn_software/linux/instantclient/19800/oracle-instantclient19.8-sqlplus-19.8.0.0.0-1.x86_64.rpm"
execute_cmd "yum install -y $vmware_dependencies" "Installing Oracle Instant client"
execute_cmd "yum install -y $oracle_dependencies" "Installing Oracle Instant client"
# Disabling SELINUX and firewalld
setenforce 0

2
pandora_agents/unix/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-agent-unix
Version: 7.0NG.754-210506
Version: 7.0NG.754-210507
Architecture: all
Priority: optional
Section: admin

2
pandora_agents/unix/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.754-210506"
pandora_version="7.0NG.754-210507"
echo "Test if you has the tools for to make the packages."
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null

2
pandora_agents/unix/pandora_agent
View File

@ -1015,7 +1015,7 @@ my $Sem = undef;
my $ThreadSem = undef;
use constant AGENT_VERSION => '7.0NG.754';
use constant AGENT_BUILD => '210506';
use constant AGENT_BUILD => '210507';
# Agent log default file size maximum and instances
use constant DEFAULT_MAX_LOG_SIZE => 600000;

2
pandora_agents/unix/pandora_agent.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.754
%define release 210506
%define release 210507
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_agent_unix
%define version 7.0NG.754
%define release 210506
%define release 210507
Summary: Pandora FMS Linux agent, PERL version
Name: %{name}

2
pandora_agents/unix/pandora_agent_installer
View File

@ -10,7 +10,7 @@
# **********************************************************************
PI_VERSION="7.0NG.754"
PI_BUILD="210506"
PI_BUILD="210507"
OS_NAME=`uname -s`
FORCE=0

2
pandora_agents/win32/installer/pandora.mpi
View File

@ -186,7 +186,7 @@ UpgradeApplicationID
{}
Version
{210506}
{210507}
ViewReadme
{Yes}

2
pandora_agents/win32/pandora.cc
View File

@ -30,7 +30,7 @@ using namespace Pandora;
using namespace Pandora_Strutils;
#define PATH_SIZE _MAX_PATH+1
#define PANDORA_VERSION ("7.0NG.754(Build 210506)")
#define PANDORA_VERSION ("7.0NG.754(Build 210507)")
string pandora_path;
string pandora_dir;

2
pandora_agents/win32/versioninfo.rc
View File

@ -11,7 +11,7 @@ BEGIN
VALUE "LegalCopyright", "Artica ST"
VALUE "OriginalFilename", "PandoraAgent.exe"
VALUE "ProductName", "Pandora FMS Windows Agent"
VALUE "ProductVersion", "(7.0NG.754(Build 210506))"
VALUE "ProductVersion", "(7.0NG.754(Build 210507))"
VALUE "FileVersion", "1.0.0.0"
END
END

2
pandora_console/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-console
Version: 7.0NG.754-210506
Version: 7.0NG.754-210507
Architecture: all
Priority: optional
Section: admin

2
pandora_console/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.754-210506"
pandora_version="7.0NG.754-210507"
package_pear=0
package_pandora=1

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

@ -1006,7 +1006,7 @@ echo '<div class="action-buttons agent_manager" style="width: '.$table->width.'"
if ($modo == 0) {
echo "<span id='modules_not_learning_mode_context_help pdd_r_10px' '>";
} else {
echo "<span id='modules_not_learning_mode_context_help invisible'>";
echo "<span id='modules_not_learning_mode_context_help' style='display:none'>";
}
echo clippy_context_help('modules_not_learning_mode');

1
pandora_console/godmode/alerts/alert_actions.php
View File

@ -469,4 +469,3 @@ if (is_central_policies_on_node() === false) {
}
enterprise_hook('close_meta_frame');
?>

58
pandora_console/godmode/alerts/configure_alert_template.php
View File

@ -143,7 +143,7 @@ if ($duplicate_template) {
// If user doesn't have the permission to access All group and source template is All group, then group is changed to the first group of user.
if ($can_edit_all == false && a_template['id_group'] == 0) {
$a_template['id_group'] = users_get_first_group(false, 'LM', false);
}
}
$id = alerts_duplicate_alert_template($source_id, $a_template['id_group']);
@ -609,7 +609,7 @@ if ($step == 2) {
1,
$monday,
true,
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[0][1] .= __('Tue');
$table->data[0][1] .= html_print_checkbox(
@ -617,7 +617,7 @@ if ($step == 2) {
1,
$tuesday,
true,
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[0][1] .= __('Wed');
$table->data[0][1] .= html_print_checkbox(
@ -625,7 +625,7 @@ if ($step == 2) {
1,
$wednesday,
true,
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[0][1] .= __('Thu');
$table->data[0][1] .= html_print_checkbox(
@ -633,7 +633,7 @@ if ($step == 2) {
1,
$thursday,
true,
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[0][1] .= __('Fri');
$table->data[0][1] .= html_print_checkbox(
@ -641,7 +641,7 @@ if ($step == 2) {
1,
$friday,
true,
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[0][1] .= __('Sat');
$table->data[0][1] .= html_print_checkbox(
@ -649,7 +649,7 @@ if ($step == 2) {
1,
$saturday,
true,
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[0][1] .= __('Sun');
$table->data[0][1] .= html_print_checkbox(
@ -657,7 +657,7 @@ if ($step == 2) {
1,
$sunday,
true,
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[0][2] = __('Use special days list');
@ -666,7 +666,7 @@ if ($step == 2) {
1,
$special_day,
true,
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[1][0] = __('Time from');
@ -687,7 +687,7 @@ if ($step == 2) {
'',
'',
'',
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[1][2] = __('Time to');
$table->data[1][3] = html_print_input_text(
@ -707,7 +707,7 @@ if ($step == 2) {
'',
'',
'',
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->colspan['threshold'][1] = 3;
@ -723,7 +723,7 @@ if ($step == 2) {
false,
true,
'',
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[3][0] = __('Min. number of alerts');
@ -744,7 +744,7 @@ if ($step == 2) {
'',
'',
'',
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[3][2] = __('Reset counter for non-sustained alerts');
@ -757,7 +757,7 @@ if ($step == 2) {
1,
$min_alerts_reset_counter,
true,
$is_central_policies_on_node | $disabled,
($is_central_policies_on_node | $disabled),
'',
false,
$create_template == 1 ? 'checked=checked' : ''
@ -781,7 +781,7 @@ if ($step == 2) {
'',
'',
'',
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[4][2] = __('Disable event');
@ -790,7 +790,7 @@ if ($step == 2) {
1,
$disable_event,
true,
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[5][0] = __('Default action');
@ -818,7 +818,7 @@ if ($step == 2) {
true,
false,
false,
$is_central_policies_on_node | $disabled,
($is_central_policies_on_node | $disabled),
false,
false,
0
@ -840,7 +840,7 @@ if ($step == 2) {
false,
false,
'',
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[6][1] .= '<span id="matches_value" '.($show_matches ? '' : 'class="invisible"').'>';
$table->data[6][1] .= '&nbsp;'.html_print_checkbox('matches_value', 1, $matches, true);
@ -949,7 +949,7 @@ if ($step == 2) {
false,
false,
'',
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->colspan[0][1] = 2;
@ -975,7 +975,7 @@ if ($step == 2) {
0,
'',
false,
$is_central_policies_on_node | $disabled,
($is_central_policies_on_node | $disabled),
"removeTinyMCE('textarea_field".$i."')",
'',
true
@ -988,7 +988,7 @@ if ($step == 2) {
0,
'',
true,
$is_central_policies_on_node | $disabled,
($is_central_policies_on_node | $disabled),
"addTinyMCE('textarea_field".$i."')",
'',
true
@ -1004,7 +1004,7 @@ if ($step == 2) {
'class="fields" min-height-40px',
true,
'',
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
// Recovery.
@ -1016,7 +1016,7 @@ if ($step == 2) {
0,
'',
false,
$is_central_policies_on_node | $disabled,
($is_central_policies_on_node | $disabled),
"removeTinyMCE('textarea_field".$i."_recovery')",
'',
true
@ -1029,7 +1029,7 @@ if ($step == 2) {
0,
'',
true,
$is_central_policies_on_node | $disabled,
($is_central_policies_on_node | $disabled),
"addTinyMCE('textarea_field".$i."_recovery')",
'',
true
@ -1045,7 +1045,7 @@ if ($step == 2) {
'class="fields min-height-40px"',
true,
'',
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
}
} else {
@ -1102,7 +1102,7 @@ if ($step == 2) {
'',
'',
'',
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
@ -1134,7 +1134,7 @@ if ($step == 2) {
false,
true,
'',
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
).'</div>';
@ -1147,7 +1147,7 @@ if ($step == 2) {
'',
true,
'',
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
$table->data[2][0] = __('Priority');
@ -1162,7 +1162,7 @@ if ($step == 2) {
false,
false,
'',
$is_central_policies_on_node | $disabled
($is_central_policies_on_node | $disabled)
);
if (defined('METACONSOLE')) {

136
pandora_console/godmode/snmpconsole/snmp_alert.php
View File

@ -585,133 +585,21 @@ if ($update_alert || $duplicate_alert) {
// Duplicate alert snmp
if ($duplicate_alert) {
$sql = sprintf(
'insert into talert_snmp (
id_alert, al_field1, al_field2, al_field3,
al_field4, al_field5, al_field6, al_field7,
al_field8, al_field9, al_field10, al_field11,
al_field12, al_field13, al_field14, al_field15,
al_field16, al_field17, al_field18, al_field19,
al_field20, description, alert_type, agent, custom_oid,
oid, time_threshold, times_fired, last_fired,
max_alerts, min_alerts, internal_counter, priority,
'.db_escape_key_identifier('_snmp_f1_').',
'.db_escape_key_identifier('_snmp_f2_').',
'.db_escape_key_identifier('_snmp_f3_').',
'.db_escape_key_identifier('_snmp_f4_').',
'.db_escape_key_identifier('_snmp_f5_').',
'.db_escape_key_identifier('_snmp_f6_').',
'.db_escape_key_identifier('_snmp_f7_').',
'.db_escape_key_identifier('_snmp_f8_').',
'.db_escape_key_identifier('_snmp_f9_').',
'.db_escape_key_identifier('_snmp_f10_').',
'.db_escape_key_identifier('_snmp_f11_').',
'.db_escape_key_identifier('_snmp_f12_').',
'.db_escape_key_identifier('_snmp_f13_').',
'.db_escape_key_identifier('_snmp_f14_').',
'.db_escape_key_identifier('_snmp_f15_').',
'.db_escape_key_identifier('_snmp_f16_').',
'.db_escape_key_identifier('_snmp_f17_').',
'.db_escape_key_identifier('_snmp_f18_').',
'.db_escape_key_identifier('_snmp_f19_').',
'.db_escape_key_identifier('_snmp_f20_').",
trap_type, single_value, position, disable_event, id_group,
order_1, order_2, order_3, order_4, order_5, order_6, order_7, order_8,
order_9, order_10, order_11, order_12, order_13, order_14, order_15,
order_16, order_17, order_18, order_19, order_20)
VALUES
(%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s',
'%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', %d, %d, %d, %d, %d, %d, %d, '%s', '%s', '%s',
'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s',
'%s', '%s', '%s', '%s', %d, '%s', %d, %d, %d, %d, %d, %d, %d, %d, %d,
%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d)",
$id_alert,
$al_field1,
$al_field2,
$al_field3,
$al_field4,
$al_field5,
$al_field6,
$al_field7,
$al_field8,
$al_field9,
$al_field10,
$al_field11,
$al_field12,
$al_field13,
$al_field14,
$al_field15,
$al_field16,
$al_field17,
$al_field18,
$al_field19,
$al_field20,
$description,
$alert_type,
$source_ip,
$custom_value,
$oid,
$time_threshold,
$times_fired,
$last_fired,
$max_alerts,
$min_alerts,
$internal_counter,
$priority,
$custom_oid_data_1,
$custom_oid_data_2,
$custom_oid_data_3,
$custom_oid_data_4,
$custom_oid_data_5,
$custom_oid_data_6,
$custom_oid_data_7,
$custom_oid_data_8,
$custom_oid_data_9,
$custom_oid_data_10,
$custom_oid_data_11,
$custom_oid_data_12,
$custom_oid_data_13,
$custom_oid_data_14,
$custom_oid_data_15,
$custom_oid_data_16,
$custom_oid_data_17,
$custom_oid_data_18,
$custom_oid_data_19,
$custom_oid_data_20,
$trap_type,
$single_value,
$position,
$disable_event,
$group,
$order_1,
$order_2,
$order_3,
$order_4,
$order_5,
$order_6,
$order_7,
$order_8,
$order_9,
$order_10,
$order_11,
$order_12,
$order_13,
$order_14,
$order_15,
$order_16,
$order_17,
$order_18,
$order_19,
$order_20
);
$result = db_process_sql($sql);
$values_duplicate = $alert;
if (!empty($values_duplicate)) {
unset($values_duplicate['id_as']);
$result = db_process_sql_insert('talert_snmp', $values_duplicate);
if (!$result) {
if (!$result) {
db_pandora_audit('SNMP management', "Fail try to duplicate snmp alert #$id_as");
ui_print_error_message(__('There was a problem duplicating the alert'));
} else {
db_pandora_audit('SNMP management', "Duplicate snmp alert #$id_as");
ui_print_success_message(__('Successfully Duplicate'));
}
} else {
db_pandora_audit('SNMP management', "Fail try to duplicate snmp alert #$id_as");
ui_print_error_message(__('There was a problem duplicating the alert'));
} else {
db_pandora_audit('SNMP management', "Duplicate snmp alert #$id_as");
ui_print_success_message(__('Successfully Duplicate'));
}
}

2
pandora_console/godmode/wizards/HostDevices.class.php
View File

@ -898,7 +898,7 @@ class HostDevices extends Wizard
],
[
'label' => '<b>'.__('Networks (current)').':</b>'.ui_print_help_tip(
__('Plese upload a new file to overwrite this content.'),
__('Please upload a new file to overwrite this content.'),
true
),
'arguments' => [

2
pandora_console/include/class/AgentsAlerts.class.php
View File

@ -765,7 +765,7 @@ class AgentsAlerts extends HTML
// Start Header form.
$headerForm = [
'action' => ui_get_full_url(),
'action' => ui_get_full_url('index.php?sec=view&sec2=extensions/agents_alerts'),
'id' => 'form-header-filters',
'method' => 'POST',
'class' => 'modal flex flex-row',

18
pandora_console/include/class/ExternalTools.class.php
View File

@ -462,6 +462,12 @@ class ExternalTools extends HTML
$ids[] = join(',', $address);
}
// Must be an a IP at least for work.
if (empty($ids) === true) {
ui_print_message(__('The agent doesn`t have an IP yet'), 'error', true);
return;
}
$ips = db_get_all_rows_sql(
sprintf(
'SELECT ip FROM taddress WHERE id_a IN (%s)',
@ -469,18 +475,6 @@ class ExternalTools extends HTML
)
);
// Must be an a IP at least for work.
if (empty($ips) === true) {
html_print_div(
[
'class' => 'error',
'style' => 'margin-top:5px',
'content' => __('The agent hasn\'t got IP'),
]
);
return;
}
// Make the data for show in table.
$ipsSelect = array_reduce(
$ips,

2
pandora_console/include/class/Tree.class.php
View File

@ -1020,7 +1020,7 @@ class Tree
$agent_search_filter = $this->getAgentSearchFilter();
$agent_status_filter = $this->getAgentStatusFilter();
$module_search_filter = $this->getModuleSearchFilter();
$module_status_filter = $this->getModuleStatusFilter();
$module_status_filter = $this->getModuleStatusFilterFromTestado($this->filter['statusModule']);
$condition = $this->L2condition;
$condition_inside = $this->L2conditionInside;

2
pandora_console/include/config_process.php
View File

@ -20,7 +20,7 @@
/**
* Pandora build version and version
*/
$build_version = 'PC210506';
$build_version = 'PC210507';
$pandora_version = 'v7.0NG.754';
// Do not overwrite default timezone set if defined.

2
pandora_console/include/functions_alerts.php
View File

@ -2755,7 +2755,7 @@ function alerts_ui_update_or_create_actions($update=true)
$al_action = alerts_get_alert_action($id);
if ($al_action !== false) {
if ($al_action['id_group'] == 0) {
if (! check_acl($config['id_user'], 0, 'PM')) {
if (! check_acl($config['id_user'], 0, 'PM') && ! check_acl($config['id_user'], 0, 'LM')) {
db_pandora_audit(
'ACL Violation',
'Trying to access Alert Management'

8
pandora_console/include/functions_api.php
View File

@ -2121,9 +2121,9 @@ function api_get_all_agents($thrash1, $thrash2, $other, $returnType)
}
$ag_groups = implode(',', (array) $ag_groups);
}
$where .= ' AND (id_grupo IN ('.$ag_groups.') OR id_group IN ('.$ag_groups.'))';
$where .= ' AND (id_grupo IN ('.$ag_groups.') OR id_group IN ('.$ag_groups.'))';
}
}
if (isset($other['data'][3])) {
@ -11248,10 +11248,10 @@ function api_set_add_user_profile($id, $thrash1, $other, $thrash2)
return;
}
$group = $other['data'][0];
$group = (int) $other['data'][0];
$profile = $other['data'][1];
if (db_get_value('id_grupo', 'tgrupo', 'id_grupo', $group) === false) {
if ($group !== 0 && db_get_value('id_grupo', 'tgrupo', 'id_grupo', $group) === false) {
returnError('There is not any group with the ID provided.');
return;
}

29
pandora_console/include/functions_io.php
View File

@ -590,3 +590,32 @@ function io_output_password($password)
return io_safe_output($plaintext);
}
/**
* Clean html tags symbols for prevent use JS
*
* @param string $string String for safe.
*
* @return string
*/
function io_safe_html_tags(string $string)
{
// Must have safe output for work properly.
$string = io_safe_output($string);
if (strpos($string, '<') !== false && strpos($string, '>') !== false) {
$output = strstr($string, '<', true);
$tmpOutput = strstr($string, '<');
$output .= strstr(substr($tmpOutput, 1), '>', true);
$tmpOutput = strstr($string, '>');
$output .= substr($tmpOutput, 1);
// If the string still contains tags symbols.
if (strpos($string, '<') !== false && strpos($string, '>') !== false) {
$output = io_safe_html_tags($output);
}
} else {
$output = $string;
}
return $output;
}

4
pandora_console/include/functions_snmp_browser.php
View File

@ -1187,7 +1187,7 @@ function snmp_browser_create_modules_snmp(
}
}
$fail_modules = [];
$fail_modules = [];
foreach ($targets_oids as $key => $target_oid) {
$oid = snmp_browser_get_oid(
@ -1243,7 +1243,7 @@ function snmp_browser_create_modules_snmp(
'min' => 0,
'tcp_send' => $snmp_version,
'tcp_rcv' => '',
'tcp_port' => 0,
'tcp_port' => $target_port,
'snmp_oid' => $oid['numeric_oid'],
'snmp_community' => $community,
'id_module_group' => 3,

4
pandora_console/include/javascript/pandora.js
View File

@ -1609,6 +1609,7 @@ function paint_graph_status(
svg
.append("g")
.attr("transform", "translate(100, 150)")
.attr("class", "invert_filter")
.call(yAxis);
//legend Normal text
@ -1623,6 +1624,7 @@ function paint_graph_status(
.style("font-family", "arial")
.style("font-weight", "bold")
.style("font-size", "8pt")
.attr("class", "invert_filter")
.html(legend_normal)
.style("text-anchor", "first")
.attr("width", 300)
@ -1649,6 +1651,7 @@ function paint_graph_status(
.style("font-family", "arial")
.style("font-weight", "bold")
.style("font-size", "8pt")
.attr("class", "invert_filter")
.html(legend_warning)
.style("text-anchor", "first");
@ -1673,6 +1676,7 @@ function paint_graph_status(
.style("font-family", "arial")
.style("font-weight", "bold")
.style("font-size", "8pt")
.attr("class", "invert_filter")
.html(legend_critical)
.style("text-anchor", "first");

2
pandora_console/install.php
View File

@ -129,7 +129,7 @@
<div style='height: 10px'>
<?php
$version = '7.0NG.754';
$build = '210506';
$build = '210507';
$banner = "v$version Build $build";
error_reporting(0);

214
pandora_console/operation/messages/message_edit.php
View File

@ -1,9 +1,8 @@
<?php
/**
* Extension to manage a list of gateways and the node address where they should
* point to.
* Message Edition.
*
* @category Extensions
* @category Workspace
* @package Pandora FMS
* @subpackage Community
* @version 1.0.0
@ -27,6 +26,7 @@
* ============================================================================
*/
// Begin.
global $config;
require_once 'include/functions_users.php';
@ -34,14 +34,16 @@ require_once 'include/functions_groups.php';
require_once 'include/functions_io.php';
// Parse parameters.
$new_msg = get_parameter('new_msg', 0);
$dst_user = get_parameter('dst_user');
$dst_group = get_parameter('dst_group');
$subject = get_parameter('subject', '');
$message = get_parameter('message');
$read_message = get_parameter('read_message', 0);
$reply = get_parameter('reply', 0);
$show_sent = get_parameter('show_sent', 0);
$send_mes = (bool) get_parameter('send_mes', false);
$new_msg = (string) get_parameter('new_msg');
$dst_user = get_parameter('dst_user');
$dst_group = get_parameter('dst_group');
$subject = io_safe_html_tags(get_parameter('subject'));
$message = (string) get_parameter('message');
$read_message = (bool) get_parameter('read_message', false);
$reply = (bool) get_parameter('reply', false);
$replied = (bool) get_parameter('replied', false);
$show_sent = get_parameter('show_sent', 0);
$buttons['message_list'] = [
'active' => false,
@ -92,7 +94,7 @@ ui_print_page_header(
// Read a message.
if ($read_message) {
$message_id = (int) get_parameter('id_message');
if ($show_sent) {
if ((bool) $show_sent === true) {
$message = messages_get_message_sent($message_id);
} else {
$message = messages_get_message($message_id);
@ -196,26 +198,36 @@ if ($read_message) {
return;
}
// Create message (destination user).
if (($new_msg) && (!empty($dst_user)) && (!$reply)) {
$return = messages_create_message(
$config['id_user'],
[$dst_user],
[],
$subject,
$message
);
if ($send_mes === true) {
if (empty($dst_user) === true && empty($dst_group) === true) {
// The user or group must be selected for send the message.
ui_print_error_message(__('User or group must be selected.'));
} else {
// Create message (destination user).
$return = messages_create_message(
$config['id_user'],
[$dst_user],
[],
$subject,
$message
);
$user_name = get_user_fullname($dst_user);
if (!$user_name) {
$user_name = $dst_user;
$user_name = get_user_fullname($dst_user);
if (empty($user_name) === true) {
$user_name = $dst_user;
}
ui_print_result_message(
$return,
__('Message successfully sent to user %s', $user_name),
__('Error sending message to user %s', $user_name)
);
// If is a reply, is not necessary do more.
if ($replied === true) {
return;
}
}
ui_print_result_message(
$return,
__('Message successfully sent to user %s', $user_name),
__('Error sending message to user %s', $user_name)
);
}
// Message creation form.
@ -230,11 +242,7 @@ $table->data = [];
$table->data[0][0] = __('Sender');
if (!empty($own_info['fullname'])) {
$table->data[0][1] = $own_info['fullname'];
} else {
$table->data[0][1] = $config['id_user'];
}
$table->data[0][1] = (empty($own_info['fullname']) === false) ? $own_info['fullname'] : $config['id_user'];
$table->data[1][0] = __('Destination');
@ -245,7 +253,7 @@ $is_admin = (bool) db_get_value(
$config['id_user']
);
if ($is_admin) {
if ($is_admin === true) {
$users_full = db_get_all_rows_filter(
'tusuario',
[],
@ -264,51 +272,58 @@ if ($is_admin) {
$users = [];
foreach ($users_full as $user_id => $user_info) {
$users[$user_info['id_user']] = $user_info['fullname'];
$users[$user_info['id_user']] = (empty($user_info['fullname']) === true) ? $user_info['id_user'] : $user_info['fullname'];
}
// Check if the user to reply is in the list, if not add reply user.
if ($reply) {
if (!array_key_exists($dst_user, $users)) {
// Add the user to reply.
$user_reply = db_get_row('tusuario', 'id_user', $dst_user);
$users[$user_reply['id_user']] = $user_reply['fullname'];
}
}
if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
$return_all_groups = true;
if ($reply === true) {
$table->data[1][1] = (array_key_exists($dst_user, $users) === true) ? $users[$dst_user] : $dst_user;
$table->data[1][1] .= html_print_input_hidden(
'dst_user',
$dst_user,
true
);
$table->data[1][1] .= html_print_input_hidden(
'replied',
'1',
true
);
} else {
$return_all_groups = false;
}
$return_all_groups = ((bool) $own_info['is_admin'] === true
|| check_acl($config['id_user'], 0, 'PM') === true);
$groups = users_get_groups($config['id_user'], 'AR');
// Get a list of all groups.
$table->data[1][1] = html_print_select(
$users,
'dst_user',
$dst_user,
'',
__('Select user'),
false,
true,
false,
'',
false
);
$table->data[1][1] .= '&nbsp;&nbsp;'.__('OR').'&nbsp;&nbsp;';
$table->data[1][1] .= '<div class="w250px inline">'.html_print_select_groups(
$config['id_user'],
'AR',
$return_all_groups,
'dst_group',
$dst_group,
'',
__('Select group'),
'',
true
).'</div>';
$groups = users_get_groups($config['id_user'], 'AR');
// Get a list of all groups.
$table->data[1][1] = html_print_select(
$users,
'dst_user',
$dst_user,
'changeStatusOtherSelect(\'dst_user\', \'dst_group\')',
__('Select user'),
false,
true,
false,
''
);
$table->data[1][1] .= '&nbsp;&nbsp;'.__('OR').'&nbsp;&nbsp;';
$table->data[1][1] .= html_print_div(
[
'class' => 'w250px inline',
'content' => html_print_select_groups(
$config['id_user'],
'AR',
$return_all_groups,
'dst_group',
$dst_group,
'changeStatusOtherSelect(\'dst_group\', \'dst_user\')',
__('Select group'),
'',
true
),
],
true
);
}
$table->data[2][0] = __('Subject');
$table->data[2][1] = html_print_input_text(
@ -330,15 +345,40 @@ $table->data[3][1] = html_print_textarea(
true
);
echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;new_msg=1">';
html_print_table($table);
$jsOutput = '';
ob_start();
?>
<script type="text/javascript">
function changeStatusOtherSelect(myId, otherId) {
if (document.getElementById(myId).value !== "") {
if (otherId === "dst_group") {
$('#'+otherId).select2('val', '0');
} else {
document.getElementById(otherId).value = "";
}
}
}
</script>
<?php
$jsOutput = ob_get_clean();
echo '<div class="action-buttons" style="width: '.$table->width.'">';
html_print_submit_button(
__('Send message'),
'send_mes',
false,
'class="sub wand"'
);
echo '</form>';
echo '</div>';
echo '<form method="post" action="index.php?sec=message_list&amp;sec2=operation/messages/message_edit&amp;new_msg=1">';
// Print the main table.
html_print_table($table);
// Print the action buttons section.
html_print_div(
[
'class' => 'action-buttons',
'style' => 'width: '.$table->width,
'content' => html_print_submit_button(
__('Send message'),
'send_mes',
false,
'class="sub wand"',
true
),
]
);
echo '</form>';
echo $jsOutput;

1
pandora_console/operation/snmpconsole/snmp_browser.php
View File

@ -141,6 +141,7 @@ function snmp_browser_show_add_module_massive(module_target = 'agent') {
var title = '<?php echo __('Add modules'); ?>';
var snmp_extradata = snmp_browser_create_modules(module_target);
snmp_extradata.push({name:"target_port", value:$("#target_port").val()});
// Load dinamically modal form.
load_modal({
form: 'snmp_browser_add_module_form',

46
pandora_console/operation/tree.php
View File

@ -356,27 +356,33 @@ enterprise_hook('close_meta_frame');
if (data.success) {
$(".loading_tree").hide();
var foundMessage = '';
switch (parameters['type']) {
case 'policies':
foundMessage = "<?php echo __('Policies found'); ?>";
break;
case 'os':
foundMessage = "<?php echo __('Operating systems found'); ?>";
break;
case 'tag':
foundMessage = "<?php echo __('Tags found'); ?>";
break;
case 'module_group':
foundMessage = "<?php echo __('Module Groups found'); ?>";
break;
case 'module':
foundMessage = "<?php echo __('Modules found'); ?>";
break;
case 'group':
default:
foundMessage = "<?php echo __('Groups found'); ?>";
break;
if (data.tree.length === 0) {
foundMessage = "<?php echo __('No data found'); ?>";
$("div#tree-controller-recipient").append(foundMessage);
} else {
switch (parameters['type']) {
case 'policies':
foundMessage = "<?php echo __('Policies found'); ?>";
break;
case 'os':
foundMessage = "<?php echo __('Operating systems found'); ?>";
break;
case 'tag':
foundMessage = "<?php echo __('Tags found'); ?>";
break;
case 'module_group':
foundMessage = "<?php echo __('Module Groups found'); ?>";
break;
case 'module':
foundMessage = "<?php echo __('Modules found'); ?>";
break;
case 'group':
default:
foundMessage = "<?php echo __('Groups found'); ?>";
break;
}
}
treeController.init({
recipient: $("div#tree-controller-recipient"),

2
pandora_console/pandora_console.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.754
%define release 210506
%define release 210507
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.rhel7.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.754
%define release 210506
%define release 210507
# User and Group under which Apache is running
%define httpd_name httpd

2
pandora_console/pandora_console.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.754
%define release 210506
%define release 210507
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2

2
pandora_server/DEBIAN/control
View File

@ -1,5 +1,5 @@
package: pandorafms-server
Version: 7.0NG.754-210506
Version: 7.0NG.754-210507
Architecture: all
Priority: optional
Section: admin

2
pandora_server/DEBIAN/make_deb_package.sh
View File

@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
pandora_version="7.0NG.754-210506"
pandora_version="7.0NG.754-210507"
package_cpan=0
package_pandora=1

2
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -45,7 +45,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.754";
my $pandora_build = "210506";
my $pandora_build = "210507";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash

2
pandora_server/lib/PandoraFMS/PluginTools.pm
View File

@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.754";
my $pandora_build = "210506";
my $pandora_build = "210507";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );

2
pandora_server/pandora_server.redhat.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.754
%define release 210506
%define release 210507
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server.spec
View File

@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 7.0NG.754
%define release 210506
%define release 210507
Summary: Pandora FMS Server
Name: %{name}

2
pandora_server/pandora_server_installer
View File

@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.754"
PI_BUILD="210506"
PI_BUILD="210507"
MODE=$1
if [ $# -gt 1 ]; then

2
pandora_server/util/pandora_db.pl
View File

@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
my $version = "7.0NG.754 PS210506";
my $version = "7.0NG.754 PS210507";
# Pandora server configuration
my %conf;

2
pandora_server/util/pandora_manage.pl
View File

@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
my $version = "7.0NG.754 PS210506";
my $version = "7.0NG.754 PS210507";
# save program name for logging
my $progname = basename($0);