* include/functions_graph.php: cleaned source code style.
* include/functions_reporting.php: added subtype into the title
in "Top N".
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6705 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php, include/functions_reporting.php,
operation/agentes/status_monitor.php: cleaned source code style.
* extensions/update_manager/load_updatemanager.php,
extensions/update_manager/lib/functions.ajax.php,
extensions/update_manager/main.php: now the function "get_key"
returns more info about error to get user key from execution of
keygen, and the calls of this function show more info about the
kind errors.
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6697 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php: cleaned source code style.
* include/functions_custom_graphs.php: fixed into the function
"graphic_combined_module" the show html entities in the name of
agents in legends, show better the legend for long size names of
agents and modules.
Merged from 4.0.2
* extensions/update_manager/debug.php: upload lost file from old
commit.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6688 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: Improved several
parts of SLA reports. Add icons to criticity, etc.
* include/functions_api.php: Fixed bug in get events
api function remaning function
* godmode/reporting/graph_builder.graph_editor.php: Increase
the size of little combo boxes in combined graphs editor
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6679 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/update_manager/load_updatemanager.php,
extensions/update_manager/lib/functions.ajax.php,
extensions/update_manager/lib/libupdate_manager_client.php,
extensions/update_manager/main.php,
extensions/update_manager/debug.php: added the feature to get traces
of execution. Only change the flag for debug in debug.php .
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6677 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/update_manager/load_updatemanager.php: fixed the lost
parameter for keygen, the dbtype.
* extensions/update_manager/lib/libupdate_manager_client.php: fixed
when update enterprise packages maybe sometimes try to update again
and again and again....like spoon killer.
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6667 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/update_manager/sql/update_manager.oracle.sql,
extensions/update_manager/sql/update_manager.sql,
extensions/update_manager/sql/update_manager.postgreSQL.sql: Updated
some default details for update manager.
* pandoradb_data.sql: Some updates on default data load.
* include/help/es/help_main_help.php,
include/help/es/help_gis_setup_map_connection.php,
include/help/es/help_setup_gis_index.php,
include/help/es/help_snmp_alert_field1.php,
include/help/es/help_local_component.php: Missing help files for
spanish added.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6664 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_agents.php
operation/search_modules.php
operation/agentes/status_monitor.php
operation/agentes/estado_ultimopaquete.php
operation/agentes/estado_monitores.php
operation/search_agents.php
operation/search_alerts.php
godmode/agentes/module_manager.php
godmode/agentes/modificar_agente.php
godmode/users/configure_user.php: Cleaned some old
code of policy ACL to fix and prevent important bugs
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6660 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/pandora_logs.php: show the last 500k bytes
instead error message, if the file is too large.
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6644 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/net_tools.php: Use 'whereis' to get command path
to execute, regardless $PATH environment.
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6642 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/groups/modu_group_list.php: Fixed module update when a
module group is deleted.
Merged from branches.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6637 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php
include/functions_reporting.php: Fixed layout issues in
SLA reports and add ttl param to slice graphs
function to pdf side
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6634 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/update_manager/sql/update_manager.sql: 4.0.2 comes with a fixed
last package installed of 412
* extensions/update_manager/load_updatemanager.php: Fixed execution
of keygen: now uses dbtype as last parameter in execution.
* include/functions_config.php: Avoid to check for new update on each
page render (BAD!)
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6631 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php,
extensions/update_manager/lib/functions.php: uploaded lost changes.
* include/functions_filemanager.php: cleaned source code style.
* include/functions.php: added function "copy_dir" for use in the
bug #3527247.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6627 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb_data.sql
pandoradb.data.oracle.sql
pandoradb.data.postgreSQL.sql
extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql
extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql
extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql
godmode/setup/setup_visuals.php: Fixed bug: Inside Visual styles menu
there is an option "Timestamp or time comparation" which has not a selected
value by default.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6624 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/pChart/pPie.class.php: ixed a bug in pie3d graph
function when graph data only has one element.
include/functions_reporting.php
operation/reporting/reporting_viewer.php: Fixed a visualization
problem in agent_modules report item.
godmode/users/profile_list.php: Fixed a bug when profile creation
fails.
Merged from branches.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6621 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_modules.php
godmode/agentes/module_manager.php: Added not init status
in the manage modules view for bug 3533341
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6611 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/net_tools.php: Fixed bug: 'whereis' could find a
command regardless of whether reachable or not with $PATH
(and leads to fail the subsequent command execution).
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6607 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions.php: Changed ambiguous time representation
"MM:SS minutes", that can read 'MM hours SS minute', to
"MM minutes SS seconds".
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6603 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* general/header.php: Add hint to explain the use of
blank characters in global search as AND conditions
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6598 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/db/db_sanity.php: Fixed bug: to sanitise
my database now, don't display any message to confirm
the action.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6593 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_incidents.php: Changed a parameter
of the xml2array function to set it equal to recent
fix in 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6589 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_menu.php: Added categories in the
combo of sections (Operation and Administration)
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6582 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/tree.php: Fixed a bug which shows groups
that only have empty agents.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6580 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_menu.php: Added missed sec2 to the menu
structure data. The main sec2 (not subsection). Clean code
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6578 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/ajax/menu.ajax.php: Added an ajax file to the functions
of menu category
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6576 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_menu.php
index.php
operation/menu.php
godmode/menu.php: Added functions to manage sec and sec2 to control
access in ACLs. Rename variables in menu construction to can get
all the sata structures in other sections
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6574 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_config.php: Fixed bug: Notice to change
Admin password is displayed for other users.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6571 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/auth/ldap.php, include/javascript/pandora.js,
include/functions_incidents.php: cleaned source code style.
* include/functions_users.php, operation/users/webchat.php: a lot of
fixes, the "error connection" don't appear when timeout the
connection for to get new messages, fixed empty messages, and
fixed when make freak actions with user connect in webchat for
example delete. And the most important the chat files (logs and
others) now Pandora save this files in attachment dir instead the
tmp system dir.
* godmode/users/user_list.php: added to call to delete from the
chat user list when delete a user.
MERGED from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6570 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_html.php
godmode/agentes/module_manager_editor_common.php: Modified width
of module type select in module editor when you are
editing/creating a network module.
* include/functions.php
godmode/reporting/visual_console_builder.php: Fixed autorefresh
functionality.
* include/functions_ui.php
godmode/massive/massive_edit_modules.php
operation/agentes/ver_agente.php: Several Php warnings
fixed over console code.
* godmode/reporting/reporting_builder.list_items.php: Fixed broken
view due to a bad sintax statement.
Merged fro branches.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6568 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_config.php: Cleaning the mess when
update setup fields. Now, looking the $sec2, only
will be updated the fields of the current setup section
In this way, set fields as empty value has been
fixed
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6567 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_config.php
operation/users/user_edit.php
godmode/massive/massive_add_action_alerts.php
godmode/reporting/reporting_builder.php
godmode/reporting/graphs.php: Fixed Php warning due to pass by
references variables and improvement in skins update.
Merged from branches.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6564 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_html.php, include/functions_reporting.php,
include/functions_groups.php, include/functions_visual_map.php,
include/ajax/reporting.ajax.php, include/functions_ui.php,
extensions/agents_modules.php, extensions/module_groups.php,
operation/incidents/incident.php,
operation/incidents/incident_detail.php,
operation/agentes/status_monitor.php,
operation/agentes/estado_ultimopaquete.php,
operation/agentes/estado_agente.php,
operation/agentes/ver_agente.php,
operation/snmpconsole/snmp_view.php.
operation/integria_incidents/incident.incident.php,
mobile/operation/agents/monitor_status.php,
mobile/operation/agents/view_agents.php,
mobile/operation/agents/view_alerts.php,
mobile/operation/events/events.php,
godmode/groups/modu_group_list.php, godmode/groups/group_list.php,
godmode/agentes/module_manager.php,
godmode/agentes/modificar_agente.php,
godmode/agentes/configurar_agente.php,
godmode/alerts/alert_list.list.php, godmode/setup/os.list.php,
godmode/users/configure_user.php,
godmode/modules/manage_network_templates.php,
godmode/reporting/reporting_builder.list_items.php,
godmode/tag/tag.php: changed the calls of "ui_print_truncate_text"
now we are trying that more easy and standar, now the string name of
agent have the equal number of characters in all code...but there
are two styles, small and medium size for agents text name, modules
text name, but description is only size. You can set this sizes in
the visual setup page into your Pandora.
MERGED from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6554 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_api.php
include/api.php: Change the names of the functions_api
functions with prefix 'api_' for security. Improve
the wildcards of the ACL's IP list to allow place
wilcard anywhere. Add to API the possibility
of be extended from extensions.
MERGED from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6551 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/api.php: Change the security checks adding
a new parameter to API pass
Merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6549 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_agents.php: deprecated the function with bad and
crazy name "agents_get_module_id" and changed for the function with
more clear mind name "agents_get_agent_id_by_module_id".
* godmode/alerts/configure_alert_compound.php,
godmode/reporting/reporting_builder.list_items.php: changed the
calls of the deprecate function "agents_get_module_id".
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6547 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php: Merged from 4.0 branch. Added history
database support to combined graphs.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6545 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_config.php, include/functions_ui.php,
include/functions.php, include/constants.php,
mobile/operation/agents/monitor_status.php,
godmode/setup/setup_visuals.php: started to working into the set
a standar truncate string in all code of Pandora Console.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6543 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_config.php,
operation/agentes/estado_ultimopaquete.php,
operation/agentes/ver_agente.php: cleaned source code from merge
some cosmetic changes in the trunk and this branch.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6541 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/module_manage_editor_common.php: Disable button
'disabled' when a module is linked to a policy.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6538 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/module_manager_editor.php: Fixed strings of link
and unlink actions due to bad translation.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6532 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/update_manager/main.php: Added message when user
doesn't have an enterprise update installed on web console.
Merged from branches.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6529 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/agentes/estado_agente.php: Improved user feedback when
user delete an agent in this view.
* operation/agentes/tactical.php: Removed empty links in tactical
view.
Merged from branches.
* godmode/setup/performance.php: Added enterprise_include_once to
avoid a PHP error.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6526 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/agentes/estado_ultimopaquete.php: Merged from 4.0.x:
Fixed string truncation problem for multi-byte characters.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6523 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_modules.php
include/functions_agents.php: Fixed problem when modules are
repeated in source and target agents.
* operation/events/events_list.php: Delete double confirmation when
an event is deleted.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6518 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* images/console/icons/light_ok.png, images/console/icons/light.png:
modified the files for to give more coherence.
* images/console/icons/user_warning.png,
images/console/icons/user_bad.png,
images/console/icons/user_ok.png: added lost status item for the
visual map.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6517 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* images/console/background/switch_3com.gif: removed unused
background because it is in gif....and it is so ugly.
* images/console/background/Nortel-3510-24T-800x477.jpg: fixed the
image, now it is a standar jpg.
MERGED FROM 4.0.2
* images/console/background/worldmap2.png,
images/console/background/white_boxed2.jpg,
images/console/background/mapa-asia.png: added lost background files
from the branch 4.0.2.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6515 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extras/pandoradb_migrate_v3.2_to_v4.0.sql: added the lost
semicolons in some standments.
* godmode/reporting/visual_console_builder.php: restore the search
modules without entities, because there was a bug into the recon
server that recode two times the name, now run all parts fine.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6509 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/agentes/estado_agente.php: Improved
performance using new functions.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6505 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_io.php: fixed the function "io_safe_output" for
arrays, now into the function call other function with the name
"io_safe_output_array".
* include/functions_visual_map.php,
include/ajax/visual_console_builder.ajax.php,
godmode/reporting/visual_console_builder.wizard.php,
godmode/reporting/visual_console_builder.php,
godmode/reporting/visual_console_builder.editor.js,
godmode/reporting/visual_console_builder.elements.php,
godmode/reporting/visual_console_builder.editor.php,
godmode/reporting/visual_console_builder.constans.php: fixed a lot
of things about simple value and derivates.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6497 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operatoin/tree.php: Fixed a bug related to html tag id
with strange characters.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6492 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_visual_map.php: cleaned source code style.
* include/ajax/visual_console_builder.ajax.php,
godmode/reporting/visual_console_builder.editor.js: fixed the set
status to items when change somethings that module or method to get
status that agent to module status item.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6479 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_gd.php, include/graphs/fgraph.php:
cleaned source code style.
* include/functions_visual_map.php,
include/ajax/visual_console_builder.ajax.php,
godmode/reporting/visual_console_builder.editor.js,
godmode/reporting/visual_console_builder.editor.php: fixed the
strange behavior of the bars and bubbles in the editor.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6475 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions.php: Added pass of check_referer by url to
solve problems with autorefresh functionality.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6470 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php
operation/reporting/reporting_xml.php: Fixed XML items exportation
and item editor for alert agent and alert event.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6468 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/db/postgresql.php,
include/db/mysql.php,
include/db/oracle.php,
include/config_process.php,
include/functions_db.php,
operation/agentes/datos_agente.php: Merged from 4.0 branch. Fixed and
improved the history database feature.
* include/graphs/fgraph.php: Merged from 4.0 branch. Protect against
accidental output that might corrupt an image.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6460 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_modules.php,
include/functions_groups.php,
include/functions_os.php,
operation/tree.php: Fixed a problem with unknown agent
counting.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_config.php, godmode/setup/setup.php: Fixed that
ACL with API access cannot be removed after once configured. (Merged
from 4.0.2)
Fixed multiple recording of list_ACL_IPs_for_API.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6451 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/reporting/visual_console_builder.wizard.php,
godmode/reporting/visual_console_builder.php: fixed the modules
name with white spaces...again in Pandora console..
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6449 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_modules.php,
operation/tree.php: Improved performance of tree
view for modules, its not very good but now works...
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6446 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_os.php: Created this file.
include/functions_groups,
operation/tree.php: Fixed a bug related to search
improved performance of OS tab for tree view.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6441 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php: Merged from 4.0.x: Fixed bug:
string truncation did not always work for multi-byte
characters.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6437 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f