Commit Graph

3925 Commits

Author SHA1 Message Date
mdtrooper e6479b2fea 2012-06-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php: added lost lines for the text sizes
	into the function "config_process_config".
	
	* include/config_process.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6724 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-28 13:44:15 +00:00
mdtrooper 453c088c05 2012-06-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php: fixed into the function "copy_dir" when
	pass a empty string or bad directory for source.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6722 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-28 12:07:39 +00:00
koichirok 25873bf1f2 2012-06-27 Koichio Kikuchi <koichiro@rworks.jp>
* pandora_console.redhat.spec: Changed php dependencies so that the
	 RPM package can be installed into RHEL/CentOS 5. Also removed unused
	 lines.

	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6720 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-27 07:16:00 +00:00
mdtrooper e291b77d96 2012-06-26 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/control: removed the dependency for "mysql-server" because
	the console can be in a machine without mysql server but it is
	necesary the mysql-client for backup process.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6715 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-26 14:12:17 +00:00
mdtrooper 97dab93bc6 2012-06-26 Miguel de Dios <miguel.dedios@artica.es>
* DEBIAN/control: added mysql-server dependency.
	
	Merged from 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6714 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-26 14:01:56 +00:00
juanmanuelr 358a07c7ed 2012-06-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/events/events.php: Url tag compatible with IE9.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6712 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-26 09:08:27 +00:00
mdtrooper f73aed8d7b 2012-06-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php: cleaned source code style.
	
	* include/functions_reporting.php: added subtype into the title
	in "Top N".
	
	Merged from 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6705 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-25 17:14:33 +00:00
juanmanuelr 00fee81524 2012-06-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_visual_map.php
	 godmode/reporting/visual_console_builder.wizard.php
	 godmode/reporting/visual_console_builder.php: Visual console 
	 wizard 'item per agent' functionality. 

	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6701 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-25 15:30:05 +00:00
mdtrooper 0b3bc4b342 2012-06-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php, include/functions_reporting.php,
	operation/agentes/status_monitor.php: cleaned source code style.
	
	* extensions/update_manager/load_updatemanager.php,
	extensions/update_manager/lib/functions.ajax.php,
	extensions/update_manager/main.php: now the function "get_key"
	returns more info about error to get user key from execution of
	keygen, and the calls of this function show more info about the
	kind errors.
	
	Merged from 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6697 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-25 13:17:05 +00:00
slerena 8f387818ba 2012-06-25 Sancho Lerena <slerena@artica.es>
* operation/menu.php: Changed order of treeview in menu.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6690 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-25 11:03:08 +00:00
mdtrooper 581b05d7ea 2012-06-25 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_graph.php: cleaned source code style.
	
	* include/functions_custom_graphs.php: fixed into the function
	"graphic_combined_module" the show html entities in the name of
	agents in legends, show better the legend for long size names of
	agents and modules.
	
	Merged from 4.0.2
	
	* extensions/update_manager/debug.php: upload lost file from old
	commit.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6688 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-25 10:42:52 +00:00
zarzuelo aaea073293 2012-06-22 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php: Improved several 
	parts of SLA reports. Add icons to criticity, etc.
	
	* include/functions_api.php: Fixed bug in get events
	api function remaning function
	
	* godmode/reporting/graph_builder.graph_editor.php: Increase
	the size of little combo boxes in combined graphs editor

	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6679 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-22 12:19:05 +00:00
mdtrooper f00215657b 2012-06-22 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/load_updatemanager.php,
	extensions/update_manager/lib/functions.ajax.php,
	extensions/update_manager/lib/libupdate_manager_client.php,
	extensions/update_manager/main.php,
	extensions/update_manager/debug.php: added the feature to get traces
	of execution. Only change the flag for debug in debug.php .
	
	Merged from 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6677 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-22 12:07:00 +00:00
vgilc 5e4cecdc65 2012-06-22 Vanessa Gil <vanessa.gil@artica.es>
* operation/users/user_edit.php
	  godmode/users/configure_user.php: Apply password policy
	on users edition.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6674 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-22 11:11:42 +00:00
ramonn e2a32e28c7 2012-06-21 Ramon Novoa <rnovoa@artica.es>
* pandoradb_data.sql,
	  DEBIAN/control,
	  DEBIAN/make_deb_package.sh,
	  include/config_process.php,
	  install.php,
	  pandora_console.spec,
	  pandora_console.redhat.spec: Updated version strings.

	* extensions/update_manager.php: Merged from 4.0 branch. Ignore blank
	  lines in installation SQL file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6670 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 17:38:43 +00:00
mdtrooper f1c738c49e 2012-06-21 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/load_updatemanager.php: fixed the lost
	parameter for keygen, the dbtype.
	
	* extensions/update_manager/lib/libupdate_manager_client.php: fixed
	when update enterprise packages maybe sometimes try to update again
	and again and again....like spoon killer.
	
	Merged from 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6667 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 15:41:09 +00:00
