Commit Graph

104 Commits

Author SHA1 Message Date
daniel 06c1c4f243 fixed errors in fullscale graph and normal graph 2017-12-05 13:44:42 +01:00
vgilc 68a10343fb Revert "Merge branch…"
This reverts merge request !1025
2017-11-10 12:24:33 +01:00
daniel c780cb5285 fixed errors in fullscale graph and normal graph 2017-11-07 09:46:37 +01:00
daniel 48e68b1264 fixed error in function check mr 2017-10-13 14:08:50 +02:00
m-lopez-f 0b943fcf08 Remove debug traces 2017-03-03 13:27:02 +01:00
fbsanchez 8a2bd0f087 Fixed mysqli availability checker 2017-02-16 10:18:08 +01:00
Arturo Gonzalez 584427de06 Added changes to finish rr feature. Ticket #169 2017-02-14 09:36:11 +01:00
Arturo Gonzalez 5b7f4a5139 Merge branch 'develop' into feature/rolling_release
Conflicts:
	pandora_console/general/header.php
	pandora_console/include/functions.php
	pandora_console/index.php
	pandora_console/pandoradb_data.sql
2017-02-13 14:19:25 +01:00
daniel 8c40b6a1d0 fixed error Function does not exist 2016-12-16 12:26:35 +01:00
Junichi Satoh 6edc5e1439 Fixed warnings. 2016-12-07 17:29:04 +09:00
Junichi Satoh e8a466aaf7 Added support for mysqli with php7.0. 2016-11-24 09:43:28 +09:00
Arturo Gonzalez 8c20874a88 Changed rolling release manager system. 2016-07-19 12:39:03 +02:00
Arturo Gonzalez 0618dbbab3 Rolling release in progress... (Added minor releases) 2016-06-01 14:43:31 +02:00
fermin831 053b39e4a4 Oracle and postgre sql cache changes TICKETS #3581 2016-05-04 09:14:10 +02:00
fermin831 bb4ec54fbc Improved sql cache to permit make cache of several databases TICKETS #3581 2016-05-03 16:16:37 +02:00
mdtrooper a004bf6dc2 Fixed the PHP warnings that burns the file systems. TICKET: #3054
(cherry picked from commit a5f8a9ca24)
2016-01-11 14:02:39 +01:00
m-lopez-f 9e32dd439e Fixed problems with return id generate when insert data with db engine is oracle 2015-09-10 11:34:36 +02:00
m-lopez-f e3f85ea567 Fixed problems process querys with db engine Oracle, when create wizard sla. Tiquet: #2688 2015-09-07 15:21:21 +02:00
Alejandro Gallardo Escobar a85edf061e Fixed the format of the decimal and the thousands marker for the numeric fields 2015-07-15 16:53:51 +02:00
Alejandro Gallardo Escobar aea50e915a Fix to the date insertion when processing schema files 2015-06-22 19:19:59 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
Alejandro Gallardo Escobar 5751666f45 Improved the function "oracle_db_format_array_where_clause_sql" by adding more checks 2015-06-10 17:39:46 +02:00
mdtrooper dbc6893747 Fixed the list of items in the report editor. 2015-06-10 15:20:48 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
mdtrooper 9bba19235e Merge branch 'features/oracle' of https://github.com/pandorafms/pandorafms into features/oracle 2015-06-02 19:10:15 +02:00
mdtrooper 11d2b66b30 Fixes for the Oracl€. 2015-06-02 19:10:11 +02:00
Alejandro Gallardo Escobar ade22203c5 Added a new option to the db connection function 2015-06-02 18:03:39 +02:00
mdtrooper e4703a6f86 Fixed the function 'oracle_encapsule_fields_with_same_name_to_instructions'. 2015-05-29 16:48:14 +02:00
mdtrooper 4a36d18fe8 Fixed the error management in Oracl€. 2015-05-29 15:19:32 +02:00
Alejandro Gallardo Escobar b8f2daf6fa Improved the functions that return a value 2015-05-18 19:05:22 +02:00
Alejandro Gallardo Escobar c5d80cd104 Added history database support to the function '*_get_value_filter' 2015-05-18 18:05:09 +02:00
Alejandro Gallardo Escobar f0fe255f48 Added functions to process sql scripts to add data to the pandora database 2015-05-11 14:17:08 +02:00
Alejandro Gallardo Escobar 4008b12add Error fixes related with the improved oracle compatibility 2015-04-29 15:31:46 +02:00
mdtrooper cd0d2c68e5 Fixed the function mysql_db_get_all_rows_in_table for several fields to order as array
(cherry picked from commit 36c5349cf4)
2015-04-20 16:26:05 +02:00
mdtrooper 2a832e5758 Fixed the querys with the string '0'. 2015-03-23 19:18:08 +01:00
Ramon Novoa df651810d4 Added support for password encryption to the Pandora FMS Console. 2015-03-02 17:30:19 +01:00
mdtrooper 0473856048 Killing pink unicorns and magic numbers. 2015-02-16 18:37:16 +01:00
mdtrooper a3bc8a4e0d Added function 'db_get_fields' and the code for mysql 2014-09-09 15:22:31 +02:00
mdtrooper a6197fccb2 2014-07-31 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_networkmap.php, include/functions_graph.php,
	include/db/postgresql.php, include/db/oracle.php,
	include/functions_api.php, extensions/agents_alerts.php,
	operation/search_main.php, operation/search_agents.getdata.php,
	operation/agentes/status_monitor.php,
	operation/agentes/networkmap.topology.php,
	operation/agentes/ver_agente.php,
	operation/search_modules.getdata.php, operation/search_results.php,
	operation/events/events_list.php,
	godmode/alerts/alert_list.builder.php,
	godmode/alerts/configure_alert_template.php,
	godmode/modules/manage_network_components_form.php,
	godmode/reporting/reporting_builder.php,
	godmode/reporting/map_builder.php: tiny fixes for the improve the
	support of postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-31 14:27:43 +00:00
