Commit Graph

7109 Commits

Author SHA1 Message Date
Ramon Novoa 27b30523d0 2013-09-12 Ramon Novoa <rnovoa@artica.es>
* godmode/snmpconsole/snmp_alert.php: Fixed pagination (was not working
	  well when a search filter was being used).

	* godmode/netflow/nf_edit_form.php: Force the ID of the table (the
	  javascript was broken).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8763 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-12 12:36:30 +00:00
Ramon Novoa f09b303f2f 2013-09-12 Ramon Novoa <rnovoa@artica.es>
* win32/modules/pandora_module_logevent.cc: Write to the log file
	  (instead of the debug log) if Wevtapi.dll cannot be found.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8762 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-12 08:20:43 +00:00
Ramon Novoa 6d1e75f62c 2013-09-12 Ramon Novoa <rnovoa@artica.es>
* include/functions_config.php: Removed some code that set
	  netflow_disable_custom_lvfilters to an invalid value.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8761 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-12 08:18:51 +00:00
Ramon Novoa 72883e40f4 2013-09-12 Ramon Novoa <rnovoa@artica.es>
* NetBSD/pandora_server.conf,
	  FreeBSD/pandora_server.conf,
	  conf/pandora_server.conf.new: Removed an unused token.

	* lib/PandoraFMS/DB.pm,
	  lib/PandoraFMS/Core.pm: Changed the module status macro to return a
	  string instead of the numeric value.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8760 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-12 08:16:35 +00:00
Ramon Novoa ec48818bc5 2013-09-11 Ramon Novoa <rnovoa@artica.es>
* godmode/agentes/module_manager_editor.php,
	  include/help/en/help_alert_config.php,
	  include/help/en/help_alert_macros.php,
	  include/help/en/help_module_macros.php,
	  include/help/es/help_module_macros.php,
	  include/help/es/help_alert_config.php,
	  include/help/es/help_alert_macros.php,
	  include/help/ja/help_alert_macros.php,
	  include/help/ja/help_module_macros.php,
	  include/help/ja/help_alert_config.php: Updated help for module macros.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8758 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-11 12:22:48 +00:00
juanmanuelr b937ff531d 2013-09-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/admin_access_logs.php: Fixed php error that breaks
        this view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8755 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-10 11:52:19 +00:00
Ramon Novoa ebfb062743 2013-09-09 Ramon Novoa <rnovoa@artica.es>
* 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,
	  include/ajax/events.php,
	  include/functions_api.php,
	  include/functions_events.php,
	  include/javascript/pandora_events.js,
	  pandoradb.sql,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql: Added support for event custom data (via CLI
	  and API).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8754 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-09 16:21:45 +00:00
Ramon Novoa 9173d085b7 2013-09-09 Ramon Novoa <rnovoa@artica.es>
* conf/pandora_server.conf.new,
	  lib/PandoraFMS/Config.pm,
	  lib/PandoraFMS/Core.pm,
	  bin/pandora_server: Added support for event auto-expiry and small
	  fixes.

	* util/pandora_manage.pl: Added support for event custom data.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8753 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-09 16:09:34 +00:00
Ramon Novoa 9726ed98d3 2013-09-05 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added support for module macros.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8748 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-05 16:46:52 +00:00
Ramon Novoa ca1a5f2160 2013-09-05 Ramon Novoa <rnovoa@artica.es>
* 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,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql,
	  godmode/agentes/configurar_agente.php,
	  godmode/agentes/agent_template.php,
	  godmode/agentes/module_manager_editor_common.php,
	  godmode/agentes/module_manager_editor.php,
	  include/functions_modules.php,
	  pandoradb.sql: Added support for module macros.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8747 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-05 16:46:21 +00:00
zarzuelo c824039a28 2013-09-05 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager.php
	godmode/agentes/configurar_agente.php: Change old counts
	of status by new way setting flags to be updated by 
	server



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8746 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-05 16:35:49 +00:00
mdtrooper 4a020f2624 2013-09-05 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_plugin.php,
	include/javascript/pandora_modules.js: fixed the double apply
	entities in the plugin components.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8745 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-05 12:34:03 +00:00
mdtrooper 0f04a5693f 2013-09-05 Miguel de Dios <miguel.dedios@artica.es>
* lib/PandoraFMS/PluginServer.pm: fixed the lost decode html
	entities for the value in the macros.
	
	* util/plugin/dummy_plugin.pl: added tiny plugin server with only
	purpose to testing.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8744 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-05 09:57:40 +00:00
mdtrooper 2f42ff5fc4 2013-09-05 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_filemanager.php: fixed PHP notice when this
	file is included and there is not a upload file action.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8743 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-05 06:41:02 +00:00
