Commit Graph

3482 Commits

Author SHA1 Message Date
juanmanuelr 4c1b9e45c5 2012-02-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php: Module event graph resized.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5567 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-13 12:42:43 +00:00
juanmanuelr b607f665b9 2012-02-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/netflow/nf_live_view.php: Added red color in name and
	group in netflow live filter creation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5565 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-13 12:16:08 +00:00
juanmanuelr e87d93fa14 2012-02-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/ajax/visual_console_builder.ajax.php: Removed max, min
	options when a module graph is created in visual console editor.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5564 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-13 11:23:25 +00:00
juanmanuelr 3a66dfb3ab 2012-02-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php	
	 include/javascript/pandora.js
	 operation/agentes/stat_win.php: Added new graph for module events
	 in the module popup graph window.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5563 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-13 10:54:45 +00:00
koichirok e0e14c9db8 2012-02-13 Koichiro Kikuchi <koichiro@rworks.jp>
* include/javascript/pandora_alerts.js: Removed double quotes which encolse
	  substituted field[1-3] from command preview.  pandora_server doesn't add
	  double quotes to enclose these fields.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5562 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-13 10:23:30 +00:00
vgilc 767db5bb28 2012-02-13 Vanessa Gil <vanessa.gil@artica.es>
* operation/events/events_validate: Display options: validate and
	add a comment when the event status is "in process".


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5561 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-13 08:21:42 +00:00
darode 2ff05eb3b3 2012-02-10 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_reporting.php,
        include/functions_groups.php: Fixed a problem in Group View that hide empty parent
        groups when their children has agents.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5558 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-10 14:39:25 +00:00
vgilc b17519d2a0 2012-02-10 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_events.php
	  operation/events/events_list.php
	  operation/events/events_validate: Allowed post a comment 
	without changing the event's state.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5556 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-10 13:57:36 +00:00
mdtrooper 0a9f2ccda4 2012-02-10 Miguel de Dios <miguel.dedios@artica.es>
* * extensions/module_groups.php, include/functions_modules.php,
	godmode/agentes/module_manager_editor_prediction.php: cleaned
	source code style.

	* godmode/agentes/configurar_agente.php: cleaned source code style and fixed
	the duplication of module.
	
	* include/functions_agents.php: fixed the get modules into function
	"agents_get_modules", before the function return ever the policy modules
	without apply filter.
	
	Fixes: #3482260



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5554 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-10 13:23:12 +00:00
darode 503c3d08a6 2012-02-10 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_groups.php: Added links to different sections with
        the suitable filters.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5552 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-10 10:52:45 +00:00
vgilc 57e5a25504 2012-02-10 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql: Removed default value of 'value' field to
	tconfig table.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5550 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-10 10:38:41 +00:00
juanmanuelr 4ad083d019 2012-02-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/snmpconsole/snmp_view.php: Added type in snmp alert view
	and added None option in trap type filter.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5549 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-10 10:36:11 +00:00
vgilc b704562946 2012-02-10 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql
	  pandoradb.postgreSQL.sql
	  pandoradb.oracle.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: Changed type of 'value'
	to tconfig table.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5548 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-10 10:32:05 +00:00
darode 87cad661ee 2012-02-10 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_modules.php: Changed module status image for unknown
        status to gray.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5547 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-10 10:01:14 +00:00
juanmanuelr a33fabf517 2012-02-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/events/events_list.php: Added colors in name and group
	at creation time and now update button is showed when a filter is
	created.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5542 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 19:17:43 +00:00
juanmanuelr c5aa737fa8 2012-02-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/help/en/help_field_match_snmp.php
	 include/help/es/help_field_match_snmp.php
	 godmode/snmpconsole/snmp_alert.php: Changed order of fields in this 
	 view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5541 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 18:12:50 +00:00
zarzuelo 889aa899cc 2012-02-09 Sergio Martin <sergio.martin@artica.es>
* godmode/groups/group_list.php: Cleaned old code used in
	policy filter ajax call




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5539 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 18:04:26 +00:00
juanmanuelr bc343ae966 2012-02-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/events/events_list.php: Changed toggle filter in this
	view.
	* operation/netflow/nf_live_view.php: Changed filters of netflow
	to javascript code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5538 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 17:55:49 +00:00
