Commit Graph

5463 Commits

Author SHA1 Message Date
mdtrooper 6857d8f6c8 2012-06-12 Miguel de Dios <miguel.dedios@artica.es>
* extras/pandoradb_migrate_v3.2_to_v4.0.sql: added the lost
	semicolons in some standments.
	
	* godmode/reporting/visual_console_builder.php: restore the search
	modules without entities, because there was a bug into the recon
	server that recode two times the name, now run all parts fine.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6509 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-12 12:57:22 +00:00
mdtrooper d666e24144 2012-06-12 Miguel de Dios <miguel.dedios@artica.es>
* lib/PandoraFMS/ReconServer.pm: fixed the recode into html entities
	the name of network component into the function
	"create_network_profile_modules".
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6507 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-12 12:34:51 +00:00
darode fcef3aeb66 2012-06-12 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/agentes/estado_agente.php: Improved
        performance using new functions.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6505 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-12 11:45:24 +00:00
darode 981fb60574 2012-06-12 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php: Fixed some errors with tree view
	for policies.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6503 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-12 11:02:36 +00:00
juanmanuelr e5b71b53ee 2012-06-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_forecast.php
	 include/ajax/agent.php
	 include/functions_ui.php
	 godmode/reporting/reporting_builder.list_items.php
	 godmode/reporting/reporting_builder.php
	 godmode/reporting/reporting_builder.item_editor.php: Fixes in 
	 forecasting reports (avoid php timeout) and empty inventory report.
	 Also fixed bug with autorefresh an referer check.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6501 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-12 09:21:02 +00:00
vgilc d5f305e8d4 2012-06-12 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_config.php: Fixed bug: update password 
	parameters.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6500 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-12 09:15:16 +00:00
mdtrooper dde8590f76 2012-06-11 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_io.php: fixed the function "io_safe_output" for
	arrays, now into the function call other function with the name
	"io_safe_output_array".
	
	* include/functions_visual_map.php,
	include/ajax/visual_console_builder.ajax.php,
	godmode/reporting/visual_console_builder.wizard.php,
	godmode/reporting/visual_console_builder.php,
	godmode/reporting/visual_console_builder.editor.js,
	godmode/reporting/visual_console_builder.elements.php,
	godmode/reporting/visual_console_builder.editor.php,
	godmode/reporting/visual_console_builder.constans.php: fixed a lot
	of things about simple value and derivates.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6497 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 19:13:20 +00:00
santimunin 538d9c9874 2012-06-11 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Core.java,
	src/pandroid_event_viewer/pandorafms/API.java: Moved api functions to API.java
	* src/pandroid_event_viewer/pandorafms/Options.java: Connection status works ok now.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6495 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 18:27:17 +00:00
santimunin c255c14b97 2012-06-11 Santiago Munin <burning1@gmail.com>
* res/values/arrays.xml: Removed some entries.
	* res/values/strings.xml: Added one entry.
	* res/layout/create_incident.xml: Removed form fields.
	* res/layout/item_list_event_extended.xml: Added a button to create an incident from the event.
	* src/pandroid_event_viewer/pandorafms/EventList.java: Added crate incident button logic.
	* src/pandroid_event_viewer/pandorafms/CreateIncidentActivity.java: Removed fields logic.
	* src/pandroid_event_viewer/pandorafms/Main.java,
	src/pandroid_event_viewer/pandorafms/EventList.java,
	res/menu/options_menu.xml,
	res/menu/options_menu_list_events.xml: Removed create incident (menu entry)


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6494 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 18:01:51 +00:00
darode 76f33356e3 2012-06-11 Dario Rodriguez <dario.rodriguez@artica.es>
* operatoin/tree.php: Fixed a bug related to html tag id
                with strange characters.

        MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6492 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 15:48:49 +00:00
santimunin 9cd92ddfed 2012-06-11 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Main.java,
	res/layout/main.xml: Now the advanced options' layout is GONE not INVISIBLE.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6489 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 15:09:09 +00:00
darode ad866c1a38 2012-06-11 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_modules.php,
	include/functions_agents.php,
	operation/tree.php: Improved performance for
	tree view module tab.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6488 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 15:08:25 +00:00
santimunin cf1ef448e7 2012-06-11 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/Options.java,
	src/pandroid_event_viewer/pandorafms/Main.java,
	res/layout/main.xml,
	res/layout/options.xml: Changed advanced filter from Options to Filter.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6486 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 14:46:18 +00:00
Ramon Novoa 97c10da4a6 2012-06-11 Ramon Novoa <rnovoa@artica.es>
* pandora_update_version.sh: Update version string in server
	  configuration file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6482 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 14:01:16 +00:00
