Merge branch 'ent-4176-8084-8169-actualizacion-selenium-firefox-wux' into 'develop'

Minor fix: avoid errors if no default vales flipflop (Origin:Wux)

See merge request artica/pandorafms!3073

pandora_console/extras/mr/37.sql

@@ -1,6 +1,8 @@
 START TRANSACTION;
 
-ALTER TABLE trecon_task MODIFY COLUMN `id_network_profile` TEXT;
+ALTER TABLE tagente_modulo MODIFY COLUMN `custom_string_1` MEDIUMTEXT;
+
+ALTER TABLE `trecon_task` MODIFY COLUMN `id_network_profile` TEXT;
 ALTER TABLE `trecon_task` CHANGE COLUMN `create_incident` `review_mode` TINYINT(1) UNSIGNED DEFAULT 0;
 ALTER TABLE `trecon_task` ADD COLUMN `subnet_csv` TINYINT(1) UNSIGNED DEFAULT 1;
 

pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql

@@ -1448,6 +1448,7 @@ ALTER TABLE `tagente_modulo` DROP COLUMN `ff_normal`,
 	MODIFY COLUMN `ff_type` tinyint(1) unsigned NULL DEFAULT '0',
 	MODIFY COLUMN `dynamic_next` bigint(20) NOT NULL DEFAULT '0',
 	MODIFY COLUMN `dynamic_two_tailed` tinyint(1) unsigned NULL DEFAULT '0';
+ALTER TABLE tagente_modulo MODIFY COLUMN `custom_string_1` MEDIUMTEXT;
 
 -- ---------------------------------------------------------------------
 -- Table `tagente_datos`

pandora_console/godmode/agentes/module_manager_editor.php

@@ -283,7 +283,6 @@ if ($id_agent_module) {
 
     // Security level Could be noAuthNoPriv | authNoPriv | authPriv.
     $snmp3_security_level = $module['custom_string_3'];
-
     $ip_target = $module['ip_target'];
     $disabled = $module['disabled'];
     $id_export = $module['id_export'];
@@ -297,6 +296,7 @@ if ($id_agent_module) {
     $custom_integer_2 = $module['custom_integer_2'];
     $custom_string_1 = $module['custom_string_1'];
     $custom_string_2 = $module['custom_string_2'];
+    $custom_string_3 = $module['custom_string_3'];
     $max_timeout = $module['max_timeout'];
     $max_retries = $module['max_retries'];
     $custom_id = $module['custom_id'];

pandora_console/include/functions_html.php

@@ -2177,6 +2177,10 @@ function html_print_table(&$table, $return=false)
     $output = '';
     static $table_count = 0;
 
+    if (!isset($table)) {
+        $table = new StdClass();
+    }
+
     $table_count++;
     if (isset($table->align)) {
         foreach ($table->align as $key => $aa) {

pandora_console/include/styles/pandora.css

@@ -4084,103 +4084,11 @@ div#footer_help {
   background-size: 120px 80px;
 }
 
-/*
- * ---------------------------------------------------------------------
- * - WUX VIEW														-
- * ---------------------------------------------------------------------
- */
 #mssg_error_div {
   color: red;
   font-size: 12px;
 }
 
-.wux_global_result_container {
-  width: 100%;
-  margin-top: 30px;
-  margin-bottom: 30px;
-}
-
-.wux_global_result_title {
-  width: 100%;
-  text-align: center;
-  color: white;
-  background-color: #373737;
-  border: 1px solid #373737;
-  height: 28px;
-}
-
-.wux_global_result_title p {
-  margin: 8px;
-}
-
-.wux_global_result_content {
-  width: 100%;
-  border: 1px solid #e2e2e2;
-  height: 120px;
-}
-
-.wux_global_result_content_left {
-  float: left;
-  width: 40%;
-  text-align: center;
-}
-
-.wux_global_result_content_left ul {
-  display: inline-flex;
-  margin-top: 15px;
-}
-
-.wux_global_result_content_left ul li p {
-  margin-top: 35px;
-  margin-right: 10px;
-  margin-left: 10px;
-}
-
-.wux_global_result_content_left ul li p b {
-  font-size: 16px;
-}
-
-.wux_global_result_content_right {
-  float: right;
-  width: 60%;
-}
-
-.wux_global_result_content_right ul {
-  display: inline-flex;
-  margin-top: 15px;
-  margin-left: 100px;
-}
-
-.wux_global_result_content_right ul li p {
-  margin-top: 36px;
-  margin-right: 10px;
-  margin-left: 10px;
-}
-
-.wux_global_result_content_right ul li p b {
-  font-size: 16px;
-}
-
-.wux_transaction_container {
-  width: 100%;
-  margin-bottom: 30px;
-}
-
-.wux_result_transaction {
-  width: 33%;
-  float: left;
-}
-
-.wux_transaction_graphs {
-  width: 33%;
-  float: left;
-}
-
-.wux_transaction_graphs_pie {
-  width: 33%;
-  float: left;
-}
-
 .pagination_show_more {
   text-align: center;
   margin-top: 10px;

pandora_console/include/styles/wux.css

@@ -1,10 +1 @@
-/*
- * Wux style
- */
-
-.wux_execution_result_transaction {
-  width: auto;
-  height: auto;
-  float: right;
-  margin-right: 200px;
-}
+/* Enterprise content */

pandora_console/pandoradb.sql

@@ -234,7 +234,7 @@ CREATE TABLE IF NOT EXISTS `tagente_modulo` (
 	`delete_pending` int(1) unsigned default 0,
 	`policy_linked` tinyint(1) unsigned not null default 0,
 	`policy_adopted` tinyint(1) unsigned not null default 0,
-	`custom_string_1` text,
+	`custom_string_1` mediumtext,
 	`custom_string_2` text,
 	`custom_string_3` text,
 	`custom_integer_1` int(10) default 0,

pandora_server/lib/PandoraFMS/Core.pm

@@ -1774,6 +1774,11 @@ sub pandora_process_module ($$$$$$$$$;$) {
 		$min_ff_event = $module->{'min_ff_event_warning'} if ($new_status == 2);
 	}
 
+	# Avoid warning if not initialized.
+	$min_ff_event = 0 unless defined($min_ff_event);
+	$module->{'ff_type'} = 0 unless defined($module->{'ff_type'});
+	$module->{'module_ff_interval'} = 0 unless defined($module->{'module_ff_interval'});
+
 	if ($last_known_status == $new_status) {
 		# Avoid overflows
 		$status_changes = $min_ff_event if ($status_changes > $min_ff_event && $module->{'ff_type'} == 0);
@@ -4264,7 +4269,9 @@ sub process_data ($$$$$$$) {
 
 	# Not a number
 	if (! is_numeric ($data)) {
-		logger($pa_config, "Received invalid data '" . $data_object->{'data'} . "' from agent '" . $agent->{'nombre'} . "' module '" . $module->{'nombre'} . "' agent " . (defined ($agent) ? "'" . $agent->{'nombre'} . "'" : 'ID ' . $module->{'id_agente'}) . ".", 3);
+		my $d = $data_object->{'data'};
+		$d = '' unless defined ($data_object->{'data'});
+		logger($pa_config, "Received invalid data '" . $d . "' from agent '" . $agent->{'nombre'} . "' module '" . $module->{'nombre'} . "' agent " . (defined ($agent) ? "'" . $agent->{'nombre'} . "'" : 'ID ' . $module->{'id_agente'}) . ".", 3);
 		return undef;
 	}