Commit Graph

3505 Commits

Author SHA1 Message Date
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
javilanz 188e4445c4 2010-01-24 Javier Lanz <javier.lanz@artica.es>
* godmode/massive/massive_delete_modules.php: Fixed a small entities
	bug. Added io_safe_output


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5415 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-24 14:55:00 +00:00
juanmanuelr ace4c9c5b9 2012-01-23 Juan Manuel Ramon <juanmanuel.ramon@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: Modified
	 tagente table.
 	
	* operation/agentes/estado_generalagente.php
	 operation/agentes/url_address.php
	 operation/agentes/ver_agente.php
	 godmode/agentes/agent_incidents.php
	 godmode/agentes/configurar_agente.php
	 godmode/agentes/agent_manager.php: Added url_address functionality.

	Pending task: #3472445



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5409 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 18:36:22 +00:00
Ramon Novoa 91797af397 2012-01-23 Ramon Novoa <rnovoa@artica.es>
* include/functions_netflow.php: Aesthetic fixes to netflow report
	  tables.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5408 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 18:20:30 +00:00
Ramon Novoa 4cf1bd1a9f 2012-01-23 Ramon Novoa <rnovoa@artica.es>
* operation/menu.php,
	  operation/netflow/nf_live_view.php,
	  godmode/netflow/nf_edit_form.php,
	  godmode/netflow/nf_item_list.php,
	  godmode/netflow/nf_report_item.php,
	  godmode/netflow/nf_report_form.php,
	  godmode/netflow/nf_edit.php: Multiple improvements to netflow live
	  view and report and filter edition.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5407 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 18:17:52 +00:00
juanmanuelr 0a7ec483ab 2012-01-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_agents.php: Removed Php warning in function 
	agents_get_agents.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5406 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 17:08:45 +00:00
juanmanuelr 8d0120baab 2012-01-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_agents.php
	 operation/incidents/incident.php
	 operation/incidents/incident_detail.php
     operation/agentes/ver_agente.php
	 godmode/agentes/agent_incidents.php
	 godmode/agentes/configurar_agente.php: Added the possibility to add
	 agent to an incident and added new tab in agent view if the agent
	 has incidents associated.
  
	 * pandoradb.postgreSQL.sql
	 pandoradb.oracle.sql
	 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: modified 
	 table tincidencia.
	 
	 Pending task: # 3472447
	 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5405 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 17:01:00 +00:00
vgilc 05c4c5efca 2012-01-23 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/estado_agente.php
	  include/functions_agents.php: Simplify code estado_agente
	and fix bug in search filter.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5404 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 16:28:22 +00:00
Ramon Novoa 3c20f8d77f 2012-01-23 Ramon Novoa <rnovoa@artica.es>
* pandoradb_data.sql, pandoradb.sql,
	  pandoradb.data.postgreSQL.sql,
	  pandoradb.data.oracle.sql,
	  godmode/netflow/nf_manage.php: Added netflow daemon configuration
	  options.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5403 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 15:37:45 +00:00
juanmanuelr 2d8dcf9219 2012-01-23 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Modified get_policy_modules function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5400 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 09:03:57 +00:00
koichirok 50d778c2d1 2012-01-23 Koichiro Kikuchi <koichiro@rworks.jp>
* include/functions_servers.php: Exclude modules which belong to
	  disabled agent from server performance and lag calculation.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5399 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 08:05:35 +00:00
juanmanuelr e38ba81e97 2012-01-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Modified get_all_agents function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5398 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-23 07:52:43 +00:00
Ramon Novoa a137006730 2012-01-20 Ramon Novoa <rnovoa@artica.es>
* include/functions_netflow.php,
	  operation/menu.php,
	  operation/netflow/nf_view.php,
	  godmode/netflow/nf_report_item.php: Netflow live view support and small
	  fixes.

	* operation/netflow/nf_live_view.php: Added to repository: Netflow live view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5397 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-20 13:14:09 +00:00