darode f5d28d4bcf 2012-06-11 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_modules.php,
	include/functions_agents.php,
	operation/tree.php: Improved tree view for module groups.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6481 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 12:57:53 +00:00
mdtrooper 496fa04da6 2012-06-11 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php: cleaned source code style.
	
	* include/ajax/visual_console_builder.ajax.php,
	godmode/reporting/visual_console_builder.editor.js: fixed the set
	status to items when change somethings that module or method to get
	status that agent to module status item.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6479 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 12:26:20 +00:00
vgilc 588523c56a 2012-06-11 Vanessa Gil <vanessa.gil@artica.es>
* godmode/users/configure_user.php
	  operation/users/user_edit.php: Removed 'add extra policies'.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6477 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 11:24:46 +00:00
mdtrooper 7603298f9c 2012-06-11 Miguel de Dios <miguel.dedios@artica.es>
* pandora_server/util/pandora_xml_stress.pl: cleaned source code
	style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6476 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 10:25:58 +00:00
mdtrooper 60db76bc53 2012-06-11 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/functions_gd.php, include/graphs/fgraph.php:
	cleaned source code style.
	
	* include/functions_visual_map.php,
	include/ajax/visual_console_builder.ajax.php,
	godmode/reporting/visual_console_builder.editor.js,
	godmode/reporting/visual_console_builder.editor.php: fixed the
	strange behavior of the bars and bubbles in the editor.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6475 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 10:24:02 +00:00
darode 53c62fc21b 2012-06-11 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php: Include functions_gis.php file that
	was missing.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6473 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 09:46:57 +00:00
juanmanuelr 774cdbaf50 2012-06-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions.php: Added pass of check_referer by url to
	 solve problems with autorefresh functionality.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6470 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 08:09:30 +00:00
juanmanuelr 67ec5cfe38 2012-06-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php
	 operation/reporting/reporting_xml.php: Fixed XML items exportation
	 and item editor for alert agent and alert event.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6468 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-11 07:27:14 +00:00
slerena 6c5a6943b0 2012-06-09 Sancho Lerena <slerena@artica.es>
* functions_config.php: Fixed API password problem when
	you try to set it blank.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6466 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-09 17:31:22 +00:00
darode 9284e6130f 2012-06-08 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php: Improved performance of
	sub tree for policies tree view.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6464 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 15:13:19 +00:00
darode f7cf115f07 2012-06-08 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php: Improved performance of tree
	view for policies.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6462 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 14:14:40 +00:00
Ramon Novoa 5d83e0e461 2012-06-08 Ramon Novoa <rnovoa@artica.es>
* include/db/postgresql.php,
	  include/db/mysql.php,
	  include/db/oracle.php,
	  include/config_process.php,
	  include/functions_db.php,
	  operation/agentes/datos_agente.php: Merged from 4.0 branch. Fixed and
	  improved the history database feature.

	* include/graphs/fgraph.php: Merged from 4.0 branch. Protect against
	  accidental output that might corrupt an image.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6460 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 12:18:03 +00:00
darode 2b07cf6461 2012-06-08 Dario Rodriguez <dario.rodriguez@artica.es>
* lib/PandoraFMS/Core.pm: Fixed an error counting 
	unknown agents in groups.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6458 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 12:13:26 +00:00
darode e6a9fb0d29 2012-06-08 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_modules.php,
	include/functions_groups.php,
	include/functions_os.php,
	operation/tree.php: Fixed a problem with unknown agent
	counting.
	
	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 12:11:58 +00:00
zarzuelo 936c0b89ff 2012-06-08 Sergio Martin <sergio.martin@artica.es>
* ChangeLog: Create the android agent change 
	log file



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6454 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 11:52:07 +00:00
juanmanuelr 434964a25a 2012-06-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/reporting/reporting_builder.php: Fixed update of custom 
	graph items.
o


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6453 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 11:46:28 +00:00
jsatoh 05cfebeaeb 2012-06-08 Junichi Satoh <junichi@rworks.jp>
* include/functions_config.php, godmode/setup/setup.php: Fixed that
	ACL with API access cannot be removed after once configured. (Merged
	from 4.0.2)
	Fixed multiple recording of list_ACL_IPs_for_API.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6451 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-08 07:57:53 +00:00
mdtrooper 9d6bce8fbd 2012-06-07 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.wizard.php,
	godmode/reporting/visual_console_builder.php: fixed the modules
	name with white spaces...again in Pandora console..
	
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6449 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 14:43:32 +00:00
darode 7298ddd183 2012-06-07 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_modules.php,
        operation/tree.php: Improved performance of tree
        view for modules, its not very good but now works...

	MERGED FROM 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6446 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 14:29:00 +00:00
