Commit Graph

3304 Commits

Author SHA1 Message Date
mdtrooper 78f0f2bef8 2010-11-23 Miguel de Dios <miguel.dedios@artica.es>
* operation/gis_maps/render_view.php: cleaned source code style.
	
	* include/functions_ui.php: fixed in the function
	"print_page_header" the check if the option is a separator that it
	was true when the key was zero.
	
	Fixes: #3115621



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3621 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-23 12:38:08 +00:00
mdtrooper 3af9b69550 2010-11-23 Miguel de Dios <miguel.dedios@artica.es>
* extensions/extension_uploader.php: add first version of extension
	to upload other extensions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3620 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-23 11:40:24 +00:00
Ramon Novoa 0d5c224085 2010-11-22 Ramon Novoa <rnovoa@artica.es>
* pandora_agent_daemon: Solaris specific fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3619 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-22 19:22:21 +00:00
raulmateos db5098e884 2010-11-22 Raul Mateos <raulofpandora@gmail.com>
* LICENCE, Win32/README: Updated version

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3618 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-22 18:49:32 +00:00
raulmateos 0bc6b01479 2010-11-22 Raul Mateos <raulofpandora@gmail.com>
* Commit updated changelog

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3617 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-22 18:46:03 +00:00
raulmateos 3fa0943e47 2010-11-22 Raul Mateos <raulofpandora@gmail.com>
* pandora_server_upgrade, pandora_server_installer, README: Updated version

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3616 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-22 18:44:31 +00:00
raulmateos 431df7c4d8 2010-11-22 Raul Mateos <raulofpandora@gmail.com>
* conf/pandora_server.conf*: Updated version. Commented nmap/xprobe2 related paths in Windows file.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3615 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-22 18:20:21 +00:00
raulmateos 5793939220 2010-11-22 Raul Mateos <raulofpandora@gmail.com>
* gomode/agentes/module_manager.php: Closed HTML tags.
	* images/status_sets/default/agent_no_monitors*.png: Added forgotten files.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3614 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-22 15:12:43 +00:00
Ramon Novoa 1b6dc5fdb4 2010-11-22 Ramon Novoa <rnovoa@artica.es>
* Linux/pandora_agent.conf: Set root as the default pandora_user.

	* pandora_agent: Share the semaphore after creating it. Removed
	  an unnecessary require.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3613 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-22 15:07:40 +00:00
mdtrooper a36342b8fc 2010-11-22 Miguel de Dios <miguel.dedios@artica.es>
* include/help/en/help_operation_visual_console.php,
	include/help/es/help_operation_visual_console.php: added first
	version of help file for the operation main page of Visual Console,
	these have a explain for the especial name for visual consoles.
	
	* operation/visual_console/index.php: added link to help in header.
	
	operation/menu.php: added filter to hide the "Visual Console items"
	in submenu that haven't first letter as "_", "," , "[" , "(". And
	fixed the show name with safe_input entities.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3612 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-22 13:43:54 +00:00
mdtrooper a83ca340f0 2010-11-22 Miguel de Dios <miguel.dedios@artica.es>
* godmode/extensions.php: fixed a lost javascript trace, and fixed
	when all extensions is disabled.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3611 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-22 10:56:41 +00:00
Ramon Novoa e039d58020 2010-11-19 Ramon Novoa <rnovoa@artica.es>
* pandora_agent, AIX/pandora_agent.conf,
	  pandora_agent_daemon, Linux/pandora_agent.conf,
	  HP-UX/pandora_agent.conf, NT4/pandora_agent.conf,
	  SunOS/pandora_agent.conf, FreeBSD/pandora_agent.conf: Added a new
	  configuration option that lets the agent run as a different user
	  by changing the process' EUID.

	* pandora_agent_installer: Several fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3609 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-19 14:18:34 +00:00