juanmanuelr a1fc07f09a 2012-02-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* Changelog: I forgot to update Changelog.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5537 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 17:09:29 +00:00
juanmanuelr b1e298cd69 2012-02-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/snmpconsole/snmp_alert.php: OID field moved from conf.
	part of the view to filter part.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5536 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 17:01:07 +00:00
vgilc b8613f181c 2012-02-09 Vanessa Gil <vanessa.gil@artica.es>
* operation/events/events_list.php: show 'source' and 'extra id' fields
	in event view when the value is empty.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5535 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 17:00:34 +00:00
juanmanuelr 1e6f8e514a 2012-02-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/snmpconsole/snmp_alert.php: Added 'None' value to trap 
	type filter.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5534 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 16:24:08 +00:00
mdtrooper 21401d8b3b 2012-02-09 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php: cleaned source code style, and into the
	function "html_print_select" fixed when the data hasn't "optgroup" items.
	
	* include/functions_reports.php: cleaned source code style, and into the
	function "reports_get_report" fixed empty arrays of reports.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5532 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 14:38:57 +00:00
juanmanuelr eb9025635e 2012-02-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/snmpconsole/snmp_alert.php: Changed position of tables
	'Alert filters' and 'Alert configuration' in this view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5531 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 14:15:12 +00:00
Ramon Novoa f438933b72 2012-02-09 Ramon Novoa <rnovoa@artica.es>
* operation/events/events_list.php: Removed short tags.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5530 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 12:50:51 +00:00
Ramon Novoa 42c4b53a8a 2012-02-09 Ramon Novoa <rnovoa@artica.es>
* godmode/events/custom_events.php: Aesthetic fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5529 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 12:39:11 +00:00
juanmanuelr 64ce47ec6d 2012-02-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/events/events_list.php: Now id_group and id_name it's 
	keeped when pagination is used in this view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5528 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 12:33:21 +00:00
juanmanuelr a25c467139 2012-02-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/events/events_list.php: Now toogle filter is not hide
	when pagination is used in thie view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5527 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 12:18:26 +00:00
juanmanuelr 3038a32f5b 2012-02-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/help/en/help_snmp_alert_configuration.php	
	 include/help/es/help_snmp_alert_configuration.php	
	 include/help/en/help_snmp_alert_filters.php
	 include/help/es/help_snmp_alert_filters.php
	 include/help/es/help_field_match_snmp.php	 
	 include/help/en/help_field_match_snmp.php: Added helps for snmp
	 alert editor.

	* include/help/en/help_snmp_alert_custom.php
	 include/help/es/help_snmp_alert_custom.php: Modified helps due to
	 field renamed in thie view.

	* pandoradb.sql
	 pandoradb.postgreSQL.sql
	 pandoradb.oracle.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: Added 
	 id_group_filter in tevent_filter table.

     * operation/events/events_list.php
	 operation/events/events.php
	 godmode/events/event_edit_filter.php
	 godmode/events/event_filter.php: If update button have been pushed 
	 toogle filter is not hide. And added group filter in live filter
	 editor and in filter editor.
       
	* godmode/snmpconsole/snmp_alert.php: Changed position of fields and 
	 added helps.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5526 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 11:20:28 +00:00
vgilc cca543ae9a 2012-02-09 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/module_manager_editor_common.php: Fixed behavior combo
	tag selected.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5525 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 10:53:32 +00:00
vgilc 172fdc72b4 2012-02-09 Vanessa Gil <vanessa.gil@artica.es>
* godmode/events/custom_events.php: Changed combo box update.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5524 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-09 10:15:03 +00:00
vgilc 31bd31e151 2012-02-08 Vanessa Gil <vanessa.gil@artica.es>
* godmode/events/custom_events.php: Added default fields button.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5523 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-08 17:56:32 +00:00
vgilc dfc90a0a8a 2012-02-08 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql
	  pandoradb.postgreSQL.sql
	  pandoradb.oracle.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: Removed 'criticity_alert'
	to tevento table.
 
	 * godmode/events/custom_events.php: Modify fields selection to
	show events.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5522 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-08 17:21:16 +00:00
mdtrooper 9d5acedfc3 2012-02-08 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/alerts_status.php: added a check for user ACL groups in
	the list of alerts.
	
	Fixes: #3484959



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5520 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-08 15:15:20 +00:00
juanmanuelr df57eef2bb 2012-02-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/events/custom_events.php: Changed 'sec' link parameter
	in this view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5518 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-08 13:12:46 +00:00