juanmanuelr 7d3dc49d64 2012-06-07 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/menu.php: Hide not valid sections with metaconsole 
	 activated.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6444 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 14:25:08 +00:00
juanmanuelr 005a738ee3 2012-06-07 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora_minimal.css
	 operation/extensions.php
	 operation/menu.php
	 general/header.php
	 godmode/extensions.php: Hide not valid sections with metaconsole 
	 activated.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6443 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 14:22:38 +00:00
darode a3d94759dd 2012-06-07 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_os.php: Created this file.
        include/functions_groups,
        operation/tree.php: Fixed a bug related to search
        improved performance of OS tab for tree view.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6441 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 11:44:08 +00:00
hkosaka 0a8d926336 2012-06-07 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_ui.php: Merged from 4.0.x: Fixed bug:
	string truncation did not always work for multi-byte
	characters.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6437 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 09:54:03 +00:00
darode 5c009d2ddc 2012-06-07 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php,
	include/functions_groups.php: Fixed some errors and 
	improved performance of group tree view.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6435 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-07 09:24:05 +00:00
santimunin fd71da35e9 2012-06-06 Santiago Munin <burning1@gmail.com>
* src/pandroid_event_viewer/pandorafms/CreateIncidentActivity.java: All api operations are now asynchronous.
	* res/layout/create_incident.xml: Progress circle next to groups spinner.
	* res/values/strings.xml: New entries.
	* res/menu/options_menu_list_events.xml, res/menu/options_menu.xml: New incident icon.
	* res/drawable-ldpi/incident.png: Added new icon


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6432 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 18:34:09 +00:00
santimunin b2e88f38eb 2012-06-06 Santiago Munin <burnin1@gmail.com>
* Fixed wrong uploads (bin and gen directories).


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 17:21:19 +00:00
santimunin 3cd381653c 2012-06-06 Santiago Munin <burnin1@gmail.com>
* AndroidManifest.xml: Added CreateIncidentActivity (new activity).
	* src/pandroid_event_viewer/pandorafms/Core.java: Added some getAgents and getGroups
	* res/values/strings.xml: Added new entries
	* res/values/arrays.xml: Added new entries
	* res/menu/options_menu_list_events.xml, res/menu/options_menu.xml: Added "Incidents" entry
	* res/layout/create_incident.xml: CreateIncidentActivity's layout.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6428 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 17:16:52 +00:00
juanmanuelr 2a9ab14a42 2012-06-06 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/agentes/ver_agente.php
	 pandora_console/godmode/alerts/alert_list.builder.php: Fixed alert
	 creation when metaconsole is activated.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6425 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 16:22:37 +00:00
vgilc be8d87e9e7 2012-06-06 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/exportdata.php: Fixed bug:
	If the data type of module is string, don't export the data in format: table, Excel or CSV.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6424 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 16:13:12 +00:00
vgilc 1a871c7603 2012-06-05 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_modules.php: Fixed bug: When you
	copy a policy module, still liked to policy.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6420 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 12:07:51 +00:00
vgilc 49ba21100f 2012-06-06 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/exportdata.php
	  operation/agentes/exportdata.csv.php
	  operation/agentes/exportdata.excel.php: Fixed bug export
	data: If you choose first the type of export, the chosen 
	agent modules are not loaded into the page.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6419 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 12:05:33 +00:00
hkosaka d349c0ebf3 2012-06-06 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/agentes/planned_downtime.php: fixed that 'Affect'
	column at 'planned downtime' may show bad values. cleaned
	source code style.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6417 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-06 07:55:31 +00:00
darode 308300903b 2012-06-05 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php: Fixed a missing group icons
	
	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6415 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-05 12:49:17 +00:00
juanmanuelr 8747f5c2b3 2012-06-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/ajax/agent.php: Fixed function search_agent when 
	metaconsole is activated an one of the nodes return no agents.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6412 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-04 14:18:21 +00:00
vgilc 60e2b22c2b 2012-06-04 Vanessa Gil <vanessa.gil@artica.es>
* godmode/alerts/alert_list.list.php: Fixed bug: 
	Standard user can not add actions to an alert.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6410 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-04 13:48:00 +00:00
zarzuelo 374a1c30d4 2012-06-04 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php
	include/functions_io.php: Added new safe string function
	to scape strings to use it in regular expressions and
	change the parameters of enterprise functions to be
	compatible con last changes
	Merged from 4.0.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6409 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-04 09:05:32 +00:00