Commit Graph

2331 Commits

Author SHA1 Message Date
zarzuelo 6326585436 2010-04-23 Sergio Martin <sergio.martin@artica.es>
* general/ui/agents_list.php: Changed the all group
                condition from 1 to 0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2602 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-23 11:58:30 +00:00
zarzuelo 6cb14fd52b 2010-04-23 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/reporting_builder.php: Changed the
        All group on combos from 1 to 0 and fix the
        group all on tables



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2601 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-23 11:14:57 +00:00
mdtrooper 3ecf8a5e29 2010-04-22 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.php: re-added the list of reports,
	re-added the delete reports. And fixed the notice PHP message and the
	action edit in the main tab.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2600 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-23 10:44:36 +00:00
zarzuelo 476035f4a8 2010-04-23 Sergio Martin <sergio.martin@artica.es>
* pandoradb.sql
       extras/pandoradb_migrate_v3.0_to_v3.1.sql: Dropped the
        foreign key between treport and tgrupo



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2599 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-23 09:54:34 +00:00
zarzuelo adc249189d 2010-04-23 Sergio Martin <sergio.martin@artica.es>
* godmode/servers/manage_recontask_form.php: 
        Added the All group to combo 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2598 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-23 08:55:58 +00:00
zarzuelo bf58051188 2010-04-23 Sergio Martin <sergio.martin@artica.es>
* operation/visual_console/index.php
       godmode/reporting/map_builder.php: Fixed the
        group all on tables



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2597 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-23 08:23:58 +00:00
zarzuelo d8f9396e69 2010-04-23 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_compounds.php
       godmode/alerts/alert_list.php
       godmode/alerts/alert_templates.php
       godmode/alerts/configure_alert_action.php
       godmode/alerts/alert_actions.php: Changed the
        All group on combos from 1 to 0 and fix the
        group all on tables



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2596 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-23 07:59:49 +00:00
mdtrooper 5eb65d93df 2010-04-22 Miguel de Dios <miguel.dedios@artica.es>
* include/ajax/reporting.ajax.php: added ajax respond to delete_sla_item and
	add_sla actions.
	
	* include/functions.php: added in the function "get_report_types" new types
	of items/contents for reporting.

	* pandoradb.sql: added columns custom_logo, header, first_page, footer,
	custom_font into the table treport. And in the table treport_content have
	new columns text, external_source, treport_custom_sql_id, header_definition,
	row_separator, line_separator. Added new table treport_custom_sql.
	
	* extras/pandoradb_migrate_v3.0_to_v3.1.sql: added changes for DB that it
	same to pandoradb.sql. 

	* images/sort_none.png, images/sort_down.png, images/sort_up.png: added the
	images for order list items for reports.

	* godmode/reporting/reporting_builder.list_items.php,
	godmode/reporting/reporting_builder.main.php,
	godmode/reporting/reporting_builder.php,
	godmode/reporting/reporting_builder.item_editor.php: made new forms to
	manage the reporting, now Pandora have tabs and list of items. In the list
	of items, you can order manually or automatically the items.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2595 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-22 19:01:47 +00:00
mdtrooper 2f59592657 2010-04-22 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/pandora.js: added function
	"agent_changed_by_multiple_agents" for query ajax with one or more agent
	select.
	
	* operation/agentes/ver_agente.php: added ajax response to
	"get_agent_modules_json_for_multiple_agents".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2594 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-22 18:50:00 +00:00