juanmanuelr 0b2168912d 2012-02-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/skin/skin_default/include/styles/menu.css
	 include/styles/menu.css: Added godmode events icon in menu.

	* include/functions_events.php: Added functions to support custom 
	event filters. 

	* pandoradb.sql
	 pandoradb.postgreSQL.sql
	 pandoradb.oracle.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: Added table 
	 tevent_filter.
      
	* operation/events/events_list.php
	 operation/events/events.php: Added event filters 'live' editor.

	* general/shortcut_bar.php: Fixed some bugs due to ACLs.
	
	* general/header.php: Removed trace.

	* godmode/menu.php: Added event godmode section.
	 
	* godmode/events/event_edit_filter.php
	 godmode/events/custom_events.php
	 godmode/events/events.php
	 godmode/events/event_filter.php: Added files: Entry point in event
	 godmode section, events filter editor and event custom fields view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5517 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-08 13:04:18 +00:00
vgilc e54882a3b1 2012-02-08 Vanessa Gil <vanessa.gil@artica.es>
* godmode/events/custom_events.php
	* operation/events/events_list.php: Added criticity alert to event view.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5516 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-08 11:27:36 +00:00
vgilc 29a784086f 2012-02-08 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql
	  pandoradb.postgreSQL.sql
	  pandoradb.oracle.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: Added 'criticity_alert'
	to tevento table.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5515 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-08 10:25:57 +00:00
vgilc f54bca87ed 2012-02-08 Vanessa Gil <vanessa.gil@artica.es>
* godmode/events/custom_events.php: Remove comments.

	* operation/events/events_list.php: Show criticity only for
	  alerts.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5514 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-08 09:50:36 +00:00
vgilc 0f87007998 2012-02-07 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql
	  pandoradb.postgreSQL.sql
	  pandoradb.oracle.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/agentes/module_manager_editor_common.php
	  godmode/events/custom_events.php
	  operation/events/events_list.php: Modify fields selection to
	show events.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5513 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-07 18:11:12 +00:00
darode e3f359d858 2012-02-07 Dario Rodriguez <dario.rodriguez@artica.es>
* include/graphs/functions_pchart.php: Fixed a problem charting lineal
	and area graph with negative values in static mode.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5505 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-07 16:13:03 +00:00
darode dcc279845f 2012-02-07 Dario Rodriguez <dario.rodriguez@artica.es>
* pandoradb.sql,
	extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql: Fixed an error with 
	weight field of custom graphs



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5502 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-07 09:47:51 +00:00
Ramon Novoa 0aa913727a 2012-02-06 Ramon Novoa <rnovoa@artica.es>
* operation/netflow/nf_live_view.php: Fixed filter load ACL check.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5500 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-06 17:25:00 +00:00
mdtrooper d7b6cbe8db 2012-02-06 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed into function "get_events__with_user"
	when try get list events when empty list of groups for user.
	
	* include/api.php: fixed the auth.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5499 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-06 17:21:11 +00:00
Ramon Novoa 8ec65ef9ab 2012-02-06 Ramon Novoa <rnovoa@artica.es>
* operation/netflow/nf_live_view.php: Added ACL checks for filter
	  creation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5498 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-06 17:16:38 +00:00
mdtrooper ff1b939f53 2012-02-06 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/module_manager.php: only added a comment for to explain
	the reason because the modules from predictionserver is erased for the
	creation policies modules. The reason is because there aren't the table
	tmodule_synth and some code to apply this kind modules in policy too.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5497 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-06 14:05:25 +00:00
vgilc e8f55b31eb 2012-02-06 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql
	  pandoradb.postgreSQL.sql
	  pandoradb.oracle.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: Removed field
	unique_id to tevento table.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5496 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-06 12:25:40 +00:00
vgilc 1eb9c2ba18 2012-02-06 Vanessa Gil <vanessa.gil@artica.es>
* godmode/events/custom_events.php
	  operation/events/events_list.php: Show all groups in
	event view.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5495 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-06 12:18:03 +00:00
