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 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
Uploaded lost changes.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8969 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
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  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  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-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  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 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 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-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 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
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
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  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
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-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
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  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  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