mdtrooper 6e35f1689d 2010-04-22 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/tiny_mce/*: re-added (lost files) js library (BSD) for
	the eyecandy widget for textarea. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2593 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-22 18:46:31 +00:00
mdtrooper 8c19211c5f 2010-04-22 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/tiny_mce/*: added js library (BSD) for the eyecandy
	widget for textarea. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2592 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-22 18:34:50 +00:00
zarzuelo 86f3ecfb29 2010-04-22 Sergio Martin <sergio.martin@artica.es>
* operation/users/user_edit.php
       godmode/users/configure_user.php: Changed the
        All group on combos from 1 to 0 and fix the
        group all on tables



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2591 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-22 17:25:28 +00:00
zarzuelo 29e23b1c8f 2010-04-22 Sergio Martin <sergio.martin@artica.es>
* operation/incidents/incident.php: Changed the
        All group on combos from 1 to 0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2590 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-22 17:11:46 +00:00
zarzuelo 5f4f5e6e45 2010-04-22 Sergio Martin <sergio.martin@artica.es>
* godmode/groups/group_list.php: Avoid to show
        the All group on the table



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2589 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-22 16:54:02 +00:00
zarzuelo d9088a6eb4 2010-04-22 Sergio Martin <sergio.martin@artica.es>
* include/functions_ui.php
       include/functions_agents.php
       include/functions_db.php: Change the way of validate
        the All group. Now the group All has id_group = 0
        and is not on the database

       * extensions/module_groups.php: Remove the All 
        group row from the table. Inprove the table style

       * operation/agentes/status_monitor.php
       operation/agentes/alerts_status.php
       operation/agentes/estado_agente.php
       operation/agentes/exportdata.php
       operation/agentes/networkmap.php 
       godmode/agentes/modificar_agente.php
       godmode/agentes/planned_downtime.php: Changed the
        All group on combos from 1 to 0



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2588 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-22 16:51:23 +00:00
zarzuelo c9f2a2d1bb 2010-04-22 Sergio Martin <sergio.martin@artica.es>
* godmode/groups/group_list.php: Added validation
        when remove a group. Now, if the group is not empty
        shows a message and dont allow to remove it



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2587 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-22 16:18:32 +00:00
mdtrooper 672faae011 2010-04-22 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/pandora.js: erased trace line in the source of function
	"agent_changed", and force to select by default the none option.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2586 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-22 11:58:17 +00:00
mdtrooper ed67836aca 2010-04-22 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/pandora.js: changed function "agent_changed" for take
	the translate any or none texts from ajax or global var.
	
	* operation/agentes/ver_agente.php: added to package data the translate
	text for any.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2585 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-22 11:52:31 +00:00
Ramon Novoa b363210cba 2010-04-21 Ramon Novoa <rnovoa@artica.es>
* main.cc: Updated headers after tinyxml removal.

        * modules/pandora_module_list.cc,
          modules/pandora_module_factory.cc: Added support for plugin modules.

        * modules/pandora_module_exec.cc, modules/pandora_module.h,
          modules/pandora_module.cc: Added the module_timeout configuration
          token and replaced tinyxml related code.

        * bin/pandora_agent.conf: Added a sample plugin module. Added the
          group configuration token (was missing).

        * modules/pandora_module_plugin.cc,
          modules/pandora_module_plugin.h: Added to repository. Plugin module.

        * bin/util/df.vbs, bin/util/ps.vbs: Added to repository. Sample
          VBScript plugins.

        * pandora_windows_service.cc, pandora_windows_service.h,
          modules/pandora_module_inventory.cc, ssh/pandora_ssh_test.cc,
          ftp/pandora_ftp_test.cc, modules/pandora_module_inventory.h: Replaced
          tinyxml related code.

        * tinyxml, tinyxml/tinyxmlerror.cpp, tinyxml/tinystr.h,
          tinyxml/tinyxmlparser.cpp, tinyxml/tinyxml.cpp,
          tinyxml/tinyxml.h, tinyxml/tinystr.cpp: Removed from repository. No
          longer used.

        * installer/pandora.mpi, pandora.cc: Updated build to RC1.

        * Makefile.am: Updated sources. Removed tinyxml and added the plugin
          module.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2584 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-21 20:00:31 +00:00
slerena 2696b815e5 2010-04-21 Sancho Lerena <slerena@artica.es>
* include/functions_reporting.php: Added function render_report_html_item()
    to render a given report element in HTML format. Fixed a small problem in
    SUM report type (int truncate invalidate most of SUM reports when not using
    a _inc data type).

    * include/functions.php: Updated all "is_module_xxx" from using ereg 
    (deprecated) to use preg_match.

    * include/functions_db.php: Moved reporting functions 
    get_agentmodule_data_average(); get_agentmodule_data_max(), 
    get_agentmodule_data_min() and  get_agentmodule_data_sum() from here
    to functions_reporting.php.

    * godmode/groups/group_list.php: Removing a group put all agents assigned
    to that group in other available group (choosen in realtime).

    * AUTHORS: Authors file update, was very outdated!.

    * operation/agentes/estado_generalagente.php: Fixed bug #2990430.

    * operation/reporting/reporting_viewer.php: Some changes for better 
    structuration of the HTML reporting viewer. Removed big chunk of code
    and put in function_reporting/render_report_html_item() function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2583 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-21 17:52:08 +00:00
mdtrooper dc02182601 2010-04-21 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/pandora.js: small improve, added new parameter into
	the function "agent_module_autocomplete", the parameter is "noneValue" for
	add a option for none module in the select of modules



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2582 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-21 16:13:42 +00:00
jsatoh eb5096e25c 2010-04-20 Junichi Satoh <junichi@rworks.jp>
* extras/check_other_languages.sh: Added missing '/'.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2581 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-20 02:20:10 +00:00
zarzuelo 9f99070a10 2010-04-19 Sergio Martin <sergio.martin@artica.es>
* godmode/users/user_list.php: Fixed the delete the actual 
        user feature hidding the red cross in this user and with
        internal control



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2580 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-19 14:24:04 +00:00
zarzuelo f379d923b8 2010-04-19 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_list.list.php: Fixed a var definition 
        error



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2579 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-19 13:52:46 +00:00
zarzuelo a1168151d7 2010-04-19 Sergio Martin <sergio.martin@artica.es>
* include/functions_html.php: Added the parameter style 
        to print_select_from_sql() function




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2578 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-19 13:35:31 +00:00
mdtrooper 5df55a5ace 2010-04-19 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php: rollback to the fixed (r2563) in the function
	"get_db_value_filter".



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2577 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-19 12:41:45 +00:00
Pablo de la Concepción Sanz 643020236a 2010-04-19 Pablo de la Concepción <pablo.concepcion@artica.es>
* godmode/agentes/module_manager_editor_prediction.php: Make the services
	part (Enterprise) work nicely.

	* godmode/agentes/configurar_agente.php: Added enterprise hook for the 
	services parameters.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2576 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-19 09:43:32 +00:00
Pablo de la Concepción Sanz 7a2439334a 2010-04-19 Pablo de la Concepción <pablo.concepcion@artica.es>
* include/javascript/pandora.js: Added function agent_module_autocomplete
    to use with a text box, a hidden field and a selector to select an agent
    and a module from the agent.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2575 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-19 07:47:55 +00:00
jsatoh a28c2a8843 2010-04-19 Junichi Satoh <junichi@rworks.jp>
* godmode/agentes/module_manager.php, 
	godmode/modules/manage_network_components.php, 
	godmode/modules/manage_network_templates_form.php: Changed the substr()
	to mb_strimwidth(). Strings should be truncated with displayed length,
	not number of characters.

	* godmode/include/functions.php: Added wrapper mb_strimwidth().



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2574 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-19 02:41:20 +00:00
zarzuelo 00d08bcdd6 2010-04-16 Sergio Martin <sergio.martin@artica.es>
* operation/users/user.php: Modified the users that
        are showed in the View users section. Now, the users
        of the logged user group are listed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2573 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-16 14:44:06 +00:00
Ramon Novoa f5a64d8e9d 2010-04-16 Ramon Novoa <rnovoa@artica.es>
* windows/pandora_wmi.cc: fixed getOSVersion. Crashed in Windows 2008
          and Windows 7.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2572 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-16 13:12:23 +00:00
Pablo de la Concepción Sanz b8566d8123 2010-04-16 Pablo de la Concepción <pablo.concepcion@artica.es>
* include/ajax/agent.php: Modified to return the agent name at the i
    begining of the serialized result.

    * godmode/agentes/configurar_agente.php: Added help links and TODO tag
    to remember to change the tabs to use the print_page_header function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2571 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-16 10:07:10 +00:00
zarzuelo b43544c3e6 2010-04-15 Sergio Martin <sergio.martin@artica.es>
* godmode/users/configure_user.php: fixed bug 2987162.
          Validation of create a user with User ID null



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2570 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-15 17:20:15 +00:00
mdtrooper 0acbd45197 2010-04-15 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_html.php: added check new attribute "styleTable" to
	object table, this is for pass the style table.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2568 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-15 16:50:09 +00:00
Ramon Novoa 2143b28a57 2010-04-14 Ramon Novoa <rnovoa@artica.es>
* pandoradb_data.sql: Changed the id of the log4x module type. There
          were conflicts with Enterprise module types.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2567 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-14 17:40:43 +00:00
Ramon Novoa 17201a849d 2010-04-14 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/PredictionServer.pm: Added support for service
          modules (Enterprise)




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2566 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-14 17:39:23 +00:00
mdtrooper b38ab821f2 2010-04-14 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php: fixed bug in the function
	"format_array_to_update_sql" when the field yet escaped.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2565 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-14 16:11:49 +00:00
zarzuelo a4c6b43b29 2010-04-14 Sergio Martin <sergio.martin@artica.es>
* godmode/users/user_list.php: fixed bug 2987177. Wrong index
          was associated with the delete icon in the users list.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2564 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-14 15:51:48 +00:00
mdtrooper f36696ebab 2010-04-14 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php: fixed bug in the function "get_db_value_filter"
	when the field's name is a reserve word of mysql crash.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2563 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-14 15:14:30 +00:00
zarzuelo 46303bbe57 2010-04-14 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_modules.js: Typo fix for bug
          2953348



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2562 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-14 12:06:27 +00:00
zarzuelo 30d47b840d 2010-04-14 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_list.php: Controled the sucessful of the 
          create an alarm to audit it for bug 2987006



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2561 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-14 09:21:33 +00:00
zarzuelo bb78d14502 2010-04-14 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_list.php,
        godmode/alerts/alert_list.list.php: Changed a button between the
files 
          to clean source code    



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2560 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-14 08:54:24 +00:00
zarzuelo 4e8d2677e1 2010-04-14 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/map_builder.php: Added Delete visual console
          for Bug 2986523



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2559 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-14 07:59:52 +00:00
zarzuelo 77b7754b99 2010-04-14 Sergio Martin <sergio.martin@artica.es>
* ChangeLog: Updated the Changlog with the last forget commit



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2558 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-14 07:44:45 +00:00
zarzuelo cae24f74a7 2010-04-13 Sergio Martin <sergio.martin@artica.es>
* godmode/reporting/map_builder.php: Added Copy visual console
          (map clonation) for Pending task 2726277



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2557 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-13 17:45:51 +00:00
zarzuelo ae9bffdaa7 2010-04-12 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_list.php: Added Create button for
        Feature Request 2985798



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2556 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-12 10:30:58 +00:00
jsatoh 9fc72dcf2a 2010-04-12 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_configure_gis_map.php,
	include/help/ja/help_gis_map_builder.php,
	include/help/ja/help_gis_setup_map_connection.php,
	include/help/ja/help_setup_gis_index.php: Added the GIS help files
	in Japanese.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2555 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-12 02:32:50 +00:00
zarzuelo e90e69b517 2010-04-09 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/configure_alert_template.php: Typo fix for bug 
        2981933



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2554 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-09 17:04:39 +00:00
jsatoh b53159fd5e 2010-04-09 Junichi Satoh <junichi@rworks.jp>
* include/functions_extensions.php: Changed the function to use,
	from substr() to mb_substr(). substr() can't handle multibyte strings
	correctly.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2553 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-09 07:32:42 +00:00
slerena 4c4bbff422 2010-04-08 Sancho Lerena <slerena@artica.es>
* include/config_process.php: Update build version.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2552 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2010-04-08 11:48:53 +00:00