Commit Graph

5028 Commits

Author SHA1 Message Date
zarzuelo 3255ca3dc9 2014-03-06 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_alerts.js: Added missed code
	in action recovery fields feature



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9517 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-06 10:09:19 +00:00
zarzuelo 07578be476 2014-03-05 Sergio Martin <sergio.martin@artica.es>
* include/help/en/help_ipam.php: Fix typo



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9513 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-05 16:46:54 +00:00
zarzuelo 0d45b5633b 2014-03-05 Sergio Martin <sergio.martin@artica.es>
* images/automatic.png
	images/manual.png
	images/calculator.png: Add missed images for IPAM



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9511 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-05 15:39:15 +00:00
mdtrooper 7d0152e70f 2014-03-05 Miguel de Dios <miguel.dedios@artica.es>
* index.php, operation/search_results.php: fixed the global search
	when the text to search end with whitespace.
	
	Incident: #605




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9510 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-05 15:29:57 +00:00
mdtrooper 3b8dad7c6b 2014-03-05 Miguel de Dios <miguel.dedios@artica.es>
* include/ajax/module.php: fixed the ajax calls for to get json
	data.
	
	Incident: #619




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9508 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-05 12:07:01 +00:00
zarzuelo 1587e571ce 2014-03-05 Sergio Martin <sergio.martin@artica.es>
* pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql: Add recovery fields in actions 
	table and recovery field1 in template table in creation
	scripts of 5.1.
	Ticket #501



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9507 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-05 11:43:03 +00:00
zarzuelo 00e6745ed2 2014-03-05 Sergio Martin <sergio.martin@artica.es>
* include/styles/pandora.css
	include/javascript/pandora_alerts.js
	extras/pandoradb_migrate_4.1_to_5.0.postgreSQL.sql
	extras/pandoradb_migrate_4.1_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.1_to_5.0.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
	extras/check_other_languages.sh
	extras/pandoradb_migrate_5.0.x_to_5.1.postgreSQL.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/pandoradb_migrate_5.0.x_to_5.1.mysql.sql
	extras/pandoradb_migrate_5.0.x_to_5.1.oracle.sql
	extras/network_components.postgreSQL.sql
	extras/network_components.oracle.sql
	extras/network_components.mysql.sql
	godmode/alerts/alert_actions.php
	godmode/alerts/alert_commands.php
	godmode/alerts/alert_view.php
	godmode/alerts/configure_alert_template.php
	godmode/alerts/alert_templates.php
	godmode/alerts/configure_alert_action.php: Clean sql scripts,
	reorganise the alert template creation interface, add field1 
	to template recovery fields and add action recovery fields. 
	Ticket #501




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9505 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-05 11:34:05 +00:00
slerena f2c84e53d5 2014-03-04 Sancho Lerena <slerena@artica.es>
* en/help_ipam.php: Added translation for IPAM help.

        * e?/help_pcap_filter.php: Added small sample.

        * es/help_ipam.php: Some adittions.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9502 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 18:10:38 +00:00
mdtrooper 15b15c091a 2014-03-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the function "get_module_name".
	Thanks Cucumber.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9501 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 16:51:30 +00:00
zarzuelo 9ef8390fea 2014-03-04 Sergio Martin <sergio.martin@artica.es>
* include/help/es/help_ipam.php: Typo fix in ipam text



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9500 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 15:17:46 +00:00
zarzuelo 376805372f 2014-03-04 Sergio Martin <sergio.martin@artica.es>
* include/help/es/help_ipam.php: Added spanish IPAM help

	* include/styles/pandora.css: Little fix on help 
	styles changing size to h3 tag



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9498 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 14:49:56 +00:00
mdtrooper bb7346eb47 2014-03-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the function "api_get_policies".
	Thanks Cucumber.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9495 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 14:39:19 +00:00
mdtrooper 8710d7713c 2014-03-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the function
	"api_get_tactical_view". Thanks Cucumber.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9492 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 10:53:09 +00:00
mdtrooper 57268d0a38 2014-03-04 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the function "api_get_gis_agent".
	Thanks Cucumber.
	
	* include/functions_io.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9491 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-04 09:57:31 +00:00
mdtrooper 77b6fc03df git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9487 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f 2014-03-03 17:08:35 +00:00
mdtrooper 63581a2097 2014-03-03 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed the call "get_total_modules" now
	it does not count the pending delete modules. And thanks Cucumber for
	to the advise.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9486 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-03-03 17:06:31 +00:00
zarzuelo 743ce1742b 2014-02-25 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_events.js
	include/ajax/events.php: Change command timeouts in responses
	from 10 to 9 seconds to avoid problems in certain systems. Add
	little feedback when command reach timeout time



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9468 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-25 12:38:53 +00:00
mdtrooper 795d1b5eef 2014-02-20 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/fields_manager.php: added the id column in the
	list of fields because it is needed in some api calls.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9451 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-20 15:01:23 +00:00
mdtrooper 499a117319 2014-02-19 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager_editor_common.php: added lost id
	of module, because the user needs for example the api calls.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9448 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-19 10:29:45 +00:00