Ramon Novoa 8da72999b7 2013-09-04 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/Config.pm,
	  conf/pandora_server.conf.new: Added support for custom event texts.

	* lib/PandoraFMS/Server.pm: Fixed a comparison.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8741 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-04 13:28:13 +00:00
mdtrooper 1506127262 2013-09-04 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/modificar_agente.php,
	include/functions_agents.php: fixed the delete agent when sometimes
	have remote config but not the enterprise.
	
	MERGED FROM THE BRANCH PANDORA_4




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8740 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-04 12:49:27 +00:00
Ramon Novoa 59054d4401 2013-09-04 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added support for treating events with the
	  same id_extra as a single event.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8738 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-04 09:33:33 +00:00
Ramon Novoa eed5d0efb4 2013-09-04 Ramon Novoa <rnovoa@artica.es>
* include/functions_events.php,
	  include/javascript/pandora_events.js: Added 'ID extra' to the event
	  details.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8737 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-04 09:14:52 +00:00
mdtrooper 3da5f64882 2013-09-03 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_groups.php, operation/agentes/group_view.php:
	fixed the links (now use constants instead the magic number and
	unicorns) to the filtered list of modules.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8735 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-03 12:58:22 +00:00
mdtrooper dbaa27ce6c 2013-09-03 Miguel de Dios <miguel.dedios@artica.es>
* util/pandora_revent.pl: fixed the script, now runs fine the tags
	and set correclty the comment and owner user, and other fixes.
	
	Fixes: #2386




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8734 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-03 12:22:57 +00:00
mdtrooper c77a285a97 2013-09-03 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed typing bugs...yes I wrote a lot
	of them, sorry.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8733 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-03 10:37:50 +00:00
mdtrooper 0aef6ae3a8 2013-09-03 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_ui.php: into the function "ui_pagination"
	added the parameter "print_total_items" to show the total of
	item in the list. It is showed althought the pagination does not.
	
	* operation/agentes/estado_agente.php: changed to don't show the
	total in the pagination block in the bottom.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8732 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-03 08:59:19 +00:00
Ramon Novoa a8f275a175 2013-09-03 Ramon Novoa <rnovoa@artica.es>
* 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,
	  godmode/tag/tag.php,
	  godmode/tag/edit_tag.php,
	  pandoradb.sql,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql,
	  pandoradb_data.sql: Added support for tag phone information.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8731 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-03 08:50:25 +00:00
Ramon Novoa 956ad866f2 2013-09-03 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added support for tag phone information.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8730 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-03 08:48:26 +00:00
mdtrooper 44550e9acc 2013-09-03 Miguel de Dios <miguel.dedios@artica.es>
* operation/tree.php, include/functions_treeview.php: improved the
	source code style.
	
	* operation/search_agents.getdata.php: added to search for the
	main address of agent.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8729 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-03 07:54:24 +00:00
mdtrooper b2f6506f8b 2013-09-02 Miguel de Dios <miguel.dedios@artica.es>
* godmode/massive/massive_edit_modules.php: added field "ip_target"
	for to massive edit module.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8727 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-02 14:02:37 +00:00
mdtrooper 041ab06cdc 2013-09-02 Miguel de Dios <miguel.dedios@artica.es>
* util/pandora_xml_stress.pl: fixed perl warning and set the default
	temp directory correctly.
	
	* util/pandora_xml_stress.conf: added lost parameters
	"directory_confs" and "directory_temp".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8725 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-09-02 07:20:10 +00:00
mdtrooper b9e7f1883b 2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/servers/servers.build_table.php: fixed the tooltip for
	lag column.
	
	Fixes: #2378




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8721 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-30 12:21:38 +00:00
mdtrooper 5aa0d0c1ec 2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/agent_manager.php: set the first default server
	when create a new agent.
	
	MERGED FROM THE BRANCH 4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8719 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-30 11:29:57 +00:00
mdtrooper 3b12a6b059 2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/estado_generalagente.php: show a warning
	message when the agent has not a assigned server.
	
	* operation/agentes/ver_agente.php: some changes for to make more
	easy the merge with the trunk.
	
	MERGED FROM THE TRUNK.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8718 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-30 11:21:51 +00:00
mdtrooper 602ceb1941 2013-08-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/groups/group_list.php: fixed pagination mismatch.
	
	Fixes: #2383




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8716 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-30 06:44:37 +00:00
mdtrooper 1ebaeac2e5 2013-08-29 Miguel de Dios <miguel.dedios@artica.es>
* lib/PandoraFMS/Core.pm: into the function "pandora_module_unknown"
	now checks if the module have disable unknown events.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8714 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-29 13:01:12 +00:00
