Commit Graph

2145 Commits

Author SHA1 Message Date
zarzuelo 7484afec02 2010-10-19 Sergio Martin <sergio.martin@artica.es>
* include/functions_visual_map.php
	include/ajax/visual_console_builder.ajax.php
	godmode/reporting/visual_console_builder.php: Added the html support
	in the label type items of the visual consoles for pending
	task 3063404



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3425 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-19 15:57:07 +00:00
mdtrooper ace84dc4b0 2010-10-19 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php: added hook for "user translation" in function
	"__".
	
	Pending task: #3057674



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3423 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-19 12:23:05 +00:00
zarzuelo c5d7120674 2010-10-19 Sergio Martin <sergio.martin@artica.es>
* godmode/massive/massive_edit_modules.php: Fixed a jquery typo
	for iexplorer browser



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3422 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-19 11:04:20 +00:00
mdtrooper a955da9bdb 2010-10-19 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_io.php: fixed the function "safe_input" when the
	parameter is a array.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3421 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-19 10:28:26 +00:00
slerena b12fb03fdd 2010-10-18 Sancho Lerena <slerena@artica.es>
* pandoradb.sql: Alter some trecon_task info to avoid problems on new
	custom script items (due the referencial integrity).
	
	* pandoradb_data.sql: Octopods instead octopus.
	
	* godmode/menu.php,
	* godmode/servers/recon_script.php: Added new option to manage recon scripts
	
	* godmode/servers/manage_recontask.php,
	godmode/servers/manage_recontask_form.php: Changes to manage the new recon
	tasks using custom-defined scripts to detect and monitor things (neeed some
	Javascript improvements).
	


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3418 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-18 18:16:45 +00:00
mdtrooper 4b05e2df64 2010-10-18 Miguel de Dios <miguel.dedios@artica.es>
* extensions/insert_data.php: added first version of extension to added
	data in any module in any agent, by form or csv.
	
	Pending tasks: #3063417



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3416 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-18 12:38:02 +00:00
ramonn 4a0b5df5ce 2010-10-18 Ramon Novoa <rnovoa@artica.es>
* extras/pandoradb_migrate_v3.1_to_v3.2.sql: Added support for recon scripts.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3415 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-18 10:15:35 +00:00
slerena b29201c111 2010-10-16 Sancho Lerena <slerena@artica.es>
* DEBIAN/control: Removed apache and apache php mod from deps, giving
        user chance to use another HTTP server.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3414 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-16 13:25:00 +00:00
slerena c7200075b2 2010-10-16 Sancho Lerena <slerena@artica.es>
* pandoradb_migrate_v3.1_to_v3.2.sql: Variable for SQL custom reports has
    more size now (custom SQL reports could be huge SQL sentences).

    * godmode/reporting/reporting_builder.php, 
    godmode/reporting/reporting_builder.item_editor.php: Added suppor for the 
    new SQL graph reports (vbar, hbar and pie).

    * include/fgraph.php: Support for new SQL graphs, with new function 
    graph_custom_sql_graph().

    * include/functions_reporting.php:  Support for new SQL graphs.

    * operation/reporting/reporting_xml.php: Fixed some problems and added
    support for graphs using session_id.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3413 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-16 10:47:21 +00:00
ramonn bced419f7e 2010-10-15 Ramon Novoa <rnovoa@artica.es>
* pandoradb.sql: Added support for recon scripts.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3412 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-15 13:03:03 +00:00
zarzuelo abf7bc65ff 2010-10-15 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_list.list.php: Improved the size of the
	alert view columns



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3410 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-15 12:11:23 +00:00
zarzuelo d5fb8b4d2b 2010-10-15 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_list.list.php
	godmode/alerts/alert_list.builder.php: Fixed the ugly layout of 
	the alert views



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3409 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-15 11:47:43 +00:00
mdtrooper 70f09fccb4 2010-10-15 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_network.php: added lines to unblock
	SNMP community when the module is adopt.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3407 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-15 08:28:37 +00:00