mdtrooper 478d521f59 2014-07-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/servers/manage_recontask.php,
	godmode/servers/manage_recontask_form.php,
	include/functions_treeview.php, include/ajax/module.php,
	include/functions_reporting.php, include/db/postgresql.php,
	include/functions_servers.php, operation/agentes/estado_agente.php,
	operation/tree.php: tiny fixes for the improve
	the support of postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-30 14:29:44 +00:00
mdtrooper 56bc6820bc 2014-07-24 Miguel de Dios <miguel.dedios@artica.es>
* operation/snmpconsole/snmp_view.php,
	operation/events/events_list.php, operation/incidents/incident.php,
	extensions/files_repo.php,
	extensions/files_repo/sql/files_repo.postgreSQL.sql,
	extensions/files_repo/functions_files_repo.php,
	extensions/files_repo/files_repo_list.php,
	godmode/agentes/modificar_agente.php,
	godmode/snmpconsole/snmp_alert.php, godmode/db/db_info.php,
	include/functions_graph.php, include/functions_db.php,
	include/db/postgresql.php, include/db/oracle.php,
	include/db/mysql.php, include/functions_update_manager.php,
	include/functions_events.php, include/graphs/functions_flot.php,
	include/graphs/fgraph.php: tiny fixes for the improve the support of
	postgreSQL databases.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10354 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-07-24 16:02:06 +00:00
mdtrooper cd56ef2542 2014-04-16 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/d3.v3.4.5.js: added the last javascript
	D3 library.
	
	* include/javascript/pandora_modules.js,
	include/functions_visual_map.php, include/functions_networkmap.php,
	include/functions_os.php, include/db/mysql.php,
	include/functions_netflow.php, include/constants.php,
	include/functions_reporting.php: standarized the color, now the
	code uses the colors constant.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9773 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-04-16 14:42:28 +00:00
mdtrooper 267b28ed0a 2013-08-05 Miguel de Dios <miguel.dedios@artica.es>
* include/constants.php, godmode/snmpconsole/snmp_alert.php: added
	filter in the alert snmp page and pagination.
	
	* operation/events/events.build_table.php,
	godmode/netflow/nf_edit.php, include/functions_ui.php,
	include/db/mysql.php, include/functions_incidents.php: improved the
	source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8630 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-05 14:23:27 +00:00
mdtrooper 0875fb0af9 2013-07-16 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php,
	include/javascript/jquery.pandora.controls.js: improved the
	functions to pass the php vars to js, now it supports json.
	
	* include/javascript/d3.v3.js: added this library for to make
	beautiful things.
	
	* include/functions_ui.php, include/graphs/fgraph.php,
	include/javascript/pandora_events.js, include/javascript/pandora.js,
	include/functions_treeview.php,
	include/include_graph_dependencies.php,
	include/functions_categories.php, include/db/postgresql.php,
	include/db/oracle.php, include/db/mysql.php: cleaned source code
	style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8528 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-07-16 14:13:23 +00:00
mdtrooper 8f9b4a045f 2013-05-16 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_common.php: disabled
	autocomplete for the field name to avoid javascript problems.
	
	Fixes: #2215
	
	* include/db/oracle.php, include/functions.php: improved the source
	code style.
	
	* include/functions_html.php: fixed the lost parameter $alt for
	the function html_print_input_text_extended from
	html_print_input_text.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8145 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-05-16 15:43:16 +00:00
zarzuelo ca9f82f4fd 2013-04-16 Sergio Martin <sergio.martin@artica.es>
* include/db/mysql.php: Fix a bug with the dbresource in the 
	function that count the result of a query.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7995 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-04-16 15:40:52 +00:00
mdtrooper 3411f0d1d9 2013-03-22 Miguel de Dios <miguel.dedios@artica.es>
* include/db/mysql.php: fixed the querys for the columns with
	empty string in the function
	"mysql_db_format_array_where_clause_sql".
	
	* include/functions_events.php: added lost parameter $similars in
	the function "events_change_owner".
	
	* operation/events/events.build_query.php: cleaned source code
	style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7882 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-03-22 14:27:47 +00:00
mdtrooper d36e33d9a5 2013-03-06 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_io.php, include/db/mysql.php: fixed warnings
	messages from PHP.
	
	Fixes: #3607014




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7799 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-03-06 17:28:55 +00:00
mdtrooper b3a8f7da1b 2013-02-05 Miguel de Dios <miguel.dedios@artica.es>
* ajax.php: added the autologin hash for some ajax call of user
	without login (but with hash autologin).
	
	* godmode/reporting/reporting_builder.list_items.php,
	include/db/mysql.php: cleaned source code style.
	
	* include/functions_reporting.php, include/functions_events.php,
	operation/reporting/reporting_xml.php: optimized the get by steps
	the group events.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7588 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-02-05 14:46:16 +00:00
mdtrooper 4b174a29b0 2013-01-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/planned_downtime.list.php, include/db/oracle.php,
	include/Image/image_functions.php,
	operation/events/events.build_table.php,
	operation/messages/message_edit.php, operation/users/user_edit.php,
	operation/tree.php: improved the source style.
	
	* include/constants.php: added constants for the subtype of modules.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7550 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-30 13:53:02 +00:00