juanmanuelr 3f91bf48a5 2012-01-20 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Modified in parameters in 
	update_modules functions (network, data, snmp and plugin).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5396 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-20 12:23:17 +00:00
juanmanuelr 7b7c651fe6 2012-01-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php
	 include/functions_agents.php
	 include/functions_alerts.php: New functionality for the Api.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5393 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-19 17:45:59 +00:00
vgilc 652e93fe00 2012-01-18 Vanessa Gil <vanessa.gil@artica.es>
* operation/reporting/reporting_viewer.php: Check that the date range
	entered is correct.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5388 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-18 11:56:14 +00:00
vgilc ce4e70632d 2012-01-18 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_agents.php
	  operation/agentes/estado_monitores.php: Counter modified to ignore
	disabled modules.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5386 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-18 10:09:58 +00:00
jsatoh 9c917acc7e 2012-01-18 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_pcap_filter.php: Added a new help file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5385 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-18 08:36:14 +00:00
juanmanuelr 9a9807fcc0 2012-01-17 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_network_components.php
	 include/functions_api.php: Added new functions to Api.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5384 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 20:20:45 +00:00
Ramon Novoa 112e2b9b30 2012-01-17 Ramon Novoa <rnovoa@artica.es>
* include/functions_netflow.php: Clean \r and \n from advanced
	  filters.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 15:37:50 +00:00
Ramon Novoa dcdd53a9fc 2012-01-17 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php, include/functions_netflow.php,
	  godmode/netflow/nf_edit_form.php, pandoradb.sql,
	  pandoradb.postgreSQL.sql, pandoradb.oracle.sql: Added suport for
	  custom filters. Small fixes.

	* include/help/en/help_pcap_filter.php,
	  include/help/es/help_pcap_filter.php: Added to repository. Nfdump
	  filter syntax help files.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5382 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 14:01:49 +00:00
juanmanuelr 20bda944ba 2012-01-17 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Added new functions add_agent_policy,
	add_data_module_policy, add_network_module_policy, 
	add_snmp_module_policy and add_plugin_module_policy to Api.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5380 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 12:08:53 +00:00
vgilc 1b30175835 2012-01-17 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_agents.php
	  extensions/module_groups.php: Fixed bug: sql error in
	extension "Module Groups" and popup alert.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5376 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-17 10:20:53 +00:00
vgilc 0b748c7eda 2012-01-16 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_item_list.php
	  godmode/netflow/nf_report_item.php: Changed name items.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5373 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-16 14:34:25 +00:00
vgilc 99370fa18a 2012-01-16 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/estado_monitores.php: Fixed bug: count in the group
	mode is not well done because ignore the disabled modules.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5372 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-16 14:24:20 +00:00
vgilc 253218aa76 2012-01-16 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_edit_form.php: Changed add button.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5371 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-16 11:08:28 +00:00
juanmanuelr 41fbbb0018 2012-01-16 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: New functions in Api 
	update_network_module, update_plugin_module, update_data_module and
	update_snmp_module.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5370 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-16 10:30:16 +00:00
Ramon Novoa 9e77c38d5c 2012-01-13 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php,
	  include/functions_netflow.php,
	  operation/netflow/nf_view.php: Aesthetic fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5369 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 14:52:52 +00:00
Ramon Novoa 57d91d50c3 2012-01-13 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php,
	  include/functions_netflow.php,
	  operation/netflow/nf_view.php: Fixed data source ordering for some
	  netflow charts and implemented a basic disk cache.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 13:14:16 +00:00
vgilc ef0cc277aa 2012-01-13 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_item_list.php: Changes sort
	rows in netflow items.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5367 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 13:06:28 +00:00
vgilc 9275406929 2012-01-13 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.oracle.sql
	  pandoradb.postgreSQL.sql
	  pandoradb_migrate_4.0.x_to_4.1.mysql.sql
	  pandoradb_migrate_4.0.x_to_4.1.oracle.sql
	  pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Update
	table tnetflow_report_content.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 12:11:00 +00:00