zarzuelo 9738bbd51b 2010-10-14 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/ver_agente.php: Safe output the list of
	modules from an agent in the ajax control



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3405 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-14 17:09:26 +00:00
zarzuelo 12a12d5959 2010-10-14 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php
	godmode/agentes/module_manager.php
	godmode/agentes/configurar_agente.php: Added clone module
	into an agent to the manage modules view



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3404 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-14 17:07:50 +00:00
zarzuelo c802715dc3 2010-10-14 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/exportdata.php: Safe output the autocomplete
	of magic inputs



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3403 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-14 17:04:19 +00:00
mdtrooper 0aedfa3a38 2010-10-14 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb.sql, extras/pandoradb_migrate_v3.1_to_v3.2.sql: added in the
	table "tagente_modulo" the field "policy_adopted" for to set a module
	pre exist in policy as adopted.
	
	*operation/agentes/status_monitor.php,
	operation/agentes/estado_ultimopaquete.php,
	operation/agentes/estado_monitores.php,
	godmode/agentes/module_manager_editor_common.php,
	godmode/agentes/module_manager.php: show the icon of "adopted" or "adopted 
	but unlinked" in the list of modules.
	
	Pending tasks: #3083123
	

	
	* include/functions_modules.php: cleaned source code style in function
	"update_agent_module".
	
	* godmode/agentes/module_manager_editor_network.php: fixed warning messages
	when use this file in policies.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3402 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-14 15:09:29 +00:00
zarzuelo edebaa4bc2 2010-10-14 Sergio Martin <sergio.martin@artica.es>
* images/policies_not_brick.png: Added a module-not-policy
	icon



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3401 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-14 14:34:24 +00:00
zarzuelo d051dc23c1 2010-10-14 Sergio Martin <sergio.martin@artica.es>
* images/policies_brick.png: Added a module-policy
	icon



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3400 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-14 14:19:21 +00:00
zarzuelo 9027c6bf5b 2010-10-14 Sergio Martin <sergio.martin@artica.es>
* include/functions_html.php
	include/functions_io.php
	include/functions_ui.php
	godmode/agentes/module_manager.php: Created a new safe input
	function more soft than safe_input() for html code. Applied this
	function (safe_input_html()) in few functions like print_image
	or print_page_header.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3399 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-14 12:27:09 +00:00
mdtrooper 9d44dc6afd 2010-10-14 Miguel de Dios <miguel.dedios@artica.es>
* extensions/system_info.php: add TODO.
	
	* godmode/agentes/module_manager_editor.php: fixed the ajax with the new
	safe_ouput function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3395 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-14 10:31:30 +00:00
jsatoh 413397b9e0 2010-10-14 Junichi Satoh <junichi@rworks.jp>
* godmode/massive/massive_enable_disable_alerts.php,
	godmode/massive/massive_standby_alerts.php: Fixed alert listing is not
	affected by group selection.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3394 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-14 03:24:05 +00:00
zarzuelo a3f0288fe1 2010-10-13 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/ver_agente.php: Fixed a SQL 
	query with safe_output function



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3391 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-13 15:42:29 +00:00
zarzuelo f3c4e7c401 2010-10-13 Sergio Martin <sergio.martin@artica.es>
* include/functions_db.php: Fixed a SQL query with
	the safe_output function



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3390 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-13 15:40:51 +00:00
jsatoh 5056c4e8db 2010-10-12 Junichi Satoh <junichi@rworks.jp>
* godmode/massive/massive_add_action_alerts.php,
	godmode/massive/massive_delete_action_alerts.php,
	godmode/massive/massive_add_alerts.php,
	godmode/massive/massive_copy_modules.php,
	godmode/massive/massive_delete_agents.php,
	godmode/massive/massive_edit_agents.php: Fixed action URLs.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3387 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-12 01:32:05 +00:00
mdtrooper 72077738d6 2010-10-11 Miguel de Dios <miguel.dedios@artica.es>
* extensions/system_info.php: finally I finished (I hope) the extension of
	get system info, now the console part run.
	
	Pending task: #3065357



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3386 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-11 15:37:04 +00:00
mdtrooper e4294b4883 2010-10-11 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php: cleaned source code style.
	
	* extensions/system_info.php: first version of extension for extract system
	info of Pandora System, at the moment run as PHP script shell, the source
	code for console is commented because I will change for new source code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3385 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-11 14:44:25 +00:00
