Commit Graph

7208 Commits

Author SHA1 Message Date
zarzuelo 9edc002919 2013-10-29 Sergio Martin <sergio.martin@artica.es>
* extensions/insert_data.php: Fix broken insert data
	feature for incident #331



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8975 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-29 11:05:31 +00:00
zarzuelo 019b7846fc 2013-10-29 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php: Merge the logic from the 
	pdf reports to have the same results in both sides for 
	incident #314



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8974 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-29 09:57:12 +00:00
ramonn 90e23c75d2 2013-10-28 Ramon Novoa <rnovoa@artica.es>
* install.php: Added some missing ids.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8972 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-28 15:45:33 +00:00
zarzuelo 12ee3eafe1 2013-10-28 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DataServer.pm: Add check to update
	adopted unlinked data modules



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8971 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-28 15:03:00 +00:00
mdtrooper 3799355550 2013-10-28 Miguel de Dios <miguel.dedios@artica.es>
* src/pandorafms/pandorafmsandroidconsole/Options.java,
	src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java: setted
	the default values the Pandora public demo.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8970 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-28 14:58:54 +00:00
mdtrooper a3b2dcdead Uploaded lost changes.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8969 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-28 14:49:21 +00:00
mdtrooper 5803b12344 2013-10-28 Miguel de Dios <miguel.dedios@artica.es>
* .classpath: some changes that eclipse makes "automagicaly".
	
	* src/pandorafms/pandorafmsandroidconsole/PandoraWebView.java:
	fixed java-android warnings.
	
	* res/layout/activity_web_view.xml: improved the source code style.
	
	* AndroidManifest.xml: fixed with ugly fix the lost "option button"
	in the phones/tables with android version over that honeycomb and
	have not a fisical option menu. Fixes the warnings of android.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8968 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-28 14:34:32 +00:00
zarzuelo 0198ec1320 2013-10-28 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Tools.pm: Added exeptions in safe_input
	and safe_output to avoid differences with the console condification
	with single and double quotes. Incident #309
	Merged from 4.1



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8967 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-28 13:10:48 +00:00
mdtrooper 8af9d39c73 2013-10-28 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.list_items.php,
	godmode/reporting/visual_console_builder.editor.js,
	godmode/reporting/visual_console_builder.elements.php,
	godmode/reporting/visual_console_builder.editor.php,
	include/help/en/help_visual_console_editor_editor_tab.php,
	include/javascript/jquery.pandora.js,
	include/functions_visual_map.php,
	include/ajax/visual_console_builder.ajax.php,
	include/functions_visual_map_editor.php: added rich labels for all
	items in the visualmap and the simple value has the new macro
	(_VALUE_) for to set the value with html style into the rich labels.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8965 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-28 10:27:10 +00:00
hkosaka 253300aaf9 2013-10-28 Hirofumi Kosaka <kosaka@rworks.jp>
* lib/PandoraFMS/Core.pm: Added _timezone_ alert macro.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8964 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-28 09:07:23 +00:00
vgilc 45f9ebbb21 2013-10-28 Vanessa Gil <vanessa.gil@artica.es>
* include/languages/ar.mo
	  include/languages/ar.po
 	  include/languages/cs.mo
	  include/languages/cs.po
	  include/languages/de.mo
	  include/languages/de.po
	  include/languages/el.mo
	  include/languages/el.po
	  include/languages/en_GB.mo
	  include/languages/en_GB.po
	  include/languages/es.mo
	  include/languages/es.po
	  include/languages/fr.po
	  include/languages/fr.mo
	  include/languages/it.po
	  include/languages/it.mo
	  include/languages/ja.po
	  include/languages/ja.mo
	  include/languages/nl.po
	  include/languages/nl.mo
	  include/languages/pl.po
	  include/languages/pl.mo
	  include/languages/pt.po
	  include/languages/pt.mo
	  include/languages/pt_BR.po
	  include/languages/pt_BR.mo
	  include/languages/ru.po
	  include/languages/ru.mo
	  include/languages/sk.po
	  include/languages/sk.mo
	  include/languages/tr.po
	  include/languages/tr.mo
	  include/languages/zh_CN.po
	  include/languages/zh_CN.mo
	  include/languages/zh_TW.po
	  include/languages/zh_TW.mo: Updated translations.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8962 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-28 07:47:23 +00:00
mdtrooper 82a9ff027c 2013-10-25 Miguel de Dios <miguel.dedios@artica.es>
* godmode/massive/massive_delete_action_alerts.php,
	godmode/massive/massive_add_action_alerts.php: fixed the javascript
	to load "alert templates" select box when change quickly the agents
	in the select box "Agents with templates".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8958 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-25 11:21:22 +00:00
mdtrooper 6a0bc8087b 2013-10-25 Miguel de Dios <miguel.dedios@artica.es>
* godmode/massive/massive_copy_modules.php,
	include/functions_modules.php: fixed the module massive copy from
	agent with remote configuration to agent without remote
	configuration and with a network module.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8957 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-25 10:15:50 +00:00
