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

2011-09-22 Sergio Martin <sergio.martin@artica.es> 

* extras/pandoradb_migrate_v3.2_to_v4.0.sql: Deleted
	duplicated line

	* godmode/reporting/reporting_builder.php: Fixed report graph
	insertion of id 0 in the reports for bugs 3412316 and 3412866 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4982 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-09-22 14:48:53 +00:00
parent d26ce3cbe3
commit 6095945df4
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2011-09-22 Sergio Martin <sergio.martin@artica.es>
* extras/pandoradb_migrate_v3.2_to_v4.0.sql: Deleted
duplicated line
* godmode/reporting/reporting_builder.php: Fixed report graph
insertion of id 0 in the reports for bugs 3412316 and 3412866
2011-09-22 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: replaced the anonymous function for the named

5
pandora_console/extras/pandoradb_migrate_v3.2_to_v4.0.sql
View File

@ -199,8 +199,6 @@ ALTER TABLE `tnetwork_map` ADD COLUMN `show_snmp_modules` TINYINT(1) UNSIGNED N
-- Table `trecon_task`
-- -----------------------------------------------------
ALTER TABLE `trecon_task` ADD COLUMN `disabled` tinyint(1) UNSIGNED NOT NULL DEFAULT 0;
ALTER TABLE `trecon_task` ADD COLUMN `disabled` tinyint(1) UNSIGNED NOT NULL DEFAULT 0;
ALTER TABLE `trecon_task` ADD COLUMN `os_detect` tinyint(1) unsigned default '0';
ALTER TABLE `trecon_task` ADD COLUMN `resolve_names` tinyint(1) unsigned default '0';
@ -256,9 +254,6 @@ ALTER TABLE ttrap ADD INDEX status (`status`);
ALTER TABLE `talert_snmp` MODIFY COLUMN `custom_oid` text DEFAULT '';
ALTER TABLE ttrap ADD INDEX timestamp (`timestamp`);
-- -----------------------------------------------------
-- Table `tconfig_os`
-- -----------------------------------------------------

2
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -317,7 +317,7 @@ switch ($action) {
break;
}
$id_gs = substr ($values['id_gs'], 0, strpos ($values['id_gs'], '|'));
if ($id_gs !== false) {
if ($id_gs !== false && $id_gs !== '') {
$server_name = strstr($values ['id_gs'], '|');
$values ['id_gs'] = $id_gs;
$values['server_name'] = substr ($server_name, 1, strlen($server_name));