vgilc 5284db3a2b 2012-02-06 Vanessa Gil <vanessa.gil@artica.es>
* godmode/events/custom_events.php
	  operation/events/events_list.php: Addes criticity info
	in event view.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5492 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-06 11:51:14 +00:00
vgilc bb0f4455c0 2012-02-06 Vanessa Gil <vanessa.gil@artica.es>
* godmode/events/custom_events.php: Added file.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5491 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-06 11:05:35 +00:00
vgilc 2f450f9add 2012-02-06 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb_data.sql,
	  pandoradb.data.postgreSQL.sql,
	  pandoradb.data.oracle.sql: Added fields to display the event view.

	* godmode/menu.php
	  include/functions_config.php
	  operation/events/events_list.php: Configure the fields to be
	displayed in the event view.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5490 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-06 10:51:05 +00:00
hkosaka dcf57e43e4 2012-02-06 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions_api.php: Merged from 4.0. Add a missing
	description of get_alert_template() in its leading comment.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5488 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-06 05:53:39 +00:00
mdtrooper ac64e51233 2012-02-03 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb.sql, extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql: change the
	size of the field "post_process" in the tables "tagente_modulo" and
	"tnetwork_component".
	
	Fixes: #3483814 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5486 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-03 12:43:22 +00:00
Ramon Novoa 6ca8e2cc11 2012-02-03 Ramon Novoa <rnovoa@artica.es>
* pandoradb_data.sql,
	  pandoradb.data.postgreSQL.sql,
	  pandoradb.data.oracle.sql: Added a default special_days value
	  to alert templates.

	* pandoradb.sql,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql,
	  extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql,
	  godmode/agentes/module_manager_editor_common.php,
	  godmode/agentes/configurar_agente.php,
	  godmode/agentes/module_manager_editor.php: Added suport for ff
	  interval.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5485 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-03 12:33:45 +00:00
darode e66a8983ad 2012-02-03 Dario Rodriguez <dario.rodriguez@artica.es>
* general/main_menu.php: Fixed godmode menu header visualization.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5483 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-03 11:01:12 +00:00
jsatoh 55ca34e9a3 2012-02-03 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_snmp_alert_custom.php: Changed title.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5481 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-03 00:55:12 +00:00
juanmanuelr 56f789e4fa 2012-02-02 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php: Fixed a bug in flash charts due to
	my last commit.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5478 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-02 19:00:56 +00:00
juanmanuelr f99d1f1bd8 2012-02-02 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
	 include/functions_visual_map.php: Improved module graphs on visual
	 console.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5476 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-02 18:39:58 +00:00
slerena 76e426626d 2012-02-02 Sancho Lerena <slerena@artica.es>
* config_process.php: Updated build.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5473 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-02 17:12:08 +00:00
slerena 8a107fdb58 2012-02-02 Sancho Lerena <slerena@artica.es>
* godmode/massive/massive_edit_modules.php: Fixed problem with export
        server target edition. "None" was missing.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5472 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-02 16:54:46 +00:00
juanmanuelr ebb2b0bb22 2012-02-02 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* general/shortcut_bar.php: Fixed bug when the user doesn't have
	'LM' permissions.  



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5470 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-02 14:27:23 +00:00
juanmanuelr b8027d9e7f 2012-02-02 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Added get_alert_template function to 
	Api.

	Feature request: #3478217



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5469 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-02 13:17:23 +00:00
juanmanuelr 26942961a0 2012-02-02 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* Changelog: I forgot to update Changelog.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5468 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-02 12:12:59 +00:00
juanmanuelr 8805ed98d6 2012-02-02 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* Changelog: I forgot to update Changelog.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5467 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-02 12:11:31 +00:00
juanmanuelr f179b20ade 2012-02-02 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/help/en/help_snmp_alert_custom.php
	 include/help/es/help_snmp_alert_custom.php
	 operation/snmpconsole/snmp_view.php
	 godmode/snmpconsole/snmp_alert.php: Added eight new fields for snmp
	 alerts and a filter in trap search. 

	 pandoradb.sql
	 pandoradb.postgreSQL.sql
	 pandoradb.oracle.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: Added 
	 _snmp_f1_ ... _snmp_f6_, trap_type and single_value fields to 
	 talert_snmp table.

	* general/shortcut_bar.php: Fixed shorcut style.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5466 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-02 12:00:30 +00:00
