diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index c7fd3541ef..565e9b9960 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2010-04-28 Sancho Lerena + + * pandoradb_data.sql: Updated version to 3.1 + + * pandoradb_migrate_v3.0_to_v3.1.sql: Fix, set log4x correct type id. + + * include/functions_gis.php: Fixed a notice by undefined value. + + * images/gis_maps/icons: Deleted several non-useful icons. + 2010-04-28 Miguel de Dios * include/functions_agents.php, godmode/gis_maps/configure_gis_map.php, diff --git a/pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql b/pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql index 0916e18365..739e69c926 100644 --- a/pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql +++ b/pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql @@ -69,7 +69,7 @@ INSERT INTO tconfig (`token`, `value`) VALUES ('stats_interval', '300'); -- Log4x Module -INSERT INTO ttipo_modulo (`id_tipo`, `nombre`, `categoria`, `descripcion`, `icon`) VALUES (30, 'log4x', 0, 'Log4x', 'mod_log4x.png'); +INSERT INTO ttipo_modulo (`id_tipo`, `nombre`, `categoria`, `descripcion`, `icon`) VALUES (24, 'log4x', 0, 'Log4x', 'mod_log4x.png'); -- GIS extension Tables and DATA diff --git a/pandora_console/images/gis_map/icons/circle.pink.png b/pandora_console/images/gis_map/icons/circle.pink.png deleted file mode 100755 index 454b990532..0000000000 Binary files a/pandora_console/images/gis_map/icons/circle.pink.png and /dev/null differ diff --git a/pandora_console/images/gis_map/icons/cross.pink.png b/pandora_console/images/gis_map/icons/cross.pink.png deleted file mode 100755 index 0410cd9180..0000000000 Binary files a/pandora_console/images/gis_map/icons/cross.pink.png and /dev/null differ diff --git a/pandora_console/images/gis_map/icons/dot.bad.png b/pandora_console/images/gis_map/icons/dot.bad.png deleted file mode 100755 index 5e9ed081e5..0000000000 Binary files a/pandora_console/images/gis_map/icons/dot.bad.png and /dev/null differ diff --git a/pandora_console/images/gis_map/icons/dot.default.png b/pandora_console/images/gis_map/icons/dot.default.png deleted file mode 100755 index d36c05f1e3..0000000000 Binary files a/pandora_console/images/gis_map/icons/dot.default.png and /dev/null differ diff --git a/pandora_console/images/gis_map/icons/dot.ok.png b/pandora_console/images/gis_map/icons/dot.ok.png deleted file mode 100755 index 92578043c4..0000000000 Binary files a/pandora_console/images/gis_map/icons/dot.ok.png and /dev/null differ diff --git a/pandora_console/images/gis_map/icons/dot.png b/pandora_console/images/gis_map/icons/dot.png deleted file mode 100755 index d36c05f1e3..0000000000 Binary files a/pandora_console/images/gis_map/icons/dot.png and /dev/null differ diff --git a/pandora_console/images/gis_map/icons/dot.warning.png b/pandora_console/images/gis_map/icons/dot.warning.png deleted file mode 100755 index 03c1173de6..0000000000 Binary files a/pandora_console/images/gis_map/icons/dot.warning.png and /dev/null differ diff --git a/pandora_console/images/gis_map/icons/icon.bad.png b/pandora_console/images/gis_map/icons/icon.bad.png deleted file mode 100755 index 452e757d75..0000000000 Binary files a/pandora_console/images/gis_map/icons/icon.bad.png and /dev/null differ diff --git a/pandora_console/images/gis_map/icons/icon.default.png b/pandora_console/images/gis_map/icons/icon.default.png deleted file mode 100755 index 04e90c063b..0000000000 Binary files a/pandora_console/images/gis_map/icons/icon.default.png and /dev/null differ diff --git a/pandora_console/images/gis_map/icons/icon.ok.png b/pandora_console/images/gis_map/icons/icon.ok.png deleted file mode 100755 index f0b4d64acd..0000000000 Binary files a/pandora_console/images/gis_map/icons/icon.ok.png and /dev/null differ diff --git a/pandora_console/images/gis_map/icons/icon.png b/pandora_console/images/gis_map/icons/icon.png deleted file mode 100755 index 04e90c063b..0000000000 Binary files a/pandora_console/images/gis_map/icons/icon.png and /dev/null differ diff --git a/pandora_console/images/gis_map/icons/icon.warning.png b/pandora_console/images/gis_map/icons/icon.warning.png deleted file mode 100755 index a706306eae..0000000000 Binary files a/pandora_console/images/gis_map/icons/icon.warning.png and /dev/null differ diff --git a/pandora_console/include/functions_gis.php b/pandora_console/include/functions_gis.php index e83d008409..c4cbc53f29 100644 --- a/pandora_console/include/functions_gis.php +++ b/pandora_console/include/functions_gis.php @@ -688,8 +688,7 @@ function saveMap($map_name, $map_initial_longitude, $map_initial_latitude, 'tgrupo_id_grupo' => $layer['layer_group'] ) ); - - if (count($layer['layer_agent_list']) > 0) { + if ((isset($layer['layer_agent_list'])) AND (count($layer['layer_agent_list']) > 0)) { foreach ($layer['layer_agent_list'] as $agent_name) { process_sql_insert('tgis_map_layer_has_tagente', array( diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index f6b9262a65..ef9e752a2d 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -14,7 +14,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --- Database Data for Pandora FMS 3.0 +-- Database Data for Pandora FMS 3.1 -- PLEASE NO NOT USE MULTILINE COMMENTS -- Because Pandora Installer don't understand them