ramonn 0110a44d28 2010-10-11 Ramon Novoa <rnovoa@artica.es>
* include/fgraph.php: Search history DB if necessary for module charts.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-11 12:37:53 +00:00
mdtrooper 371776a4b6 2010-10-11 Miguel de Dios <miguel.dedios@artica.es>
* include/config_process.php: fixed the execution in as script.
	
	* include/fgraph.php: fixed in the "graphic_combined_module" when is empty.
	And cleaned source code style.
	
	* include/functions_extensions.php: cleaned source code style.
	
	* extensions/pandora_logs.php: cleaned source code style. And set to
	translation a string.
	
	* extras/pandora_diag.php: cleaned source code style.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3382 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-11 10:37:34 +00:00
slerena ce2b24da8f 2010-10-11 Sancho Lerena <slerena@artica.es>
* include/functions_reporting.php: Fixed problem with SQL custom reports
        because the SQL html encoding. Added a SQL check for secure user-input
        SQL code.

        * include/functions.php: Added check_sql() function to do a basic
        safety check on SQL code.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3381 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-11 10:14:03 +00:00
darode 4712cb4c35 2010-10-11 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_io.php: Added \s character in decode HTML entities
	function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3378 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-11 07:44:49 +00:00
slerena 6aee8a02a5 2010-10-08 Sancho Lerena <slerena@artica.es>
* include/functions_io.php: Added \s character to list of HTML decoded/encoded
    items to be converted from user entries (Safety for XSS and SQL Injection).

    * pandoradb_data.sql: Added more default templates, actions and commands. 
    This is for remote agent management (refresh).
    


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3376 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-08 17:00:28 +00:00
raulmateos 149093bcd8 2010-10-08 Raul Mateos <raulofpandora@gmail.com>
* operation/agentes/estado_monitores.php: Center status icon.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3375 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-08 15:37:45 +00:00
darode c18bb7daee 2010-10-08 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_io.php: Added functions ascii_to_html and html_to_ascii. 
	Also use this functions to convert no printing chars in function safe_input 
	and to revert the conversion in function safe_output.
	* include/functions_db.php: Added function escape_string_sql, is a
	wrapper db indepenten function to do the same that function mysql_real_escape_string
	* index.php: Use function escape_string_sql with login parameters.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3372 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-08 11:35:18 +00:00
zarzuelo 4b37c28c1d 2010-10-08 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora.js
	include/functions_agents.php
	operation/agentes/ver_agente.php
	godmode/massive/massive_add_alerts.php
	godmode/massive/massive_delete_alerts.php: Improved the 
	addition/deletion of alerts in massive operations to 
	select not only the agents (the modules too) for pending
	task 3082862



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3371 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-08 11:16:57 +00:00
zarzuelo d8e5baf90e 2010-10-08 Sergio Martin <sergio.martin@artica.es>
* include/functions_db.php: Fixed the function get_agentmodule_id
	to avoid the pending_delete modules



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3369 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-08 07:22:54 +00:00
zarzuelo e32bd8a345 2010-10-08 Sergio Martin <sergio.martin@artica.es>
*  godmode/agentes/module_manager_editor_common.php
	 godmode/agentes/module_manager_editor.php: Fixed SQL 
	 error when try to create a module called 0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-08 07:20:40 +00:00
jsatoh 2a5bf6ea34 2010-10-08 Junichi Satoh <junichi@rworks.jp>
* godmode/massive/massive_add_action_alerts.php,
	godmode/massive/massive_delete_action_alerts.php: Added simple and
	compound alerts selections.

	* include/functions_alerts.php: Added new function, get_alert_compounds().



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3367 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-08 03:26:49 +00:00
slerena 7109acb41a 2010-10-07 Sancho Lerena <slerena@artica.es>
* godmode/alerts/alert_list.list.php: Another ugly warning fixed due 
        an undefined array. PLEASE dont use foreach on arrays non-checked !




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-07 15:18:51 +00:00
slerena b89bcbd9c1 2010-10-07 Sancho Lerena <slerena@artica.es>
* godmode/agentes/configurar_agente.php: Added custom fields to the global
        edit/insert code. Not really used here, but for the future.

        * godmode/modules/module_list.php: Show ID of modules, useful information.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3364 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-07 12:00:16 +00:00
