From 7a8135f36d6e0ae01036758206ce475db73b9bf7 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Mon, 25 Sep 2017 09:45:58 +0200
Subject: [PATCH] fixed error merge dani
---
pandora_console/godmode/agentes/configurar_agente.php | 2 +-
pandora_console/pandoradb.sql | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php
index bd34c56503..fc42c1f85a 100644
--- a/pandora_console/godmode/agentes/configurar_agente.php
+++ b/pandora_console/godmode/agentes/configurar_agente.php
@@ -793,7 +793,7 @@ if ($update_agent) { // if modified some agent paramenter
WHERE id_group = ".$group_old);
$result = db_process_sql_update ('tagente', $values, array ('id_agente' => $id_agente));
- if ($result === false) {
+ if ($result == false) {
ui_print_error_message(
__('There was a problem updating the agent'));
}
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 3640357a8f..0d749db694 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -67,7 +67,7 @@ CREATE TABLE IF NOT EXISTS `tagente` (
`custom_id` varchar(255) default '',
`server_name` varchar(100) default '',
`cascade_protection` tinyint(2) NOT NULL default '0',
- `cascade_protection_module` tinyint(2) NOT NULL default '0',
+ `cascade_protection_module` int(10) unsigned NOT NULL default '0',
`timezone_offset` TINYINT(2) NULL DEFAULT '0' COMMENT 'nuber of hours of diference with the server timezone' ,
`icon_path` VARCHAR(127) NULL DEFAULT NULL COMMENT 'path in the server to the image of the icon representing the agent' ,
`update_gis_data` TINYINT(1) NOT NULL DEFAULT '1' COMMENT 'set it to one to update the position data (altitude, longitude, latitude) when getting information from the agent or to 0 to keep the last value and do not update it' ,