juanmanuelr 79f2d4191c 2014-02-18 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/agentes/ver_agente.php: Fixed agent tooltip
        for metaconsole networkmap. Now check ACL tags are checked.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9446 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-18 11:56:24 +00:00
juanmanuelr 89b294667f 2014-02-17 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/agentes/status_monitor.php: Fixed tag combo,
        now only shows user tags not all.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9445 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-17 16:51:15 +00:00
juanmanuelr f5e48d06f6 2014-02-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_tags.php: Fixed several bugs with
        ACL propagation and ACL tags.

        * include/functions_graph.php: Implemented ACL tags in
        graph_event_module function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9438 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-14 13:20:38 +00:00
zarzuelo 9b0807da45 2014-02-12 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/events.php: Fix order of the event 
	list on mobile console.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9432 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-12 12:07:58 +00:00
zarzuelo 402469f279 2014-02-11 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/events.php: Inverse the order
	of the shown events to show them from newer to older



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-11 16:59:30 +00:00
zarzuelo ec88e1a399 2014-02-11 Sergio Martin <sergio.martin@artica.es>
* mobile/index.php
	mobile/operation/tactical.php
	mobile/operation/home.php: Change the tactical 
	view to load dinamically the graph to be adapted
	to the layout when change device orientation. Fix
	id_user info on title



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9428 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-11 13:03:31 +00:00
zarzuelo 32f32096e0 2014-02-11 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/agent.php
	mobile/operation/events.php
	mobile/operation/home.php
	mobile/operation/modules.php
	mobile/operation/alerts.php
	mobile/include/style/main.css: Improve user feedback
	with warnings when no modules or events found, and
	drawing in the header the id user logged (only in home
	screen)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9427 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-11 10:37:30 +00:00
zarzuelo 59a92980d6 2014-02-10 Sergio Martin <sergio.martin@artica.es>
* mobile/include/style/main.css: Fix ugly close dialog
	button



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9424 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-10 17:08:23 +00:00
zarzuelo aed0179436 2014-02-10 Sergio Martin <sergio.martin@artica.es>
* mobile/include/style/main.css
	mobile/index.php
	mobile/operation/visualmap.php
	mobile/operation/tactical.php
	mobile/operation/module_graph.php
	mobile/operation/modules.php
	mobile/operation/agent.php: More improvements on
	visual styles in mobile console. Layouts, adaption
	of graphs dinamically to the screen using ajax, etc.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9423 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-10 17:03:08 +00:00
zarzuelo 0f0e513135 2014-02-10 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/agents.php
	mobile/operation/events.php
	mobile/include/style/main.css
	mobile/include/ui.class.php: More visual improvements
	on mobile console



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9422 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-10 14:16:04 +00:00
zarzuelo e64a3837ec 2014-02-10 Sergio Martin <sergio.martin@artica.es>
* mobile/include/style/main.css: Fix style of the close
	button of global search control



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9421 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-10 13:05:24 +00:00
zarzuelo e6da51b41d 2014-02-10 Sergio Martin <sergio.martin@artica.es>
* include/functions_groups.php: Fixed total agents
	count for group All

	* include/functions_graph.php
	mobile/operation/module_graph.php
	mobile/operation/modules.php
	mobile/operation/networkmaps.php
	mobile/operation/agent.php
	mobile/operation/agents.php
	mobile/operation/events.php
	mobile/operation/tactical.php
	mobile/operation/visualmaps.php
	mobile/include/ui.class.php
	mobile/include/style/main.css: A lot of fixes
	and improvements in mobile console



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9420 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-10 11:54:39 +00:00
zarzuelo 59b2907a7d 2014-02-07 Sergio Martin <sergio.martin@artica.es>
* include/functions_visual_map.php
	include/functions_modules.php
	include/functions_agents.php
	include/constants.php: Add code to new "status"
	Warning fired in visual maps
		
	* mobile/operation/agent.php: Fix first time charge
	of code that set same size to both boxes in agent view



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9413 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-07 11:29:20 +00:00
zarzuelo f720ca519c 2014-02-07 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/networkmaps.php
	mobile/operation/agent.php
	mobile/include/style/main.css
	mobile/include/ui.class.php
	mobile/include/user.class.php
	mobile/images/pandora_mobile_console.png: Improve
	network map ACLs and more usability/aesthetic issues



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9412 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-07 10:07:54 +00:00
zarzuelo 69f818fbca 2014-02-06 Sergio Martin <sergio.martin@artica.es>
* mobile/index.php
	mobile/operation/visualmap.php
	mobile/operation/visualmaps.php
	mobile/operation/networkmap.php
	mobile/operation/home.php
	mobile/operation/agent.php
	mobile/include/style/main.css
	mobile/include/user.class.php: Added visual
	consoles in mobile console. Improve the apparience with
	new icons (pandora ones), better layout, etc.

	* godmode/reporting/map_builder.php: Fix type
	in gettext function



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9409 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-06 17:39:39 +00:00
jsatoh d33d196843 2014-02-06 Junichi Satoh <junichi@rworks.jp>
* include/languages/ja.po, include/languages/ja.mo: Updated
	untranslated strings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9408 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-06 08:34:33 +00:00