mdtrooper dc63e7553f 2010-10-07 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/calendar.js, include/javascript/jquery.colorpicker.js:
	fixed end of sentences with lost semicolons, the Eclipse IDE warned me some
	this bugs.
	
	* include/javascript/jquery.timeentry.js, include/help/en/help_wmiquery.php,
	include/help/en/help_tcp_send.php, include/help/en/help_web_checks.php,
	include/help/es/help_date_format.php, include/help/es/help_tcp_send.php,
	include/help/es/help_agent_status.php, include/help/es/help_eventview.php,
	include/help/es/help_configure_gis_map.php,
	include/help/es/help_web_checks.php,
	include/help/es/help_plugin_definition.php,
	include/help/es/help_alert_macros.php, include/help/ja/help_wmiquery.php,
	include/help/ja/help_date_format.php,
	include/help/ja/help_alert-matches.php, include/help/ja/help_tcp_send.php,
	include/help/ja/help_agent_status.php, include/help/ja/help_eventview.php,
	include/help/ja/help_configure_gis_map.php,
	include/help/ja/help_map_builder.php, include/help/ja/help_web_checks.php,
	include/help/ja/help_plugin_definition.php,
	include/help/ja/help_alert_macros.php,
	include/help/ja/help_gis_setup_map_connection.php: cleaned html and fixed
	unclose html tags in source code, the Eclipse IDE warned me some this bugs.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3363 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-07 10:50:04 +00:00
mdtrooper c2fad0ced1 2010-10-07 Miguel de Dios <miguel.dedios@artica.es>
* include/calendar.js, include/FusionCharts/FusionCharts.js: fixed end of
	sentences with lost semicolons, the Eclipse IDE warned me some this bugs.
	
	* include/help/en/help_date_format.php,
	include/help/en/help_agent_status.php, include/help/en/help_eventview.php,
	include/help/en/help_configure_gis_map.php, include/help/en/help_alerts.php,
	include/help/en/help_plugin_definition.php,
	include/help/en/help_alert_macros.php,
	include/help/en/help_gis_setup_map_connection.php,
	general/license/pandora_info_en.html,
	general/license/pandora_info_pt_BR.html,
	general/license/pandora_info_es.html, general/license/pandora_info_ja.html,
	general/pandora_help.php: cleaned html and fixed unclose html tags in source
	code, the Eclipse IDE warned me some this bugs.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3362 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-07 10:08:38 +00:00
zarzuelo 7c640c5032 2010-10-07 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php
	include/functions_visual_map.php
	operation/reporting/graph_viewer.php
	godmode/reporting/graph_builder.preview.php: Fixed the setting
	of width and height on custom graphs setup. Increased the height 
	of the graph in few sections to fix the rise of the leyend



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3361 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-07 09:27:38 +00:00
zarzuelo 304b165ddc 2010-10-07 Sergio Martin <sergio.martin@artica.es>
* include/fgraph.php: Fixed crash when try to render 
	a graph without data



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3359 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-07 08:46:13 +00:00
zarzuelo 0f614e8f63 2010-10-07 Sergio Martin <sergio.martin@artica.es>
* godmode/massive/massive_edit_agents.php: Removed the IP 
	address field from the agent massive edition



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3358 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-07 08:13:36 +00:00
mdtrooper a8707e71b8 2010-10-06 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/configurar_agente.php: fixed the source code, now when you
	create a agent, the agent have not a any module.
	
	Fixes: #3077024



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3356 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-06 15:43:26 +00:00
zarzuelo dcb33813df 2010-10-06 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/visual_console_builder.php
	godmode/reporting/visual_console_builder.editor.js
	godmode/reporting/visual_console_builder.editor.php: Fixed the
	bad icon change in visual console editor when update an item
	for bug 3078016



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3355 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-06 15:35:49 +00:00
mdtrooper 82c18ebd12 2010-10-06 Miguel de Dios <miguel.dedios@artica.es>
* extras/pandoradb_migrate_v3.1_to_v3.2.sql: added default sound events in
	tconfig, fixed bug that found Raul. Thanks for the tips, Raul.
	
	Fixes: #3073370



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3354 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-06 14:56:17 +00:00
mdtrooper 85724ac1e0 2010-10-06 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php: added in function "process_config" added
	lines code to check unset 'autoupdate' in $config.
	
	* operation/incidents/incident_statistics.php, godmode/users/user_list.php:
	cleaned source code style.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3353 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-06 14:37:33 +00:00