slerena f16cf3cd5a 2012-06-21 Sancho Lerena <slerena@artica.es>
* extensions/update_manager/sql/update_manager.oracle.sql,
        extensions/update_manager/sql/update_manager.sql,
        extensions/update_manager/sql/update_manager.postgreSQL.sql: Updated
        some default details for update manager.

        * pandoradb_data.sql: Some updates on default data load.

        * include/help/es/help_main_help.php,
        include/help/es/help_gis_setup_map_connection.php,
        include/help/es/help_setup_gis_index.php,
        include/help/es/help_snmp_alert_field1.php,
        include/help/es/help_local_component.php: Missing help files for
        spanish added.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6664 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 14:17:38 +00:00
ramonn 93c3d4930e 2012-06-21 Ramon Novoa <rnovoa@artica.es>
* include/functions_servers.php: Merged from 4.0 branch. Added inventory
	  server statistics



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6662 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 14:09:24 +00:00
zarzuelo ace0d45022 2012-06-21 Sergio Martin <sergio.martin@artica.es>
* include/functions_agents.php
	operation/search_modules.php
	operation/agentes/status_monitor.php
	operation/agentes/estado_ultimopaquete.php
	operation/agentes/estado_monitores.php
	operation/search_agents.php
	operation/search_alerts.php
	godmode/agentes/module_manager.php
	godmode/agentes/modificar_agente.php
	godmode/users/configure_user.php: Cleaned some old
	code of policy ACL to fix and prevent important bugs

	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6660 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 13:27:37 +00:00
zarzuelo 82ab548e37 2012-06-21 Sergio Martin <sergio.martin@artica.es>
* operation/users/webchat.php: Changed a string to 
	be translated



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6649 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 11:14:30 +00:00
hkosaka 130ccd476b 2012-06-21 Hirofumi Kosaka <kosaka@rworks.jp>
* extensions/pandora_logs.php: show the last 500k bytes
	instead error message, if the file is too large.
	Merged from 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6644 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 09:43:26 +00:00
hkosaka 4f782d0b7a 2012-06-21 Hirofumi Kosaka <kosaka@rworks.jp>
* extensions/net_tools.php: Use 'whereis' to get command path
	to execute, regardless $PATH environment.
	Merged from 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6642 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-21 09:04:59 +00:00
juanmanuelr 0a2c98835b 2012-06-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora_black.css: Autocomplete text is visible in
	black style.
	
	Fixes: #3524691



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6638 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 17:38:08 +00:00
juanmanuelr a4912f64e5 2012-06-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/groups/modu_group_list.php: Fixed module update when a 
	module group is deleted.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6637 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 17:24:43 +00:00
zarzuelo 9e20e71461 2012-06-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php
	include/functions_reporting.php: Fixed layout issues in
	SLA reports and add ttl param to slice graphs 
	function to pdf side

	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6634 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 17:11:53 +00:00
slerena 09adfea471 2012-06-20 Sancho Lerena <slerena@artiac.es>
* extensions/update_manager/sql/update_manager.sql: 4.0.2 comes with a fixed
        last package installed of 412

        * extensions/update_manager/load_updatemanager.php: Fixed execution
        of keygen: now uses dbtype as last parameter in execution.

        * include/functions_config.php: Avoid to check for new update on each
        page render (BAD!)




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6631 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 16:44:28 +00:00
vgilc e692f99275 2012-06-20 Vanessa Gil <vanessa.gil@artica.es>
* operation/tree.php: Fixed bug: Missing text in tree view title.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6628 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 15:50:15 +00:00
mdtrooper c93f4d3b20 2012-06-20 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_ui.php,
	extensions/update_manager/lib/functions.php: uploaded lost changes.
	
	* include/functions_filemanager.php: cleaned source code style.
	
	* include/functions.php: added function "copy_dir" for use in the
	bug #3527247.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6627 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 15:43:41 +00:00
vgilc 5ea5a4cd89 2012-06-20 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb_data.sql
	  pandoradb.data.oracle.sql
	  pandoradb.data.postgreSQL.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql
	  extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql
	  godmode/setup/setup_visuals.php: Fixed bug: Inside Visual styles menu 
	there is an option "Timestamp or time comparation" which has not a selected
	value by default.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6624 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 14:54:37 +00:00
juanmanuelr dc550e758f 2012-06-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/graphs/pChart/pPie.class.php: ixed a bug in pie3d graph
	function when graph data only has one element.
	
	 include/functions_reporting.php
	 operation/reporting/reporting_viewer.php: Fixed a visualization 
	 problem in agent_modules report item.
	 
	 godmode/users/profile_list.php: Fixed a bug when profile creation
	fails.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6621 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 11:45:12 +00:00
vgilc 5c22b6b962 2012-06-20 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/module_manager.php
	  operation/agentes/estado_agente.php
	  operation/agentes/status_monitor: Changed interval format.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6618 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 10:56:40 +00:00