mdtrooper a1b163e263 2013-08-29 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_snmp_browser.php: fixed PHP warnings.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8713 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-29 12:18:38 +00:00
mdtrooper ad99e437b0 2013-08-29 Miguel de Dios <miguel.dedios@artica.es>
* util/pandora_manage.pl: added support to disable/enable unknown
	events for modules.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8712 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-29 11:39:05 +00:00
mdtrooper 967e978fea 2013-08-29 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: added supoport for disabled unknown
	events modules, components and policies.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8711 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-29 07:48:10 +00:00
mdtrooper a87218f09e 2013-08-28 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_common.php: added code to
	policy module editor with disabled unknown events modules.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8708 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-28 12:44:47 +00:00
mdtrooper c90f5ff7ff 2013-08-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_modules.php: fixed the massive copy modules
	between agents.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8705 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-28 09:16:19 +00:00
mdtrooper 2f2a456e10 2013-08-28 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor.php,
	include/javascript/pandora_modules.js: implemented the disabled
	unknown events for local modules.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8704 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-28 07:53:50 +00:00
mdtrooper a151bfaf23 2013-08-28 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/agent_manager.php: fixed the PHP warnings in the
	call to enterprise function.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8703 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-28 07:19:46 +00:00
mdtrooper 9492e6bcc6 2013-08-27 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb.postgreSQL.sql, pandoradb.oracle.sql,
	godmode/agentes/module_manager_editor.php,
	godmode/agentes/module_manager_editor_common.php,
	godmode/agentes/configurar_agente.php,
	godmode/massive/massive_edit_modules.php,
	godmode/modules/manage_network_components_form_common.php,
	godmode/modules/manage_network_components.php,
	include/functions_events.php, include/functions.php,
	include/javascript/pandora_modules.js,
	include/functions_network_components.php,
	include/functions_modules.php, include/constants.php, pandoradb.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: first version of
	disabled unknown events for modules, now it is implemented in
	modules, massive operations and components, but it is necesary in
	local component, policy,  api, cli, pandora server and recond task.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8701 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-27 13:05:30 +00:00
mdtrooper 8f818c1488 2013-08-27 Miguel de Dios <miguel.dedios@artica.es>
* conf/pandora_server.conf.new: set the policy queues as default
	running.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8700 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-27 09:31:15 +00:00
mdtrooper c0cf75417c 2013-08-27 Miguel de Dios <miguel.dedios@artica.es>
* index.php, include/javascript/pandora.js: fixed code style.
	
	* godmode/massive/massive_edit_modules.php: fixed the javascript
	that showed some rows before to select modules to edit.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8699 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-27 09:29:36 +00:00
mdtrooper 805ae2d670 2013-08-26 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb.data.postgreSQL.sql, pandoradb.data.oracle.sql,
	pandoradb_data.sql: fixed the id_alert_command for restart the
	agent set 11 (before it was 10).

2013-08-26 Miguel de Dios <miguel.dedios@artica.es>
	
	* extensions/update_manager/lib/xmlrpc/xmlrpc.inc: fixed the timeout
	for to check packages of pandora update manager.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8697 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-26 13:44:44 +00:00
mdtrooper 3409440c40 2013-08-26 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor.php,
	godmode/agentes/module_manager_editor_common.php: fixed PHP
	warnings.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8695 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-26 07:17:43 +00:00
mdtrooper 30ca08c183 2013-08-23 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_common.php: fixed the PHP
	warnings.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8691 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-23 06:35:31 +00:00
mdtrooper 3d6d479574 2013-08-23 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/modificar_agente.php,
	include/functions_snmp_browser.php, include/functions_api.php: fixed
	PHP warnings and PHP notices.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8690 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-23 06:24:42 +00:00
darode d9cb5abea0 2013-08-22 Dario Rodriguez <dario@artica.es>
* pandora_agent_installer: Merged improvements from 4.1 branch
        to fix several bugs related to custom installation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8688 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-22 17:04:00 +00:00
mdtrooper 04afb4615d 2013-08-20 Miguel de Dios <miguel.dedios@artica.es>
* godmode/servers/servers.build_table.php, include/functions_db.php,
	include/functions_servers.php, index.php: improved the source code
	style.
	
	* include/functions_api.php: added the call to update the agent.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8682 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-21 12:37:37 +00:00
mdtrooper 00c554f0b4 2013-08-20 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: added calls to set gis data for agent
	"set/gis_agent_only_position" and "set/gis_agent", and for to get
	gis data "get/gis_agent".
	
	* include/functions_agents.php: added function "agents_update_gis".




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8680 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-20 13:13:52 +00:00
hkosaka 7e461eb008 2013-08-19 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_api.php: Small Fix. Corrected error message.

	MERGED FROM branch4.x



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8678 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-08-19 08:00:31 +00:00