mdtrooper 76d03875e7 2010-10-06 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/status_monitor.php,
	operation/agentes/estado_ultimopaquete.php,
	operation/agentes/estado_monitores.php, godmode/agentes/module_manager.php:
	fixed the icon of policy in list of modules, now show when the module is
	unlinked. And cleaned source code style.
	
	Fixes: #3078716



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3351 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-06 12:24:21 +00:00
zarzuelo 38d1a56a3e 2010-10-06 Sergio Martin <sergio.martin@artica.es>
* include/fgraph.php
	operation/incidents/incident_statistics.php: Fixed the incident
	statistics for bug 3078118



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3350 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-06 12:16:24 +00:00
darode e77fb4b6b6 2010-10-06 Dario Rodriguez <dario.rodriguez@artica.es>
*operation/agentes/estado_agente.php, ver_agente.php: Fixed some problems 
	processing the input



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3349 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-06 11:04:16 +00:00
mdtrooper cd6d102fe4 2010-10-06 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor.php: cleaned source code style.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3348 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-06 10:30:11 +00:00
mdtrooper e4e288c30c 2010-10-06 Miguel de Dios <miguel.dedios@artica.es>
* include/config_process.php: force the absolute path when include the
	languages translation files.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3347 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-06 10:06:34 +00:00
slerena db9f5da826 2010-10-05 Sancho Lerena <slerena@artica.es>
* include/config_process.php: Remove config['debug'] from prev.
    commit.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3345 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-05 18:12:02 +00:00
slerena 8f3acf6420 2010-10-05 Sancho Lerena <slerena@artica.es>
* include/config_process.php: Set to 0 $config['debug'] by default to avoid
    debug messages on normal operation mode, developers should setup debug
    mode in their config.php file.

    * pandoradb_data.sql: Added default template and action as sample.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3344 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-05 17:33:11 +00:00
mdtrooper acc02b912c 2010-10-05 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php: cleaned source code style and optimize
	some parts (deleted redundant if sentences).
	
	* include/functions_db.php: cleaned source code style.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3343 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-05 11:44:14 +00:00