zarzuelo 321b6d27b1 2010-11-19 Sergio Martin <sergio.martin@artica.es>
* operation/agentes/estado_generalagente.php: Fixed the
	shows of IP in the agent view for bug 3111807



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3607 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-19 12:45:18 +00:00
mdtrooper 7d4c6e8ba4 2010-11-19 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_extensions.php: added functions
	"get_disabled_extensions" and "getExtensionInfo".

	* operation/extensions.php: erased the delete extension option.

	* images/dot_green.disabled.png, images/dot_red.disabled.png: added files
	for the table of features extension.
	
	* godmode/extensions.php: show a table of extension with features and
	action to disable and delete.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3606 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-19 12:08:18 +00:00
Ramon Novoa 8bc5c711ff 2010-11-19 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Added a missing paremeter to
	  pandora_generate_alert in pandora_module_unknown. Fixes
	  bug #3111191.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3605 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-19 11:50:19 +00:00
Ramon Novoa 5731f640f8 2010-11-19 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Fixed regexp alerts. The patch to detect
	  malformed regular expressions made them malfunction.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3603 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-19 10:48:27 +00:00
Ramon Novoa fb18038db6 2010-11-18 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm,
	  lib/PandoraFMS/DataServer.pm: Update agent address from the XML.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3602 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-18 18:24:21 +00:00
Ramon Novoa 18f22eae88 2010-11-18 Ramon Novoa <rnovoa@artica.es>
* bin/PandoraAgent.exe: Updated to r3583.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3600 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-18 11:18:30 +00:00
Ramon Novoa b3b7e83d00 2010-11-17 Ramon Novoa <rnovoa@artica.es>
* pandora_windows_service.cc: Fixed a typo in copyScpDataFile that made
	  it always return PANDORA_EXCEPTION.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3599 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-17 19:22:04 +00:00
mdtrooper f6ff2f161e 2010-11-17 Miguel de Dios <miguel.dedios@artica.es>
* extensions/vnc_view.php: added first version of extension of to VNC view
	tab.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3598 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-17 16:01:31 +00:00
raulmateos d13a75b878 2010-11-17 Raúl Mateos <raulofpandora@gmail.com>
* operation/reporting/reporting_viewer.php, operation/reporting/graph_viewer.php:
	Added full screen mode and other minor changes.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3597 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-17 15:09:53 +00:00
mdtrooper 4ed0f3330c 2010-11-17 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/map_builder_wizard.php: deleted old file of old visual
	console editor. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3596 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-17 14:53:57 +00:00
raulmateos 34979e528f 2010-11-17 Raúl Mateos <raulofpandora@gmail.com>
* include/functions_events.php: Deleted old code. Simplify.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3595 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-17 11:43:48 +00:00
mdtrooper 3d3baf86e1 2010-11-17 Miguel de Dios <miguel.dedios@artica.es>
* pandora_console.redhat.spec: re-enabled the check dir "data_in" in
	spec file for package redhat-centos.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3594 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-17 11:13:00 +00:00
raulmateos 430ef06106 2010-11-16 Raul Mateos <raulofpandora@gmail.com>
* operation/menu.php, operation/events/sound_events.php: Undo last commit

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3592 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-16 15:56:26 +00:00
Ramon Novoa 6d487db95f 2010-11-16 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Core.pm: Decode HTML entities in macros.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3591 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-16 10:38:59 +00:00
raulmateos 03b79ef9c5 2010-11-16 Raul Mateos <raulofpandora@gmail.com>
* operation/menu.php, operation/events/sound_events.php: Change string.
	Use events in lower case, according with the menu criteria.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3590 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-16 10:38:21 +00:00
raulmateos 8071a45912 2010-11-15 Raúl Mateos <raulofpandora@gmail.com>
* include/functions_events.php: Show text in Agent detail when no events
	found. Commented old code.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3589 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-15 17:07:30 +00:00
Ramon Novoa c8494bfbb6 2010-11-15 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_logevent.cc,
	  modules/pandora_module_logevent.h: Search for event log descriptions
	  in multiple DLLs if necessary. Improved event log error detection.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3588 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-15 16:30:26 +00:00
mdtrooper 554ed453f3 2010-11-15 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/estado_ultimopaquete.php: fixed the single quote instead
	double quote.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3587 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-15 13:40:33 +00:00