jsatoh 999008a5da 2012-02-02 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_aggregate_by.php: Added a missing help file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5465 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-02 01:02:19 +00:00
vgilc a80240219b 2012-02-01 Vanessa Gil <vanessa.gil@artica.es>
* operation/events/events_validate.php: Allowed post a comment 
	without changing the event's state.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5463 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-01 15:38:17 +00:00
vgilc 99436b8068 2012-02-01 Vanessa Gil <vanessa.gil@artica.es>
* operation/events/events_list.php: Show event id in view events.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5462 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-01 12:49:01 +00:00
juanmanuelr d1b97ef985 2012-02-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* general/shortcut_bar.php: Fixed realtime update of alerts counter.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5461 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-01 12:27:33 +00:00
vgilc 45cc7ae535 2012-02-01 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql
	 pandoradb.postgreSQL.sql
	 pandoradb.oracle.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: Added
	 fields in tevento.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5458 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-01 11:04:41 +00:00
juanmanuelr 5d9b0630bc 2012-02-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/incidents/incident.php: removed trace.
	
	* operation/agentes/alerts_status.php
	 index.php
	 operation/users/user_edit.php
	 general/shortcut_bar.php: Added shortcut bar.

	* pandoradb.sql
	 pandoradb.postgreSQL.sql
	 pandoradb.oracle.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: Added shorcut
	 field in tusuario table.	



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-02-01 10:57:43 +00:00
juanmanuelr 4276ecf461 2012-01-31 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting: Fixed bug when the module has only 
	one value.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5455 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-31 12:52:22 +00:00
vgilc 1aec883b39 2012-01-31 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_reporting: Modified SLA reports when
	downtime planned.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5454 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-31 12:33:39 +00:00
juanmanuelr 9a022c3a20 2012-01-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/skin/skin_default/include/styles/pandora.css: Added grid 
	feature in visual console for default skin.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5451 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-30 17:23:15 +00:00
juanmanuelr bd5906663e 2012-01-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/grid.png 
	 images/grid.disabled.png 
	 include/styles/pandora.css: Added these images for new grid feature
	 in visual console. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5450 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-30 17:19:40 +00:00
juanmanuelr dc557bdd94 2012-01-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/agentes/module_manager_editor_prediction.php: Added module
	postprocess in prediction module.
	
	Fixes: #3480054



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5446 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-30 16:07:32 +00:00
juanmanuelr abb14c3120 2012-01-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/reporting/visual_console_builder.editor.js
	 godmode/reporting/visual_console_builder.editor.php: Added optional 
	 grid in visual console editor.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5445 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-30 12:40:01 +00:00
vgilc 8f0066dc89 2012-01-27 Vanessa Gil <vanessa.gil@artica.es>
* 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: Fixed error adding delete
	cascade	in tplanned_dowtime_agents.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5444 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-27 13:52:49 +00:00
vgilc cfa50dbcdc 2012-01-27 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.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: Added delete cascade
	in tplanned_dowtime_agents.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5443 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-27 13:28:34 +00:00
juanmanuelr 7d4ef21f26 2012-01-27 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/graphs/functions_fsgraph.php: Improved units in flash 
	charts.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5442 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-27 12:50:19 +00:00
juanmanuelr 0e3a3b19b4 2012-01-27 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/google_chrome.png
	 images/advise_navigator_background.png
	 images/mozilla_firefox.png
	 general/login_page.php: Added web browser advise if the user use
	 Internet Explorer.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5441 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-27 12:48:18 +00:00
vgilc 92947f218f 2012-01-27 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql
	  pandoradb.oracle.sql
	  pandoradb.postgreSQL.sql: Added delete cascade in tplanned_dowtime_agents.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5440 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-27 12:30:30 +00:00
Ramon Novoa 0666ec1b16 2012-01-27 Ramon Novoa <rnovoa@artica.es>
* include/help/es/help_alert_special_days.php: Added to repository.
	  Translated the special days help file to Spanish.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5439 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-27 10:36:22 +00:00
jsatoh eafa883281 2012-01-27 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_action_threshold.php: Rewrote the
	  action_threshold help page and added an example.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5438 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-27 04:58:51 +00:00