zarzuelo 7af53909dc 2010-10-05 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/estado_ultimopaquete.php
	operation/agentes/estado_monitores.php: Added the policy
	column to the monitors in agent view and improve the header
	of force execution in few monitors view for bug: 3078713



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3342 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-05 10:53:44 +00:00
zarzuelo bdcd0bce3f 2010-10-05 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/estado_ultimopaquete.php: Added the policy
	column to the monitors list for bug 3078713



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3341 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-05 09:33:08 +00:00
zarzuelo 96c54d6b01 2010-10-04 Sergio Martin <sergio.martin@artica.es>
* include/languages/cs.po
	include/languages/et.mo
	include/languages/pt_BR.po
	include/languages/nl.mo
	include/languages/es.po
	include/languages/pl.mo
	include/languages/it.mo
	include/languages/ko.po
	include/languages/sl.mo
	include/languages/sk.po
	include/languages/uk.po
	include/languages/ro.po
	include/languages/pt.mo
	include/languages/ast.mo
	include/languages/en_AU.mo
	include/languages/bg.mo
	include/languages/index.pot
	include/languages/bn.po
	include/languages/ar.po
	include/languages/cs.mo
	include/languages/pt_BR.mo
	include/languages/es.mo
	include/languages/ko.mo
	include/languages/fr.po
	include/languages/sk.mo
	include/languages/uk.mo
	include/languages/ro.mo
	include/languages/ca.po
	include/languages/da.po
	include/languages/tr.po
	include/languages/sv.po
	include/languages/de.po
	include/languages/ja.po
	include/languages/zh_TW.po
	include/languages/bn.mo
	include/languages/he.po
	include/languages/fi.po
	include/languages/ar.mo
	include/languages/hi.po
	include/languages/zh_CN.po
	include/languages/fr.mo
	include/languages/te.po
	include/languages/eu.po
	include/languages/en_GB.po
	include/languages/hu.po
	include/languages/ca.mo
	include/languages/da.mo
	include/languages/tr.mo
	include/languages/de.mo
	include/languages/sv.mo
	include/languages/ru.po
	include/languages/ja.mo
	include/languages/zh_TW.mo
	include/languages/he.mo
	include/languages/fi.mo
	include/languages/hi.mo
	include/languages/zh_CN.mo
	include/languages/el.po
	include/languages/gl.po
	include/languages/te.mo
	include/languages/eu.mo
	include/languages/en_GB.mo
	include/languages/et.po
	include/languages/nl.po
	include/languages/hu.mo
	include/languages/pl.po
	include/languages/it.po
	include/languages/sl.po
	include/languages/pt.po
	include/languages/ru.mo
	include/languages/ast.po
	include/languages/en_AU.po
	include/languages/bg.po
	include/languages/el.mo
	include/languages/gl.mo: Updated the po files



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3340 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-04 17:35:39 +00:00
zarzuelo d2bc1129dc 2010-10-04 Sergio Martin <sergio.martin@artica.es>
* mobile/include/user.class.php: Fixed empty translated
	string



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3337 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-04 17:09:07 +00:00
zarzuelo 1dbc8de2ab 2010-10-04 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora.js
	operation/agentes/ver_agente.php
	godmode/massive/massive_operations.php
	godmode/massive/massive_edit_modules.php: Restructured
	the massive module editor to increase the power of the tool
	adding multiple selection methods



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3336 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-04 15:58:05 +00:00
mdtrooper 8a34a54df0 2010-10-4 Miguel de Dios <miguel.dedios@artica.es>
* include/pChart/pChart.class: merge bugfixes from the proyect
	"Babel Enterprise" fixing by Dario Rodriguez <dario.rodriguez@artica.es>.
	
	* include/fgraph.php: fixed undefined var $max_value in function
	"graphic_combined_module".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3334 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-04 11:49:55 +00:00
ramonn d542152c15 2010-10-04 Ramon Novoa <rnovoa@artica.es>
* operation/agentes/estado_generalagente.php: Properly initialize the
	  custom field array.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3333 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-04 11:28:31 +00:00
mdtrooper cbcf7fe357 2010-10-4 Miguel de Dios <miguel.dedios@artica.es>
* include/fgraph.php: fixed typo tiny error in function
	"grafico_modulo_sparse" when use $show_event instead $show_events.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3332 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-10-04 10:50:29 +00:00
zarzuelo c309884ea6 2010-09-30 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_list.builder.php: Fixed an error of 
	table width declaration for bug 3078730



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3331 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-30 14:15:15 +00:00
mdtrooper ab4c1ba0fc 2010-09-30 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php: cleaned source code style.
	
	* mobile/include/system.class.php: fixed when include this file in other
	parts of pandora, as when unlogin try generate pdf file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3330 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-30 12:43:31 +00:00
mdtrooper 1e32858550 2010-09-30 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php: in function "checklogin" fixed the include of
	file "user.class.php". In function "__" fixed when try translate a empty
	string. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3329 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-30 12:12:12 +00:00