mdtrooper 9f07d79c87 2010-11-15 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/tiny_mce/plugins/table/editor_plugin.js,
	include/javascript/tiny_mce/plugins/advlink/editor_plugin.js,
	include/javascript/tiny_mce/plugins/fullscreen/editor_plugin.js,
	include/javascript/tiny_mce/plugins/template/editor_plugin.js,
	include/javascript/tiny_mce/themes/advanced/editor_template.js: fixed end of
	lines that it haven't semicolon end char.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3586 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-15 13:37:47 +00:00
mdtrooper 1b85363a8c 2010-11-15 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_extensions.php: added functions
	"add_extension_godmode_tab_agent" and "add_extension_opemode_tab_agent" to
	add the extensions tab in the header in operation and godmode.
	
	* operation/agentes/ver_agente.php,
	godmode/agentes/configurar_agente.php: added hook for to add the extension
	tabs.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3585 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-15 13:36:01 +00:00
raulmateos 83368c071f 2010-11-15 Raul Mateos <raulofpandora@gmail.com>
* pandora_agent*, pandora_exec, plugins/pandora_update: Small changes:
	Year, version, spaces to tabs.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3584 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-15 10:32:23 +00:00
slerena 730f0d6a30 2010-11-14 Sancho Lerena <slerena@artica.es>
* plugins/pandora_update: Small tool (in perl), used also in windows
        (compiled as .exe), to auto-upgrade the software agents by stopping
        replacing the binary, and starting again the service/process, and also
        notifying the system about the upgrade. This will be possible using
        the new filecollection mechanism in 3.2 version.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3583 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-15 01:39:50 +00:00
slerena 7d189d4849 2010-11-14 Sancho Lerena <slerena@artica.es>
* bin/util/pandora_update.exe: This small binary (see the Unix
        perl version to see the sources), allow to replace the running
        windows binary, by stopping the service and restarting it. Will
        allow automatic upgrades of the agent using the fille collection
        mechanism.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3582 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-15 01:37:56 +00:00
jsatoh 02f30d26c8 2010-11-14 Junichi Satoh <junichi@rworks.jp>
* operation/agentes/status_monitor.php: Fixed unnecessary strings
	(a part of html entities) are shown in module name.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3581 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-14 01:32:21 +00:00
Ramon Novoa cafe7ef8e5 2010-11-12 Ramon Novoa <rnovoa@artica.es>
* windows/pandora_wmi.cc: isServiceRunning returns -1 for module
	  states other than "Running" and "Stopped".

	* modules/pandora_module_logevent.cc,
	  modules/pandora_module_logevent.h: Return a non empty string if
	  the event description can not be read. Save the event id as an
	  unsigned long int to avoid overflows.

	* modules/pandora_module_service.cc,
	  modules/pandora_module_service.h: Aesthetic fix. Removed carriage
	  returns.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3580 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-12 13:41:24 +00:00
mdtrooper 4366580093 2010-11-11 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/jquery.ui.datepicker.js,
	include/javascript/pandora_modules.js,
	include/javascript/tiny_mce/plugins/autoresize/editor_plugin.js,
	include/javascript/tiny_mce/plugins/example/editor_plugin.js,
	include/javascript/tiny_mce/plugins/emotions/editor_plugin.js,
	include/javascript/tiny_mce/plugins/advhr/editor_plugin.js,
	include/javascript/tiny_mce/plugins/advlist/editor_plugin.js,
	include/javascript/tiny_mce/plugins/advimage/editor_plugin.js,
	include/javascript/tiny_mce/plugins/advimage/js/image.js,
	include/javascript/tiny_mce/plugins/directionality/editor_plugin.js,
	include/javascript/tiny_mce/plugins/visualchars/editor_plugin.js,
	include/javascript/tiny_mce/plugins/wordcount/editor_plugin.js,
	include/javascript/tiny_mce/plugins/autosave/editor_plugin.js,
	include/javascript/tiny_mce/plugins/advlink/editor_plugin.js,
	include/javascript/tiny_mce/plugins/fullpage/editor_plugin.js,
	include/javascript/tiny_mce/plugins/contextmenu/editor_plugin.js,
	include/javascript/tiny_mce/plugins/bbcode/editor_plugin.js,
	include/javascript/tiny_mce/plugins/xhtmlxtras/editor_plugin.js,
	include/javascript/OpenLayers/OpenLayers.js,
	include/javascript/jquery.ui.resizable.js: fixed end of lines that it
	haven't semicolon end char.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3577 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-11 13:23:27 +00:00