zarzuelo f30c711875 2013-10-24 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor_common.php: Store the 
	interval factor in modules edition when is policy form and other
	improvements. Incident #303



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8955 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-24 15:53:07 +00:00
mdtrooper 0da3baf0ed 2013-10-23 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the get events filtered by the
	group in the parameters.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8952 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-23 12:30:11 +00:00
jsatoh 14d3fee9de 2012-10-23 Junichi Satoh <junichi@rworks.jp>
* res/values-ja/strings.xml: Traslated string "empty".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8951 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-23 00:57:05 +00:00
mdtrooper 4da77b0404 2012-10-22 Miguel de Dios <miguel.dedios@artica.es>
* res/values-ja/strings.xml: added string "empty" but I can not
	translate into japanese.
	* res/values-es/strings.xml: added string for translate "empty" into
	spanish.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8949 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-22 11:47:47 +00:00
mdtrooper 56719a972a 2012-10-22 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/EventList.java: improved the
	code style.
	
	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java:
	fixed the values criticity_name and criticity_image in the events.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8948 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-22 11:29:00 +00:00
mdtrooper 73e68b3893 2012-10-22 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/API.java: added more log
	for to make more easy.
	
	* src/pandroid_event_viewer/pandorafms/Core.java: the constant
	TIMEOUT now is 10 seconds instead old 5 seconds that sometimes
	fails.
	
	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java:
	added functions "getEvents_v50" and "getEvents_old" for to get
	events list for serveral api pandora versions.
	
	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerService.java:
	fixed source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8947 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-22 11:08:27 +00:00
hkosaka 5cba9ab702 2013-10-22 Hirofumi Kosaka <kosaka@rworks.jp>
* util/pandora_migrate_plugins.pl: Added optional command-line	
	argument 'dbport' for people who use non-standard DB port.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8946 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-22 11:05:06 +00:00
hkosaka e6c69beb6d 2013-10-22 Hirofumi Kosaka <kosaka@rworks.jp>
* lib/PandoraFMS/Core.pm: Fixed missing macro replacing in
	async modules' event description.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8945 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-22 10:16:47 +00:00
hkosaka fd06a5a9f8 2013-10-22 Hirofumi Kosaka <kosaka@rworks.jp>
* include/ajax/module.php: changed the code to avoid to try to
          load enterprise code unconditionally.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8944 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-22 09:42:36 +00:00
mdtrooper dfa8f6f840 2012-09-13 Miguel de Dios <miguel.dedios@artica.es>
* res/layout/main.xml: removed the typo bug.
	
	* src/pandroid_event_viewer/pandorafms/Core.java, 
	src/pandroid_event_viewer/pandorafms/API.java,
	src/pandroid_event_viewer/pandorafms/About.java,
	src/pandroid_event_viewer/pandorafms/EventList.java: fixed the code
	style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8942 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-21 12:00:42 +00:00
ramonn 1a9d58e3af 2013-10-21 Ramon Novoa <rnovoa@artica.es>
* pandora_agent_daemon: Changed status return codes to conform to LSB
	  specs. Fixes bug #2397.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8940 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-21 08:08:12 +00:00
mdtrooper 58503c48ec 2013-10-21 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: applied the path from
	"http://sourceforge.net/p/pandora/bugs/2395/", thanks Jorge Loza.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8939 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-21 07:37:03 +00:00
mdtrooper 8fac06506c 2012-09-13 Miguel de Dios <miguel.dedios@artica.es>
* .classpath: removed the entry for ".svn" folder
	...is the eclipse crazy?




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8934 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-18 12:39:44 +00:00
mdtrooper 42bcaa8d47 2013-10-17 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/configurar_agente.php: fixed the string of
	duplicate module.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8933 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-18 10:37:35 +00:00
mdtrooper 62e4e18b5b 2013-10-17 Miguel de Dios <miguel.dedios@artica.es>
* godmode/setup/gis_step_2.php: fixed typo bug.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8931 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-17 08:43:38 +00:00
zarzuelo 920ebd966d 2013-10-16 Sergio Martin <sergio.martin@artica.es>
* godmode/setup/setup_netflow.php: Fix aesthetic issues




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8929 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 16:46:09 +00:00
mdtrooper 40097cf27b 2013-10-16 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/main.php: fixed the javascript bugs
	about the new version of jquery.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8928 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 14:59:15 +00:00
mdtrooper e2deb4d11a 2013-10-16 Miguel de Dios <miguel.dedios@artica.es>
* include/api.php: checking the update manager, sorry.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8927 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 14:13:53 +00:00
mdtrooper 83c0cd91c5 2013-10-16 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/configurar_agente.php,
	include/functions_network_components.php,
	include/functions_alerts.php: fixed the name of items to duplicate,
	now they have a html entities for whitespaces.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8926 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 12:00:58 +00:00