zarzuelo 811abfecb4 2012-06-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_agents.php
	operation/agentes/estado_agente.php: Fixed sort actions
	of agents operation view

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6616 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 10:17:09 +00:00
mdtrooper e9abfff98e 2012-06-20 Miguel de Dios <miguel.dedios@artica.es>
* extensions/net_tools.php: cleaned source code style.
	
	* extensions/module_groups.php,
	operation/agentes/status_monitor.php: fixed the lost "module group"
	"unasigned".
	
	Fixes: #3532075
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6614 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 09:43:14 +00:00
zarzuelo e197350df4 2012-06-20 Sergio Martin <sergio.martin@artica.es>
* include/functions_modules.php
	godmode/agentes/module_manager.php: Added not init status
	in the manage modules view for bug 3533341

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6611 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 09:03:30 +00:00
mdtrooper 5e2b2f59e1 2012-06-20 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php, include/functions.php: cleaned source
	code style.
	
	* extensions/extension_uploader.php: fixed the upload enterprise
	extension.
	
	Fixes: #3532208
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6609 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 08:28:34 +00:00
hkosaka 16a849bb84 2012-06-20 Hirofumi Kosaka <kosaka@rworks.jp>
* extensions/net_tools.php: Fixed bug: 'whereis' could find a
	command regardless of whether reachable or not with $PATH
	(and leads to fail the subsequent command execution).
	Merged from 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6607 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 07:54:50 +00:00
hkosaka ffbcfcd4a1 2012-06-20 Hirofumi Kosaka <kosaka@rworks.jp>
* extensions/net_tools.php: Fixed bug: cannot find traceroute
	other than /usr/sbin/traceroute.
	Merged from 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6605 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 07:27:56 +00:00
hkosaka df60fb5c34 2012-06-20 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions.php: Changed ambiguous time representation
	"MM:SS minutes", that can read 'MM hours SS minute', to 
	"MM minutes SS seconds".
	Merged from 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6603 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-20 03:34:57 +00:00
zarzuelo 6894e6db3d 2012-06-19 Sergio Martin <sergio.martin@artica.es>
* general/header.php: Add hint to explain the use of
	blank characters in global search as AND conditions
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6598 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 15:45:25 +00:00
vgilc 6d24c7d651 2012-06-19 Vanessa Gil <vanessa.gil@artica.es>
* godmode/db/db_audit.php: Fixed bug:don't display any 
	message to confirm the action.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6595 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 12:15:56 +00:00
vgilc a0cf6445e7 2012-06-19 Vanessa Gil <vanessa.gil@artica.es>
* godmode/db/db_sanity.php: Fixed bug: to sanitise
	my database now, don't display any message to confirm
	the action.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6593 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 11:19:53 +00:00
zarzuelo c4d34bd57d 2012-06-19 Sergio Martin <sergio.martin@artica.es>
* include/functions.php: Fixed check referer bug with 
	https when is not forced. Bug #3525494
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6592 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 11:07:38 +00:00
zarzuelo 65600fa77e 2012-06-19 Sergio Martin <sergio.martin@artica.es>
* include/functions_incidents.php: Changed a parameter
	of the xml2array function to set it equal to recent
	fix in 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6589 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 09:49:49 +00:00
mdtrooper 0177bd11e3 2012-06-19 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.list_items.php: some fixes.

	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6587 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-19 09:25:45 +00:00
zarzuelo 2ebddadd86 2012-06-18 Sergio Martin <sergio.martin@artica.es>
* include/functions_menu.php: Added categories in the
	combo of sections (Operation and Administration)
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6582 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 16:51:32 +00:00
darode 6e49325c75 2012-06-18 Dario Rodriguez <dario.rodriguez@artica.es>
* operation/tree.php: Fixed a bug which shows groups
        that only have empty agents.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6580 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 15:58:41 +00:00
zarzuelo 6d0ea5b8be 2012-06-18 Sergio Martin <sergio.martin@artica.es>
* include/functions_menu.php: Added missed sec2 to the menu 
	structure data. The main sec2 (not subsection). Clean code
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6578 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 15:39:52 +00:00
zarzuelo d4257f9914 2012-06-18 Sergio Martin <sergio.martin@artica.es>
* include/ajax/menu.ajax.php: Added an ajax file to the functions
	of menu category
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6576 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 15:26:22 +00:00
zarzuelo b7aa4f7a3c 2012-06-18 Sergio Martin <sergio.martin@artica.es>
* include/functions_menu.php
	index.php
	operation/menu.php
	godmode/menu.php: Added functions to manage sec and sec2 to control
	access in ACLs. Rename variables in menu construction to can get 
	all the sata structures in other sections
	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6574 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 15:16:17 +00:00
vgilc 5baf5a0b91 2012-06-18 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_config.php: Fixed bug: Notice to change
	Admin password is displayed for other users.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6571 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-06-18 14:08:02 +00:00