';
@@ -167,25 +181,46 @@ $(document).ready (function () {
});
}
-
+ if ($('input[type=checkbox][name=is_link_enabled]').is(":checked") === true) {
+ $('#configure_field-1').hide();
+ $('#configure_field-3').hide();
+ } else {
+ $('#configure_field-1').show();
+ $('#configure_field-3').show();
+ }
+
+ $('input[type=checkbox][name=is_link_enabled]').change(function () {
+ if( $(this).is(":checked") ){
+ $('#configure_field-1').hide();
+ $('#configure_field-3').hide();
+ } else{
+ $('#configure_field-1').show();
+ $('#configure_field-3').show();
+ }
+ });
+
$('input[type=checkbox][name=is_combo_enable]').change(function () {
if( $(this).is(":checked") ){
$('#configure_field-4').show();
dialog_message("#message_no_set_password");
$('#configure_field-1').hide();
+ $('#configure_field-5').hide();
}
else{
$('#configure_field-4').hide();
$('#configure_field-1').show();
+ $('#configure_field-5').show();
}
});
$('input[type=checkbox][name=is_password_type]').change(function () {
if( $(this).is(":checked")){
dialog_message("#message_no_set_combo");
$('#configure_field-3').hide();
+ $('#configure_field-5').hide();
}
else{
$('#configure_field-3').show();
+ $('#configure_field-5').show();
}
});
});
diff --git a/pandora_console/godmode/agentes/fields_manager.php b/pandora_console/godmode/agentes/fields_manager.php
index 960ed62776..608b6b1f65 100644
--- a/pandora_console/godmode/agentes/fields_manager.php
+++ b/pandora_console/godmode/agentes/fields_manager.php
@@ -38,11 +38,12 @@ $display_on_front = (int) get_parameter('display_on_front', 0);
$is_password_type = (int) get_parameter('is_password_type', 0);
$combo_values = (string) get_parameter('combo_values', '');
$combo_value_selected = (string) get_parameter('combo_value_selected', '');
+$is_link_enabled = (bool) get_parameter('is_link_enabled', 0);
// Create field.
if ($create_field) {
// Check if name field is empty.
- if ($name == '') {
+ if ($name === '') {
ui_print_error_message(__('The name must not be empty'));
} else if ($name == db_get_value('name', 'tagent_custom_fields', 'name', $name)) {
ui_print_error_message(__('The name must be unique'));
@@ -54,6 +55,7 @@ if ($create_field) {
'display_on_front' => $display_on_front,
'is_password_type' => $is_password_type,
'combo_values' => $combo_values,
+ 'is_link_enabled' => $is_link_enabled,
]
);
ui_print_success_message(__('Field successfully created'));
@@ -63,12 +65,13 @@ if ($create_field) {
// Update field.
if ($update_field) {
// Check if name field is empty.
- if ($name != '') {
+ if ($name !== '') {
$values = [
'name' => $name,
'display_on_front' => $display_on_front,
'is_password_type' => $is_password_type,
'combo_values' => $combo_values,
+ 'is_link_enabled' => $is_link_enabled,
];
$result = db_process_sql_update('tagent_custom_fields', $values, ['id_field' => $id_field]);
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 970da79aaa..a0bd1bca8f 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -546,6 +546,19 @@ foreach ($fields as $field) {
if ($custom_value[0]['is_password_type']) {
$data[1] = '••••••••';
+ } else if ($field['is_link_enabled'] === '1') {
+ list($link_text, $link_url) = json_decode($custom_value[0]['description'], true);
+
+ if (json_last_error() !== JSON_ERROR_NONE) {
+ $link_text = '';
+ $link_url = '';
+ }
+
+ if ($link_text === '') {
+ $link_text = $link_url;
+ }
+
+ $data[1] = '
'.$link_text.'';
} else {
$data[1] = $custom_value[0]['description'];
}
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 1afd4f876d..31e6ce1809 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -2103,6 +2103,7 @@ CREATE TABLE IF NOT EXISTS `tagent_custom_fields` (
`display_on_front` TINYINT NOT NULL DEFAULT 0,
`is_password_type` TINYINT NOT NULL DEFAULT 0,
`combo_values` TEXT ,
+ `is_link_enabled` TINYINT(1) NOT NULL DEFAULT 0,
PRIMARY KEY (`id_field`)
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 2956691772..8e00936d8a 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -1189,7 +1189,7 @@ INSERT INTO `tplugin` (`id`, `name`, `description`, `max_timeout`, `execute`, `p
INSERT INTO `tplugin` (`id`, `name`, `description`, `max_timeout`, `max_retries`, `execute`, `net_dst_opt`, `net_port_opt`, `user_opt`, `pass_opt`, `plugin_type`, `macros`, `parameters`, `no_delete`) VALUES (9,'Packet Loss','Checks for dropped packages after X seconds of testing. It returns % of dropped packets. It uses ping flood mode to launch 50 consecutive pings to a remote destination. On local, stable networks, value should be 0.
',30,0,'/usr/share/pandora_server/util/plugin/packet_loss.sh','','','','',0,'{\"1\":{\"macro\":\"_field1_\",\"desc\":\"Test time\",\"help\":\"\",\"value\":\"8\",\"hide\":\"\"},\"2\":{\"macro\":\"_field2_\",\"desc\":\"Target IP\",\"help\":\"\",\"value\":\"\",\"hide\":\"\"}}','_field1_ _field2_', 1);
-INSERT INTO `tagent_custom_fields` VALUES (1,'Serial Number',0,0,''),(2,'Department',0,0,''),(3,'Additional ID',0,0,''),(4,'eHorusID',0,0,'');
+INSERT INTO `tagent_custom_fields` VALUES (1,'Serial Number',0,0,'',0),(2,'Department',0,0,'',0),(3,'Additional ID',0,0,'',0),(4,'eHorusID',0,0,'',0);
INSERT INTO `ttag` VALUES (1,'network','Network equipment','http://artica.es','','',''),(2,'critical','Critical modules','','','',''),(3,'dmz','DMZ Network Zone','','','',''),(4,'performance','Performance anda capacity modules','','','',''),(5,'configuration','','','','','');