jsatoh 5c381513d0 2012-01-27 Junichi Satoh <junichi@rworks.jp>
* include/help/en/help_alert_special_days.php,
	include/help/ja/help_alert_special_days.php: Added new help files
	for special days feature.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5437 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-27 04:30:38 +00:00
juanmanuelr 1cd150bf0c 2012-01-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
	 include/graphs/functions_fsgraph.php: Modified background color in
	 flash charts.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5436 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-26 12:51:43 +00:00
juanmanuelr 4d40e0cb8b 2012-01-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
	 operation/agentes/estado_generalagente.php: Added static event 
	 agent graph in main agent view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5435 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-26 11:38:38 +00:00
zarzuelo a06107f235 2012-01-26 Sergio Martin <sergio.martin@artica.es>
* include/functions_api.php: Improved the get all agents
	API function to retrieve more data as address, description, 
	operating system and url address



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5434 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-26 09:58:31 +00:00
juanmanuelr 7df3ab962a 2012-01-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php: Fixed Sla graph when it has 
	a boolean module data.	
	
	Bugfix: #3477786



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5431 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 16:29:40 +00:00
Ramon Novoa 81dc00b0b9 2012-01-25 Ramon Novoa <rnovoa@artica.es>
* include/help/en/help_action_threshold.php,
	  include/help/es/help_action_threshold.php: Rewrote the
	  action_threshold help page and added an example.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5430 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 16:06:44 +00:00
juanmanuelr 317b9503bd 2012-01-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Added csv separator in function 
	get_all_agents.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 15:48:20 +00:00
vgilc 77d73b80fe 2012-01-25 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_agents.php: Bad behavior group filter
	in massive operations and policies management.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5427 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 12:40:11 +00:00
juanmanuelr ea22cf8722 2012-01-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: removed warning from get_all_agents
	function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5426 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 10:33:37 +00:00
vgilc d0be1f2740 2012-01-25 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_agents.php: Fixed bug: Don't show
	good agents modules.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5424 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 09:58:21 +00:00
zarzuelo b09aff7fa4 2012-01-25 Sergio Martin <sergio.martin@artica.es>
* include/functions_network_components.php: Fixed some
	include relative paths to API calls



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5423 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 09:09:55 +00:00
zarzuelo 77904c83bb 2012-01-25 Sergio Martin <sergio.martin@artica.es>
* include/functions_incidents.php
	operation/integria_incidents/incident.incident.php
	operation/integria_incidents/incident.php: Fixed some bugs
	of the Integria IMS integration



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5422 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 09:08:58 +00:00
jsatoh 7238782cda 2012-01-25 Junichi Satoh <junichi@rworks.jp>
* godmode/menu.php, godmode/alerts/alert_special_days.php,
	godmode/alerts/configure_alert_special_days.php,
	godmode/alerts/configure_alert_template.php,
	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,
	pandoradb.oracle.sql, pandoradb.postgreSQL.sql, pandoradb.sql,
	include/functions_alerts.php: Added special days feature. It allows
	to define special days (holidays and special working days) for 
	alert templates.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5421 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-25 06:13:43 +00:00
juanmanuelr 05e87ef279 2012-01-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/incidents/incident.php
	 operation/incidents/incident_detail.php: Modified agent text search
	 due to usability issues.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5420 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-24 18:54:55 +00:00
juanmanuelr 8c3fb8d18f 2012-01-24 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
	 include/graphs/functions_pchart.php: Added units in Y axis and 
	 fixed min, max and avg values. Also fixed colors fo min, max and
	 avg series.
	 
	Pending task: #3153343



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5419 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-24 18:53:18 +00:00
Ramon Novoa e4c2d6b68e 2012-01-24 Ramon Novoa <rnovoa@artica.es>
* include/functions_config.php,
	  include/functions_netflow.php,
	  pandoradb.sql,
	  pandoradb.postgreSQL.sql,
	  pandoradb.oracle.sql,
	  operation/netflow/nf_live_view.php,
	  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/agentes/module_manager_editor_prediction.php,
	  godmode/agentes/configurar_agente.php,
	  godmode/menu.php,
	  godmode/netflow/nf_edit_form.php: Added support for enterprise
	  netflow modules.

	* godmode/netflow/nf_manage.php: Moved to
	  godmode/setup/setup_netflow.php.

	* godmode/netflow/nf_option_form.php: Removed from repository. Not used.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5416 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-24 17:11:12 +00:00