Commit Graph

7279 Commits

Author SHA1 Message Date
zarzuelo 1ab9d4608e 2013-11-05 Sergio Martin <sergio.martin@artica.es>
* include/functions_tags.php: Fix the tags acl 
	check function to be compatible with acl propagation
	incident #345



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9006 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-05 12:56:51 +00:00
mdtrooper 6e468fc1ee 2013-11-05 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/EventList.java,
	src/pandroid_event_viewer/pandorafms/Main.java,
	src/pandroid_event_viewer/pandorafms/Options.java,
	src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java,
	res/drawable-ldpi/save.png, res/drawable-ldpi/icon_filter.png,
	res/drawable-ldpi/icon_refresh.png, res/layout/main.xml,
	res/layout/options.xml, res/drawable/btn_dropdown_pressed.9.png,
	res/drawable/btn_dropdown.xml,
	res/drawable/btn_dropdown_normal.9.png, res/values-ja/arrays.xml,
	res/values/styles.xml, res/values/arrays.xml,
	res/menu/options_menu_list_events.xml, res/values-es/arrays.xml:
	changes in the themes.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9005 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-05 12:10:28 +00:00
pandora-release dabdceec9e Auto-updated build strings.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9004 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-05 10:57:02 +00:00
zarzuelo 5250224042 2013-11-04 Sergio Martin <sergio.martin@artica.es>
* operation/tree.php: Truncate the name of agents
	and modules in tree view to avoid ugly view for 
	incident #306



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9002 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-04 15:16:37 +00:00
zarzuelo 487673e2bb 2013-11-04 Sergio Martin <sergio.martin@artica.es>
* godmode/massive/massive_edit_modules.php: Added
	module description to massive operations for 
	incident #148



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9000 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-04 14:21:45 +00:00
mdtrooper 3d02aa7654 2013-11-04 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/EventList.java,
	res/layout/list_view_layout.xml: changes in the theme of the app.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8999 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-04 12:02:48 +00:00
mdtrooper 21c8f492ec 2013-11-01 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/EventList.java,
	src/pandroid_event_viewer/pandorafms/Main.java,
	src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java,
	res/layout/list_view_layout.xml, res/layout/main.xml: changes in the
	theme of app.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8998 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-04 11:31:42 +00:00
zarzuelo 273d72b050 2013-11-04 Sergio Martin <sergio.martin@artica.es>
* include/functions_groups.php: Fixed function that
	returns the user groups in tree way. It was broken
	when the user has acls over a group but not in his
	father. Incident: #342
	Merged from 4.1



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8997 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-11-04 11:30:24 +00:00
mdtrooper ea486a6934 2013-10-31 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/Main.java,
	res/drawable-ldpi/filter_icon.png,
	res/drawable-ldpi/refrest_icon.png, res/layout/main.xml: changed the
	style app.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8991 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-31 16:48:59 +00:00
mdtrooper f7f95f63e8 2013-10-31 Miguel de Dios <miguel.dedios@artica.es>
* res/layout/main.xml: changed the style app.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8990 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-31 14:48:02 +00:00
mdtrooper 3ad22bedd6 2013-10-31 Miguel de Dios <miguel.dedios@artica.es>
* res/layout/main.xml, res/layout/options.xml,
	res/values-ja/strings.xml, res/values/strings.xml,
	res/values/styles.xml, res/menu/options_menu_list_events.xml,
	res/menu/options_menu.xml, res/values-es/strings.xml: changed the
	style app.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8989 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-31 14:19:04 +00:00
mdtrooper 8e437c6789 2012-10-31 Miguel de Dios <miguel.dedios@artica.es>
* res/layout/options.xml,
	res/drawable/edittext_pandora_default_shape.xml,
	res/drawable/edittext_pandora_colors_states.xml,
	res/drawable/edittext_pandora_select_shape.xml,
	res/values/styles.xml: changed the style of options layout.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8988 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-31 12:56:38 +00:00
hkosaka 8af1214b13 2013-10-31 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_api.php: Added some parameters to
	'create_group' API function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8987 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-31 11:50:06 +00:00
mdtrooper 74c0e8502c 2012-10-30 Miguel de Dios <miguel.dedios@artica.es>
* res/layout/options.xml, res/values-ja/strings.xml,
	res/values/strings.xml, res/values-es/strings.xml: changed the
	style of app, wip.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8985 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-30 16:14:36 +00:00
zarzuelo b46ece08bf 2013-10-30 Sergio Martin <sergio.martin@artica.es>
* godmode/setup/performance.php: Added tip messages to
	advice possible conflicts of performance configuration



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8984 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-30 16:06:51 +00:00
mdtrooper a4a91c765e 2012-10-30 Miguel de Dios <miguel.dedios@artica.es>
* res/values/styles.xml, res/layout/options.xml: I have started to
	set the new style of app (Thanks Carla).




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8983 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-30 15:50:54 +00:00
mdtrooper a1f2b59442 2012-10-29 Miguel de Dios <miguel.dedios@artica.es>
* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java:
	fixed when the data return to call for get events is bad format,
	before it was fails all app, now it tries to get correct event for
	each line.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8982 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-30 15:03:00 +00:00
mdtrooper 7b5b0e0635 2013-10-30 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the output of data as csv when
	the data have a return carriges.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8981 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-30 15:00:46 +00:00
hkosaka 585592ce38 2013-10-22 Hirofumi Kosaka <kosaka@rworks.jp>
* include/help/en/help_alert_config.php,
	include/help/en/help_alert_macros.php,
	include/help/es/help_alert_config.php,
	include/help/es/help_alert_macros.php,
	include/help/ja/help_alert_config.php,
	include/help/ja/help_alert_macros.php: Added _timezone_
	alert macro descriptions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8980 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-30 06:39:15 +00:00
mdtrooper 54a5a6e9f6 2013-10-29 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php: fixed the message to show the
	user, and fixed the checks.
	
	INCIDENT: #320




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8978 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-29 13:16:47 +00:00
mdtrooper 3846ace40f 2013-10-29 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php: fixed the delete the nodes in the
	networkmap enterprise.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8977 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-10-29 11:11:32 +00:00
zarzuelo 85e290b98a 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 fd64ae1054 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
Ramon Novoa bd39776cdd 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 3aa5403921 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 3bfcf5b78c 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 2c0b6a35da 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 e0cc349341 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 db5211d118 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 e96bb53f06 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 9909adf5e4 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 f09e7a2009 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 1a9380c1a0 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 94765e927f 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 3859e2fdf8 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 2125245841 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 2e210880e4 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 0ea2100328 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 7dfa1f31d9 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 9920066b50 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 b589732730 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 9022c0df61 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 a361c523a2 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 fef54fd731 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
Ramon Novoa 1f4b99eaa9 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 3462a1717e 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 4a10eea9f0 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 3c0218395b 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 16d4df7292 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 cac783010e 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