vgilc bd1a864498 2012-01-13 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_item_list.php
	  godmode/netflow/nf_report.php
	  godmode/netflow/nf_report_item.php
	  operation/netflow/nf_reporting.php
	  pandoradb.sql: Sort items of netflow reports.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-13 11:58:59 +00:00
juanmanuelr a3eb17a514 2012-01-12 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_users.php
	 include/functions_groups.php
	 include/functions_profile.php
	 include/functions_api.php: Added functions and new functions to Api
	 set_update_template, set_delete_template, 
	 set_delete_module_template, set_update_user, set_add_user_profile,
	 set_create_module_template.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5362 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 15:33:52 +00:00
vgilc bea6859e36 2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_edit.php: Added column group
	to report list.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5361 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 15:05:25 +00:00
vgilc 4a50f43217 2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_graph.php
	  include/functions_netflow.php: translate netflow titles.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5360 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 14:20:32 +00:00
vgilc 193f890d24 2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.oracle.sql
	  pandoradb.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: Changes in group
	fields of netflow tables.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5359 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 12:55:17 +00:00
vgilc d31e2032b0 2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_report_item.php
	  include/functions_netflow.php: changes netflow groups.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5358 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 11:32:49 +00:00
Ramon Novoa 3efe042a99 2012-01-12 Ramon Novoa <rnovoa@artica.es>
* include/graphs/functions_fsgraph.php: Fixed empty chart detection for
	  flash charts.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5357 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 10:55:59 +00:00
vgilc 2e7da2fa96 2012-01-12 Vanessa Gil <vanessa.gil@artica.es>
godmode/netflow/nf_edit.php
	  godmode/netflow/nf_report.php
	  godmode/netflow/nf_report_form.php
	  godmode/netflow/nf_report_item.php
	  include/functions_netflow.php
	  operation/netflow/nf_view.php
	  operation/netflow/nf_reporting.php: changes netflow acl.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5356 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 10:52:15 +00:00
jsatoh 4794156850 2012-01-12 Junichi Satoh <junichi@rworks.jp>
* godmode/admin_access_logs.php: Fixed user filtering does not work.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5354 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-12 05:55:23 +00:00
Ramon Novoa a619433df3 2012-01-11 Ramon Novoa <rnovoa@artica.es>
* include/functions_netflow.php,
	  operation/netflow/nf_view.php: Fixed netflow raw data tables.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5351 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-11 19:16:13 +00:00
vgilc 814f01256e 2012-01-11 Vanessa Gil <vanessa.gil@artica.es>
godmode/netflow/nf_edit_form.php
	  godmode/netflow/nf_report.php
	  godmode/netflow/nf_report_form.php
	  godmode/netflow/nf_report_item.php
	  include/functions_netflow.php
	  operation/netflow/nf_view.php: netflow acl.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5350 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-11 18:12:33 +00:00
Ramon Novoa 3b09ed0c7c 2012-01-11 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php,
	  include/functions_netflow.php,
	  operation/netflow/nf_view.php: Fixed netflow stacked charts. Moved
	  code from nf_view to functions in functions_netflow. Several other
	  fixes.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5349 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-11 16:34:53 +00:00