mdtrooper 06a51ea23e 2010-11-11 Miguel de Dios <miguel.dedios@artica.es>
* extensions/insert_data.php: fixed to force include the "autocomplete"
	library javascript.
	
	Fixes: #3103590



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3576 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-11 13:12:44 +00:00
zarzuelo 3502d79055 2010-11-11 Sergio Martin <sergio.martin@artica.es>
* include/fgraph.php: Fixed session auth for 
	external access



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3573 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-11 11:19:37 +00:00
raulmateos 4032cdbedd 2010-11-11 Raúl Mateos <raulofpandora@gmail.com>
* general/error_install.php, general/error_perms.php, general/header.php,
	general/logon_menu.php, general/logon_ok.php, include/functions_menu.php, 
	include/functions_ui.php, extensions/agents_modules.php, 
	operation/menu.php, godmode/menu.php, operation/estado_agente.php,
	operation/agentes/estado_agente.php, operation/agentes/status_monitor.php,
	operation/agentes/estado_monitores.php,
	operation/agentes/estado_ultimopaquete.php,
	operation/agentes/estado_generalagente.php, pandoradb_data.sql: Closed
	some HTML tags, autoclose others, added alt to images, and changed some 
	& to "&amp;" to help validation for XHTML 1.0 Transitional. Tested and
	not error found, but needs more tests...

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3572 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-11 11:16:09 +00:00
jsatoh 5e32b8d4be 2010-11-11 Junichi Satoh <junichi@rworks.jp>
* godmode/setup/gis_step_2.php: Added UTF-8 charset to htmlentities().



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3571 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-11 01:26:38 +00:00
jsatoh 3fdb7d71ee 2010-11-11 Junichi Satoh <junichi@rworks.jp>
* FreeBSD/tentacle_server: Fixed variable name of PID.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3570 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-11 00:58:56 +00:00
slerena 47cc06933f 2010-11-10 Sancho Lerena <slerena@artica.es>
* pandoradb_data.sql,
        DEBIAN/control,
        DEBIAN/make_deb_package.sh,
        include/config_process.php,
        pandora_console.redhat.spec: Last updates on version and
        spec files for release.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3569 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-10 13:15:59 +00:00
slerena a29b003b78 2010-11-10 Sancho Lerena <slerena@artica.es>
* pandora_server.spec
        lib/PandoraFMS/Config.pm
        pandora_server.redhat.spec:  Last details on specs.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3568 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-10 13:13:08 +00:00
mdtrooper 5ad305bc2d 2010-11-10 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/postinst, DEBIAN/prerm, DEBIAN/make_deb_package.sh: fixed the use
	pandora_exec for Pandora Server and Pandora Agent, now make a
	pandora_exec.agent and try to link to pandora_exec.
	
	Fixes: #3106578



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3567 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-10 13:00:29 +00:00
mdtrooper 75140c735b 2010-11- Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/postinst, DEBIAN/prerm, DEBIAN/make_deb_package.sh: fixed the use
	pandora_exec for Pandora Server and Pandora Agent, now make a
	pandora_exec.server and try to link to pandora_exec.
	
	Fixes: #3106578



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3566 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-10 12:59:07 +00:00
mdtrooper b4d092426d 2010-11-10 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/make_deb_package.sh: fixed the include the bigger NT4 files in the
	DEB package.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3565 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-10 11:36:14 +00:00
zarzuelo 8dfadd90df 2010-11-10 Sergio Martin <sergio.martin@artica.es>
* include/functions.php: Check de enterprise version to
	show the baseline graph option in reports



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3564 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-10 11:33:23 +00:00
zarzuelo d4325770be 2010-11-10 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php
	include/functions.php
	operation/reporting/reporting_xml.php
	godmode/reporting/reporting_builder.item_editor.php: Added the
	simple baseline graph to the html and xml report exports



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3563 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-11-10 11:17:29 +00:00