zarzuelo ab7919e623 2013-10-16 Sergio Martin <sergio.martin@artica.es>
* include/javascript/jquery.pandora.js
	include/functions_config.php: Changed license warning window
	time to 30 seconds. Added header warning message when license 
	is expired in client mode



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8925 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 10:47:28 +00:00
mdtrooper 6edc77cf67 2013-10-16 Miguel de Dios <miguel.dedios@artica.es>
* godmode/massive/massive_delete_modules.php,
	include/functions_modules.php: fixed the delete modules with
	conf from the massive operations.

2013-10-16 Miguel de Dios <miguel.dedios@artica.es>

	* pandoradb_data.sql,
	extensions/update_manager/sql/update_manager.sql,
	extensions/update_manager/sql/update_manager.postgreSQL.sql,
	extensions/update_manager/sql/update_manager.oracle.sql,
	extensions/system_info.php, pandoradb.data.postgreSQL.sql,
	pandoradb.data.oracle.sql, extras/pandora_diag.php: removed the
	unused path to keygen.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8924 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 10:30:35 +00:00
zarzuelo 735891be56 2013-10-16 Sergio Martin <sergio.martin@artica.es>
* ChangeLog: Commit last commit missed ChangeLog

2013-10-16  Sergio Martin <sergio.martin@artica.es>

	* include/styles/pandora.css
	images/login_background.jpg
	images/login_background.png: Change login screen background
	image



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8923 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 09:30:56 +00:00
ramonn cffde24bbc 2013-10-16 Ramon Novoa <rnovoa@artica.es>
* build_vars.sh: Added arch information.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8922 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 09:20:04 +00:00
zarzuelo 70d03bf102 2013-10-16 Sergio Martin <sergio.martin@artica.es>
* include/styles/pandora.css
	images/login_background.jpg
	images/login_background.png: Change the background
	image of the login screen




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8921 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 09:19:51 +00:00
ramonn c9c2a914fe 2013-10-16 Ramon Novoa <rnovoa@artica.es>
* extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql,
	  extras/pandoradb_migrate_4.1_to_5.0.oracle.sql,
	  extras/pandoradb_migrate_4.1_to_5.0.mysql.sql,
	  extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
	  extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
	  extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql: Removed some queries
	  that were re-introduced in revision 8897.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8920 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 07:59:53 +00:00
jsatoh 04fc4fd88c 2013-10-16 Junichi Satoh <junichi@rworks.jp>
* extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
	extras/pandoradb_migrate_4.1_to_5.0.mysql.sql,
	extras/pandoradb_migrate_4.1_to_5.0.oracle.sql,
	extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql: Removed duplicated
	queries.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8919 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-16 05:43:39 +00:00
pandora-release c8403b027a Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8917 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-15 23:24:00 +00:00
ramonn b1badda213 2013-10-15 Ramon Novoa <rnovoa@artica.es>
* godmode/agentes/module_manager_editor.php: Fixed the module macro
	  editor.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8916 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-15 13:52:16 +00:00
pandora-release a508578595 Updated version and build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8915 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-15 10:48:41 +00:00
ramonn 5b553e4850 2013-10-15 Ramon Novoa <rnovoa@artica.es>
* pandoradb_data.sql: Fixed some SQL queries.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8914 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-15 09:52:22 +00:00
ramonn 52d2506dad 2013-10-15 Ramon Novoa <rnovoa@artica.es>
* pandoradb_data.sql: Added more network components.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8913 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-15 08:58:36 +00:00
mdtrooper 317f35dba5 a2013-10-14 Miguel de Dios <miguel.dedios@artica.es>
* operation/events/events.build_query.php,
	operation/events/events_list.php, operation/events/events.php: added
	the filter for events of group childrens of parent group selected.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8911 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-14 15:36:50 +00:00
zarzuelo 640a535e36 2013-10-14 Sergio Martin <sergio.martin@artica.es>
* include/functions_events.php
	include/functions_reporting.php
	godmode/reporting/reporting_builder.item_editor.php: Fixed filters
	of event reports filters and some visual issues



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8910 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-14 14:22:52 +00:00
mdtrooper ff69f65c32 2013-10-14 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_groups.php: into the function
	"groups_get_group_to_list" fixed PHP warnings about uninitialized
	vars.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8909 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-14 13:58:55 +00:00
mdtrooper e3f33a6340 2013-10-14 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/status_monitor.php: fixed the filter by group
	in the metaconsole.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8908 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-14 12:36:41 +00:00
ramonn 70c57a4b3c 2013-10-14 Ramon Novoa <rnovoa@artica.es>
* operation/snmpconsole/snmp_view.php: Made the SNMP trap viewer look
	  more like the event viewer.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8907 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-14 12:00:56 +00:00
mdtrooper a70dd1c1e5 2013-10-14 Miguel de Dios <miguel.dedios@artica.es>
* include/graphs/flot/pandora.flot.js,
	include/graphs/functions_flot.php, operation/agentes/stat_win.php:
	fixed the charts with negative values and a flot type.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8906 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-14 11:48:51 +00:00