mdtrooper 82fa5dbadf 2010-09-29 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php: erased deprecate function "comprueba_login".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3328 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-30 11:29:40 +00:00
raulmateos 02213fb2dc git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3327 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f 2010-09-30 10:51:09 +00:00
raulmateos 7235f4c582 2010-09-30 Raúl Mateos <raulofpandora@gmail.com>
* godmode/profiles/profile_list.php: Delete no more used file

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3325 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-30 10:43:58 +00:00
raulmateos a763f3f306 2010-09-30 Raúu Mateos <raulofpandora@gmail.com>
* godmode/users/*.php: Removed reference to gperfiles sec.
	* godmode/profiles/: Deleted no more used folder.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3324 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-30 10:40:23 +00:00
raulmateos 7f0cbb99ee 2010-09-30 Raul Mateos <raulofpandora@gmail.com>
* operation/menu.php: Changed sound_events.php page size.

	* operation/events/sound_events.php: Added some missing HTML tags.
	Added style.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3323 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-30 09:35:42 +00:00
zarzuelo d76d84247f 2010-09-30 Sergio Martin <sergio.martin@artica.es>
* include/functions_agents.php: Fixed SQL errors in
	alerts view with not administrator users for bug: 3078113



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3321 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-30 07:57:34 +00:00
mdtrooper 434f9d5dc1 2010-09-29 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_groups.php: added first version of file with the
	function "checkUsedGroup".
	
	*include/Image/Canvas.php, include/Image/Canvas/GD.php,
	include/functions.php, mobile/operation/agents/view_agents.php: cleaned
	source code style.

	* godmode/groups/group_list.php: fixed the check if the group to delete is
	empty.
	
	Fixes: #3074223



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3320 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-29 17:16:34 +00:00
zarzuelo 36f22d429c 2010-09-29 Sergio Martin <sergio.martin@artica.es>
* include/functions_db.php
	operation/messages/message.php: Fixed the ACLs 
	to show only the user group users in the destination
	users combo for bug: 3077857



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3318 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-29 16:02:13 +00:00
zarzuelo eb1cde16dd 2010-09-29 Sergio Martin <sergio.martin@artica.es>
* godmode/massive/massive_copy_modules.php: Fixed the
	massive modules copy for bug 3078010



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3317 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-29 15:25:59 +00:00
zarzuelo 1fcac1ef17 2010-09-29 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_list.list.php: Fixed the
	ugly layout of the alerts list in godmode section
	for bug 3077999 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3316 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-29 15:11:51 +00:00
zarzuelo 8f5f998fd4 2010-09-29 Sergio Martin <sergio.martin@artica.es>
* operation/visual_console/render_view.php: Fixed the
	missing full screen tab in the visual console section
	for bug: 3078003



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3315 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-29 14:44:03 +00:00
zarzuelo b38febb6f9 2010-09-29 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/tactical.php: Hide the server
	and global data in the tactical view to not
	administrator users



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3314 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-29 14:42:42 +00:00
zarzuelo afae8a8abe 2010-09-29 Sergio Martin <sergio.martin@artica.es>
*  operation/agentes/tactical.php: Allowed to show
	in process events in tactical view



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3313 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-29 10:41:17 +00:00
zarzuelo d42205f3e3 2010-09-29 Sergio Martin <sergio.martin@artica.es>
* include/functions_events.php: Change to the new status 
	images and names to the events on the tactical view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3312 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-29 10:35:47 +00:00
zarzuelo 5652203421 2010-09-29 Sergio Martin <sergio.martin@artica.es>
* include/javascript/jquery.pandora.controls.js
	godmode/groups/group_list.php
	godmode/massive/massive_operations.php
	godmode/massive/massive_edit_agents.php: Added the massive
	agent editor to the massive operations for pending task
	#3057662



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3311 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-29 10:28:10 +00:00
zarzuelo 2c888f7fb3 2010-09-29 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/fields_manager.php: Fixed the custom fields 
	section notice where is empty



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3310 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-29 09:23:12 +00:00
zarzuelo 18eca4fd62 2010-09-28 Sergio Martin <sergio.martin@artica.es>
* include/functions_html.php: Added style parameter to the 
	print_extended_select_for_time function



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3309 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-28 09:08:30 +00:00
mdtrooper c6a9695ea7 2010-09-27 Miguel de Dios <miguel.dedios@artica.es>
* operation/events/sound_events.php: fixed the ajax check for when start
	with empty list of events. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3306 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-27 12:50:29 +00:00
mdtrooper 054ba8e5d9 2010-09-24 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_menu.php, operation/events/events_list.php: cleaned
	style source code.

	* operation/menu.php: added subentry in "View events" for "Sound Events".
	
	* operation/events/events_rss.php: added source code for the $id_agent equal
	-2 (this mean that get the agent by text name) and added new check for new
	status.
	
	* operation/events/events.php: added source code for the $id_agent equal -2
	(this mean that get the agent by text name).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3305 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-27 11:24:43 +00:00
raulmateos e75e98a9f3 2010-09-27 Raul Mateos <raulofpandora@gmail.com>
* godmode/agentes/modificar_agente.php: Vertical aligned some icons.
	TO DO: The table should be "migrated" to new table code.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3304 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-27 10:31:21 +00:00
zarzuelo 42123bccc3 2010-09-27 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/graph_builder.graph_editor.php
	godmode/reporting/graph_builder.preview.php: Fixed few
	foreach loops to avoid notices setting empty array to 
	false variables



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3303 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-27 10:23:04 +00:00
raulmateos e7601bc9e7 2010-09-27 Raul Mateos <raulofpandora@gmail.com>
* godmode/users/user_list.php, godmode/users/configure_user.php:
	change the sec url variable to show the menu highlighted.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3302 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-27 09:52:22 +00:00
zarzuelo d3f82277fa 2010-09-27 Sergio Martin <sergio.martin@artica.es>
* operation/events/events_list.php: Added confirm popup
	to delete event button



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3301 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-27 08:12:57 +00:00
zarzuelo a05d88d184 2010-09-27 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/graph_builder.php: Fixed typo bug



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3300 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-27 08:04:13 +00:00
zarzuelo 8493f7ed3e 2010-09-27 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/graph_builder.main.php: Set default
	value to id_group to avoid notices



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3299 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-27 07:48:14 +00:00
slerena 0a799ae69d 2010-09-26 Sancho Lerena <slerena@artica.es>
* pandora_console.spec: Updated some missing deps.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3293 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-26 17:19:51 +00:00
slerena fddf232849 2010-09-26 Sancho Lerena <slerena@artica.es>
* pandora_console.spec: Updated some missing deps.

        * operation/agentes/estado_generalagente.php: Fixed
        notice on empty array.

        * pandora_console.redhat.spec: Specific SPEC for redhat.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3292 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-26 16:07:28 +00:00
slerena a17b2586eb 2010-09-24 Sancho Lerena <slerena@artica.es>
* install.php: Updated version and build

        * pandoradb_data.sql: Updated database schema versioN/build



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3289 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-24 11:05:57 +00:00
mdtrooper f8b1e5f949 2010-09-24 Miguel de Dios <miguel.dedios@artica.es>
* operation/events/events.php: fixed the lost $url var, recovered from the
	last version of SVN.
	
	Fixes: #3071767



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3288 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-24 10:41:52 +00:00
raulmateos e84d4d981c 2010-09-23 Raul Mateos <raulofpandora@gmail.com>
* extensions/users_connected.php: Show text to admin if no other
	user connected.
	TO DO: This extension gives non-accurate information due to the use 
	of timestamp in one hour since the login event. It should be
	improved to check logout events in table.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3287 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-23 13:35:59 +00:00
raulmateos 5d13aaaa9e 2010-09-23 Raul Mateos <raulofpandora@gmail.com>
* Changelog: Forgotten file

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3286 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-23 12:41:14 +00:00
raulmateos 29a2b2f37a 2010-09-23 Raul Mateos <raulofpandora@gmail.com>
* godmode/users/user_list.php: Able to edit profiles.
	* godmode/users/configure_profile.php: New page, based on the old
	profile one (that should be deleted if all it's OK)
	* godmode/menu.php: Removed profiles menu entry.
	* godmode/alerts/alert_list.list.php: Centered several icons.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3285 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-09-23 12:34:06 +00:00