zarzuelo a860085e63 2014-02-05 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/events.php
	mobile/operation/tactical.php
	mobile/operation/networkmap.php
	mobile/operation/modules.php
	mobile/operation/alerts.php
	mobile/operation/networkmaps.php
	mobile/operation/agents.php
	mobile/include/style/main.css: A lot of improvements
	on the mobile console. Simplified views, more big tapping
	areas, etc.

	* include/functions_visual_map.php: Fix alert fired
	module when is in warning status in builder view of
	visual consoles. Incident #559



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9405 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-05 16:38:05 +00:00
zarzuelo cbfb6fdb3b 2014-02-04 Sergio Martin <sergio.martin@artica.es>
* include/functions_groups.php
	mobile/operation/tactical.php
	mobile/operation/groups.php
	mobile/include/style/main.css: Improve mobile
	console. Especially groups view



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9402 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-02-04 16:22:12 +00:00
zarzuelo 6951d59a89 2014-01-31 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/agent.php
	mobile/operation/events.php
	mobile/operation/modules.php
	mobile/operation/alerts.php
	mobile/include/style/main.css
	include/functions.php: Fixed last 10 events on
	agent view and improve usability and styles



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9392 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-31 10:50:55 +00:00
zarzuelo 8898566955 2014-01-30 Sergio Martin <sergio.martin@artica.es>
* operation/gis_maps/ajax.php: Fixed broken agent
	icons when autorefresh on gis maps

	* mobile/operation/groups.php
	mobile/operation/events.php
	mobile/include/style/main.css
	mobile/include/ui.class.php
	mobile/include/user.class.php: More aesthetic and 
	responsible improvements on mobile console

	* include/functions_graph.php
	include/constants.php: Added more colors to the
	graph color collection to support more graphics in 
	a combined graphs



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9388 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-30 10:44:54 +00:00
zarzuelo c080964700 2014-01-28 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/events.php: Improve the method of
	detection if first event list loaded is on the 
	window limits. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-28 15:37:53 +00:00
zarzuelo 59c2545408 2014-01-28 Sergio Martin <sergio.martin@artica.es>
* mobile/operation/events.php: Fix event loading when
	the screen is bigger than the initial list height



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9381 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-28 12:25:49 +00:00
zarzuelo b515a16675 2014-01-28 Sergio Martin <sergio.martin@artica.es>
* include/languages/ca.mo
	include/languages/tr.mo
	include/languages/de.mo
	include/languages/ja.mo
	include/languages/pt_BR.mo
	include/languages/ru.mo
	include/languages/el.mo
	include/languages/nl.mo
	include/languages/es.po
	include/languages/pl.mo
	include/languages/it.mo
	include/languages/pt.mo
	include/languages/index.pot
	include/languages/zh_CN.mo
	include/languages/cs.mo
	include/languages/es.mo
	include/languages/en_GB.mo
	include/languages/sk.mo
	include/languages/en.mo
	include/languages/ar.mo
	include/languages/fr.mo: Update languages for
	v5 SP3



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9380 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-28 10:54:41 +00:00
zarzuelo 148957cf4b 2014-01-27 Sergio Martin <sergio.martin@artica.es
* godmode/agentes/module_manager.php
	godmode/agentes/module_manager_editor_common.php: Help tip added
	near interval info of the data policy modules interval on module
	list and form. This tip war about that this interal only will be
	updated on policy application. Incident #379




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9377 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-27 16:45:33 +00:00
zarzuelo ea7fee31cb 2014-01-27 Sergio Martin <sergio.martin@artica.es>
* include/functions_events.php: Fixed metaconsole event
	colors for incident #526



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9376 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-27 11:45:06 +00:00
zarzuelo bed6263a51 2014-01-27 Sergio Martin <sergio.martin@artica.es>
* include/functions_alerts.php: Fixed the group of the 
	event generated when validate an alert manually



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9375 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-27 11:02:15 +00:00
zarzuelo 8502976d69 2014-01-24 Sergio Martin <sergio.martin@artica.es>
* include/functions_alerts.php: Fix forgotten cases on
	actions escalation



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-24 12:45:09 +00:00
zarzuelo 65f80f18b2 2014-01-24 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_list.list.php
	godmode/alerts/alert_view.php
	include/styles/pandora.css
	include/functions_alerts.php: Fix some bugs when 
	doesnt exist an action with min-infinite situation.
	Some visual fixes



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-24 10:17:23 +00:00
zarzuelo 7c6f69afa5 2014-01-23 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_view.php
	include/styles/pandora.css
	include/functions_alerts.php: Fix escalation errors, added action
	threshold information, encapsulate code to avoid future headaches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9362 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-23 19:49:16 +00:00
mdtrooper 81251324c5 2014-01-23 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php,
	include/styles/pandora.css: fixed the font sizes for the visualmaps
	embedmed into a dash
	
	Incident: #537 from local tacker.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9361 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-23 16:46:10 +00:00
mdtrooper 6172290904 2014-01-23 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php: fixed the links of icons in
	the visualconsole.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9360 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2014-01-23 16:25:54 +00:00