slerena 7e1458295e 2012-01-11 Sancho Lerena <slerena@artica.es>
*  images/status_sets/color_text/*.png: Updated icons missing
        for this iconset.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5346 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-11 15:38:30 +00:00
vgilc bc11908d0a 2012-01-11 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql
	  godmode/netflow/nf_edit_form.php
	  godmode/netflow/nf_edit.php
	  godmode/netflow/nf_report.php
	  godmode/netflow/nf_report_form.php
	  godmode/netflow/nf_report_item.php
	  godmode/netflow/nf_reporting.php
	  operation/netflow/nf_view.php: netflow acls.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5344 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-11 15:02:27 +00:00
juanmanuelr 06d1d9995a 2012-01-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Added new functions 
	set_create_snmp_module and set_create_data_module in the Api.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5343 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-11 13:05:58 +00:00
jsatoh 6e61a9c2dd 2012-01-11 Junichi Satoh <junichi@rworks.jp>
* mobile/operation/agents/view_agents.php: Fixed graph generation
	failure.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5341 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-11 04:47:05 +00:00
juanmanuelr 59d164f35f 2012-01-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Added new functions 
	set_create_plugin_module and set_create_alert_template in the Api.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5340 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-10 17:21:46 +00:00
vgilc ad38df3345 2012-01-10 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.sql
	  pandoradb.oracle.sql
	  pandoradb.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/netflow/nf_edit_form.php
	  operation/netflow/nf_view.php: Changes in output format
	of netflow.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5339 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-10 15:23:56 +00:00
vgilc ed64ae9ae7 2012-01-10 Vanessa Gil <vanessa.gil@artica.es>
* operation/netflow/nf_view.php: Fixed filter
	netflow.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5338 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-10 14:05:17 +00:00
vgilc 3fcfa44464 2012-01-10 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/group_view.php
	  include/functions_group.php: Improve display for 
	group view.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5337 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-10 13:56:40 +00:00
vgilc bf4f81e680 2012-01-10 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/planned_downtime.php: fixed error in
	planned downtime.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5335 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-10 09:36:29 +00:00
jsatoh f40a6d59b7 2012-01-10 Junichi Satoh <junichi@rworks.jp>
* mobile/operation/agents/view_agents.php: Fixed 'img' paths.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5334 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-10 06:10:13 +00:00
jsatoh 6132a59f8a 2012-01-10 Junichi Satoh <junichi@rworks.jp>
* mobile/index.php: Fixed i18n translation does not work with mobile
	console.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5333 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-10 04:46:09 +00:00
vgilc 3808bff1f0 2012-01-09 Vanessa Gil <vanessa.gil@artica.es>
* godmode/agentes/planned_downtime.php: allow cancelling scheduled
	downtime once it has started.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5332 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-09 17:54:31 +00:00
juanmanuelr f3c0bb2372 2012-01-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_api.php: Added new serialized parameter in 
	set_create_network_module function from api. Without it Web console 
	interface module edit view crash.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5330 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-09 17:43:16 +00:00
vgilc 6c789d6a03 2012-01-09 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.oracle.sql
	  pandoradb.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: Added migration 
	script for 4.1 version.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5329 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-09 11:45:00 +00:00
vgilc 52cbe26e63 2012-01-09 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_item_list.php
	  godmode/netflow/nf_report_item.php
	  pandoradb.sql: Fixed editing and deleting netflow filters.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5328 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-09 10:04:31 +00:00
Ramon Novoa 46b0b7cc90 2012-01-05 Ramon Novoa <rnovoa@artica.es>
* include/functions_graph.php,
	  include/functions_netflow.php,
	  operation/netflow/nf_view.php: Fixed several netflow charts and
	  improved performance.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5327 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-05 17:56:27 +00:00
vgilc ffbf220588 2012-01-05 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_graph.php
          include/functions_netflow.php
	  operation/netflow/nf_view.php
	  godmode/netflow/nf_item_list: Graph changes.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5324 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-05 12:08:15 +00:00
juanmanuelr c0f59eb1ee 2012-01-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
	 include/functions_forecast.php
	 include/functions_reporting.php: Fixed graphical representation of
	 intervals in projection graphs.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5319 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-03 17:41:04 +00:00
vgilc de44df1d15 2012-01-03 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_graph.php
	  operation/netflow/nf_view.php: Graph changes.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5316 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-03 15:36:36 +00:00
zarzuelo 9287abce07 2012-01-03 Sergio Martin <sergio.martin@artica.es>
* include/functions_users.php
	include/auth/mysql.php
	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/users/user_list.php: Added to users the 
	disable/enable feature



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5315 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-03 13:07:40 +00:00
juanmanuelr de957d4d52 2012-01-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* pandoradb.data.postgreSQL.sql
	 pandoradb.postgreSQL.sql: Fixed queries in these scripts.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5313 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-03 12:27:53 +00:00
vgilc a9f1c7c7a9 2012-01-02 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.oracle.sql: Added netflow tables.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5312 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-02 14:41:35 +00:00
vgilc 89a27d4ad1 2012-01-02 Vanessa Gil <vanessa.gil@artica.es>
* operation/netflow/nf_view.php
	  include/functions_graph.php
	  include/functions_netflow.php: changed the way to collect netflow
	parameters.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5311 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-01-02 14:36:55 +00:00
vgilc 9f20795bc2 2011-12-30 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_report_item.php
	  godmode/netflow/nf_item_list.php
	  operation/netflow/nf_view: Changed the report date and interval.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5310 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-30 15:16:07 +00:00
vgilc a0ff9838d8 2011-12-30 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_item_list.php: Cascade delete filters.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5309 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-30 10:06:56 +00:00
zarzuelo f3f0db3c02 2011-12-29 Sergio Martin <sergio.martin@artica.es>
* godmode/agentes/module_manager_editor.php: Fixe module editor when the
	data configuration textarea is empty or is a module plugin



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5306 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-29 13:20:38 +00:00
Ramon Novoa 6491cd2057 2011-12-23 Ramon Novoa <rnovoa@artica.es>
* include/functions_servers.php: Added Netflow server information.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5303 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-23 10:04:36 +00:00
vgilc b755a39527 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_manage.php
	  godmode/netflow/nf_edit.php
	  include/functions_netflow.php: changed netflow setup.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5302 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-23 08:37:36 +00:00
slerena 05358082d8 2011-12-22 Sancho Lerena <slerena@artica.es>
* netflow/nf_report_form.php: Fixed problem in report
        creation due unused fields in the SQL table.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5301 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-22 20:07:05 +00:00
slerena 8857902df4 2011-12-22 Sancho Lerena <slerena@artica.es>
* pandoradb_migrate_4.0.x_to_4.1.mysql.sql: Added migration
        script for 4.1 version. Added netflow tables.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5300 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-22 19:26:17 +00:00
zarzuelo 684d204b39 column of the global modules search
2011-12-22  Sergio Martin <sergio.martin@artica.es>

	* include/functions_graph.php: Fixed Date formats in graph
	axis to avoid loss data
	
	* include/functions_custom_graphs.php: Fixed number of hours of
	a week in the graphs combo




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5298 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-22 18:42:50 +00:00
juanmanuelr 7a90d81607 2011-12-22 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/search_alerts.php: Added semicolon at end of a line.
	
	Fixes: #3453610



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5295 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-22 12:57:35 +00:00
zarzuelo 0e85fedb88 2011-12-22 Sergio Martin <sergio.martin@artica.es>
* include/functions_graph.php: Fixed Date formats in graph
	axis to avoid loss data
	
	* include/functions_custom_graphs.php: Fixed number of hours of
	a week in the graphs combo



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5294 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-22 10:08:00 +00:00
vgilc bef7daca71 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* operation/netflow/nf_view.php
	  godmode/netflow/nf_report_item.php
	  godmode/netflow/nf_report.php: Allow repeat filters
	  in reports.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5293 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 17:14:41 +00:00
vgilc 0936a761a2 2011-12-21 Vanessa Gil <vanessa.gil@artica.es>
* godmode/netflow/nf_edit.php
	  godmode/netflow/nf_edit_form.php
	  include/functions_graph.php
	  operation/netflow/nf_view.php: remove some warning. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5292 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2011-12-21 16:07:15 +00:00