* extensions/agents_modules.php: Changed background color of the
* text
in the table header.
Fixes: 3373927
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4660 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/massive: fixed a bug regarding warnings,
SQL errors and undefined variables in massive alert ops.
* godmode/snmpconsole/snmp_alert.php
godmode/users/profile_list.php: fixed a bug regarding creation
of snmp alerts and profiles with no info at all.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4659 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/alerts: fixed a bug regarding creation
and updates of alert templates, actions and commands
with blank or already used name fields.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4658 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/agentes/alert_status.php
include/functions_ui.php: fixed a bug regarding
dissappeared alert status bar and validation perms.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4657 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/events/events_list.php: Change the events free search tag
by a combo with all the possible tags for 3380040
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4656 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/servers/view_server_detail.php: Changed the progress graph
mode to show the percent text and not only graph. For bug 3379759
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4655 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/groups/group_list.php: Fixed a bug that allow
to delete all agent groups and makes pandora unstable.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4654 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/modules/manage_network_templates_form.php: Fixed
a bug with allows to create a module template without a
name.
Fixes: 3371381
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4653 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/integria_incidents/incident.incident.php: fixed a bug
regarding an empty foreach and an undefined variable call.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4651 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/integria_incidents/incident.list.php: fixed a bug
regarding an empty foreach and an undefined variable call.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4647 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/servers/view_server.php: added an icon
legend for server kinds in the server list view.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4644 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_networkmap.php: Added new mode to
get networkmap function to allow get the map of another user
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4643 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/config_process.php
include/functions.php
operation/agentes/stat_win.php
general/pandora_help.php: Create new functions to manage pandora
languages.
Fix pandora_help languages to use the user language, no always the
global language.
Fix som SESSION index little bugs
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4641 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php: Fixed shortcut icon link to avoid
favicon.ico miss error in the apache log
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4635 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/configurar_agente.php: fixed
a bug regarding unability to add new modules to
agents using components.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4633 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/module_groups.php
general/logon_ok.php: Change overflow-x:scroll by
overflow-x:auto to avoid the ugly scroll when no
necessary
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4632 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/setup/news.php: fixed a bug regarding
unability to add new objects to visual maps
using the wizard.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4631 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_html.php
godmode/reporting/reporting_builder.php
godmode/reporting/reporting_builder.item_editor.php: Fixed several
warnings of undeclared variables and use of not supported parameter
of function strstr in php 3.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4630 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/setup/news.php: fixed a bug regarding
bad timestamps and unability to create site news.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4629 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extras/pandoradb_migrate_v3.2_to_v4.0.sql: Changed null languages
by "default" in tusuario to new languages system
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4626 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb_data.sql
pandoradb.data.postgreSQL.sql
pandoradb.data.oracle.sql: Set as default
the language of the admin when install
* include/config_process.php
include/functions.php
index.php
operation/users/user_edit.php
general/pandora_help.php
godmode/users/configure_user.php: Added default
option in the language combo when edit a user. If
this option is choose, this user will has the
general setup language
Fixed too the problem of the help screens language
Bug: 3375174
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4623 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/events/events_marquee.php: Fixed a sql error
of the events marquee when no groups in the system
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4620 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/agentes/networkmap.php: fixed bug 3374043
regarding having different network maps with the same name.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4618 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/users/profile_list.php
godmode/users/configure_profile.php: Fixed url sec into
profile management and target screen when create, update
or delete a profile for bug 3372293
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4617 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/incidents/incident.list.php: fixed table
displayed instead of a message for bug 3372155
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4616 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_users.php
extensions/module_groups.php
godmode/groups/modu_group_list.php
godmode/groups/group_list.php
godmode/alerts/alert_commands.php
godmode/setup/os.list.php
godmode/setup/news.php
godmode/users/profile_list.php
godmode/modules/manage_network_components.php
godmode/modules/manage_nc_groups.php: Fixed several lonely
headers when no data and other no data little bugs for 3371455
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4614 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_config.php: Set dbtype to mysql by default
(necessary for 3.2.1 to 4.0 upgrades).
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4613 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/agentes/status_monitor.php: Fixed an empty group check
and a subquery_enterprise not exist variables for bug 3371206
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4611 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php: Set default values to width and height
parameters in purge graph.
* godmode/setup/os.list.php
godmode/users/profile_list.php: Fixed typica bugs of foreach with
no array variable
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4609 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_menu.php: Fixed side menu confitions
to draw in bold style the selected subsections to allow
secondary parameters like "&tab=agents" in the subsections
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4605 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/massive/massive_edit_agents.php: Fixed agent icon
missed in the massive operations merged from my own fix in
the agent edition of july 19th
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4603 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandora_console/godmode: Fixed a bug regarding
a bad placement of the page footer in some sections.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4602 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/groups/modu_group_list.php: Fixed a bug
regarding adition of module groups with a identical names.
* godmode/agentes/planned_downtime.php: Fixed a bug
regarding adition of planned downtimes with identical
or blank "name" fields.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4596 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions.php: Fixed enterprise_not_hook constant
fail and log notice. Now the home page bar graphs are showed
without data. Bug: 3371403
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4595 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
*images/minimenu_open_arrow.png, images/minimenu_close_arrow.png: added
images for to use in networmap enterprise.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4594 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/groups/modu_group_list.php: Fixed a bug
regarding adition of module groups with a blank "name" field.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4593 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_networkmap.php
include/functions_visual_map.php
include/functions_agents.php: Fixed more errors when
no agents for bug 3371316
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4587 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/massive/massive_operations.php
godmode/massive/massive_delete_profiles.php
godmode/massive/massive_add_profiles.php: Restringed profiles massive
operations only to admins for bug: 3294464
Merged from 3.2.1
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4581 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/javascript/pandora.js
operation/agentes/ver_agente.php: Add hack to send to the ajax
a custom condition of modules in the agent_changed_by_multiple_agents
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4577 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_agents.php: Fixed bad type returned by the function 'agents_get_modules_data_count'.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4567 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/alerts/alert_list.list.php
include/functions_ui.php: Changed length on module name and template
column in function ui_format_alert_row().
Fixes: #3302292
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4561 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/module_manager_editor_prediction.php
godmode/agentes/configurar_agente.php: Changed the fields
system on prediction modules to use 'prediction_module' as
flag 1 to modules, 2 to services and 3 to synthetic, and
the custom_integer_1 to module or service id (unused in synth)
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4560 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extras/pandoradb_migrate_v3.2_to_v4.0.sql
godmode/agentes/module_manager_editor_prediction.php: Fix a check
bug and added to migration database schemma a fix for the prediction
modules
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4558 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_html.php: Fixed function print_select_groups()
to retrieve subgroups with parent distinct than "group All".
Fixes: #3365845
* godmode/agentes/modificar_agente.php: Fixed call to
print_select_groups() to check user ACLs.
* ChangeLog: fixed date of my last commit.
* general/logoff.php: Changed logout splash screen.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4557 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php: Truncate agent name when is large in
graphs legends and add missed ttl variable.
* include/styles/pandora.css: Changed style in submit buttons.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4554 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_events.php
include/functions.php
operation/agentes/estado_monitores.php
operation/agentes/networkmap.php
godmode/modules/manage_nc_groups.php: Fixes in this views in order
to have compatibility with IE.
Bug: #3274423
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4547 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_visual_map.php
include/ajax/visual_console_builder.ajax.php
godmode/users/configure_user.php
godmode/reporting/visual_console_builder.editor.js
godmode/reporting/visual_console_builder.editor.php
godmode/reporting/visual_console_builder.constans.php: Added min,
max and avg process to simple value items in visual maps.
Pending tasks: #3014709
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4541 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/agentes/estado_agente.php,
godmode/agentes/modificar_agente.php: Improved group selection, it
allows group recursion.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4540 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* images/minimap_open_arrow.png, images/minimap_close_arrow.png: added the
image files for the network enterprise viewer.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4539 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.sql
pandoradb.postgreSQL.sql
pandoradb.oracle.sql
extras/pandoradb_migrate_v3.2_to_v4.0.sql: Added 'always' to the
possible values into talert_templates.type
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4534 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_agents.php: Fixed agents_get_group_agents()
does not work correctly with $childGroups enabled.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4529 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_visual_map.php: Added links to service items
in visual console.
Pending tasks: #3175079
* general/pandora_help.php: Changed color of the footer.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4526 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.sql
pandoradb.postgreSQL.sql
pandoradb.oracle.sql
extras/pandoradb_migrate_v3.2_to_v4.0.sql: Added to the database
schemma the disabled attribute to recon task table
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4520 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb_data.sql
pandoradb.data.postgreSQL.sql
pandoradb.data.oracle.sql: Default skin applied to all groups
by default.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4517 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_networkmap.php
pandoradb.sql
pandoradb.postgreSQL.sql
pandoradb.oracle.sql
operation/agentes/networkmap.topology.php
operation/agentes/ver_agente.php
operation/agentes/networkmap.php
extras/pandoradb_migrate_v3.2_to_v4.0.sql: Add to the topology
network maps a switch to show the snmp_inc modules with their
ip addresses if they have for task 3296127
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4509 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_config.php: Added a new function to do
global system wide checks with a notification icon in the header.
* general/header.php: Implemented changes on global checks.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4488 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php: Added a new function to show max/min
values for module.
* operation/agentes/estado_monitores.php,
operation/agentes/status_monitor.php: Improved to show max/min
values for module.
* godmode/agentes/module_manager.php: Modified to use the function,
ui_print_module_warn_value() to show max/min values for module.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4485 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php: Improved function ui_print_string_substr to
render a span with a predefined font size.
* godmode/setup/os.list.php,
godmode/groups/modu_group_list.php,
godmode/groups/group_list.php,
godmode/alerts/alert_commands.php: Show element's ID in tables, useful
to use later in CLI, CVS importer or other tool.
* godmode/agentes/module_manager.php
godmode/agentes/module_manager_editor_common.php: Show warning/critical
thresholds instead max/min values for module, much more useful. Aesthetic
changes on editor and description visualization.
* godmode/agentes/agent_manager.php: Added a direct link to delete current
agent from main agent edit section.
* operation/agentes/status_monitor.php,
operation/agentes/estado_monitores.php: usability fixes on desc. size
and table width.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4480 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_filemanager.php: Sended from file manager
form relative path and hash to keep the path position in
file collections
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4475 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* net_tools
net_tools/nettool.png: Nettools extension. Allow from interface
several operations like ping the host, do a traceroute, get
whois /dig information, get SNMP device information and interface
status
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4472 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_events.php: Fixed duplication of comments
when validate events merged from 3.2.1
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4465 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/styles/install.css,
include/styles/pandora.css,
install.php: Yeeeha!, new look & feel for 4.0 version ! :-)
* index.php: Minimal changes in session close (after the header
render).
* images/greyback.gif: New background for 4.0 (included the
installer)
* COPYING: removed bad carriage returns.
* general/login_page.php: Small modifications to have a better
style.
* operation/system_alert.php,
include/javascript/jquery.pandora.js,
general/header.php: Implemented a "alert" icon who shows the general
problems, instead naggin the user in each page. Incorporated the new
feature to warn user when he doesn't change the default password :-)
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4463 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
Merge from the branch.
* godmode/alerts/alert_actions.php: fixed the url to copy the alert action.
The file didn't upload to repository.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4461 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php: Changed the way to include css files
when skin functionality is enabled.
* general/pandora_help.php: Some modifications in css link help
file.
* godmode/alerts/alert_list.php: Changed enterprise_include()
function to enterprise_include().
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4459 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
Merge from the branch.
* godmode/alerts/alert_actions.php: fixed the url to copy the alert action.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/events/events_list.php: Merged from trunk. Do not show
repeated comments when grouping events. Raise the maximum permitted
result length for GROUP_CONCAT.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4452 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.oracle.sql: Removed unneeded code.
* operation/events/events_list.php: Do not show duplicate messages when
grouping events.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4451 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_events.php: Fixed repeated values into
array of event ids in delete function merged from validate function
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4450 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php
include/graphs/fgraph.php: Added ttl parameter to all
pdf report graphs
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4442 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php
include/graphs/functions_pchart.php
include/graphs/fgraph.php
include/graphs/functions_utils.php: Added time to live to
area graphs in pdf calls
* operation/reporting/reporting_xml.php: Fixed bad characteres in
xml
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4440 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_fsgraph.php: Updated a deprecated function
call
* include/functions_reporting.php: ixed a mistake using the wrong
variable to print pie graph
* godmode/agentes/module_manager_editor_prediction.php: Removed a
html_debug_print call
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.postgreSQL.sql
pandoradb.oracle.sql
extras/pandoradb_migrate_v3.2_to_v4.0.sql: New field "tags" in
"tevento" table for Oracle, Postgresql and migration script.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4428 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/config_process.php: Graph's dependencies now are included
by calling a new file with require_once sentence in order to avoid
duplicate function declaration problem.
* include/include_graph_dependencies.php: All graph's dependencies
in this file.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4427 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_tags.php
operation/agentes/estado_monitores.php: Tooltip with module tag
information in this view.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4426 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_modules.php
include/functions_tags.php: Support for policy's tag functionality.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4418 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/events/events_list.php: Added rawurlencode and io_safe_input
where they were necessary
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4415 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/agentes/datos_agente.php: Improved filter. It allows
to select 'Specify time range' and search string.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4414 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/servers/manage_recontask.php
godmode/servers/modificar_server.php
godmode/menu.php: Changed old name functions to 4.0v.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4409 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/servers/manage_recontask.php: User with flag AW can manage recon
task, only for their group.
* godmode/servers/modificar_server.php: User with AW flag can view server
status but only Pandora Admin can delete one of them.
* godmode/servers/manage_recontask_form.php: User with flag AW can manage recon
task, but only for their group.
* godmode/menu.php: Allowing user with flag AW see manage server tab and
manage recon task subtab.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4408 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_tags.php: Fixed problem on
update tag function.
* godmode/tag/tag.php
* godmode/tag/edit_tag.php: Added tab that links to
tag list view.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4407 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_modules.php: Some mofications over update_tag
function.
* include/functions_alerts.php: Added new function
alerts_get_alerts_module_name() to retrieve alerts of a module
in html select tag format.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4405 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/module_manager_editor_prediction.php: Edited to get
"custom_integer_2" parameter & Added period combo
* godmode/agentes/module_manager_editor.php: Edited to get
"custom_integer_2" parameter
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4400 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/auth/mysql.php: Do not allow empty passwords when
authenticating against an LDAP server.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4396 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php: Fixed a deprecated function call
* include/functions_reporting.php: Fixed a deprecated function call and
removed some connection error messages
* include/functions.php: Disabled agents/modules report type when
metaconsole is active
* operation/agentes/ver_agente.php: Removed some connection error messages
* godmode/reporting/reporting_builder.list_items.php: Removed some
connection error messages
* godmode/reporting/reporting_builder.php: Added getting server name for
sql reports & custom graph in metaconsole
* godmode/reporting/reporting_builder.item_editor.php: Added Server
combo box, custom graph for metaconsole & removed some connection error
messages
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4394 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: Edited "render_report_html" function
to work with metaconsole printing metaconsole elements
* include/javascript/pandora.js: Modified autocomplete javascript to use
with metaconsole
* include/ajax/reporting.ajax.php: Edited to work with metaconsole
* include/ajax/agent.php: Edited autocomplete to work with metaconsole
* operation/agentes/ver_agente.php: Modified to get the agent's modules
using metacofacensole
* godmode/reporting/reporting_builder.list_items.php: Edited to display
agents & modules in metaconsole. Edited top filters to work with
metaconsole
* godmode/reporting/reporting_builder.php: Added getting parameter
server_name & fixed deleting items
* godmode/reporting/reporting_builder.item_editor.php: Edited to send
the host when metaconsole is active
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4393 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
to "tagente_modulo" table.
* include/functions_modules.php
include/functions_tags.php
godmode/agentes/module_manager_editor_common.php
godmode/agentes/configurar_agente.php
godmode/agentes/module_manager_editor.php
godmode/tag/tag.php
godmode/tag/edit_tag.php: Now it's possible to add tags
to modules.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4389 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/styles/menu.css: Added new background image on css
tag entry.
* include/functions_tags.php: Added new function code for tag
functionality.
* pandoradb.sql
pandoradb.postgreSQL.sql
pandoradb.oracle.sql
extras/pandoradb_migrate_v3.2_to_v4.0.sql: Added new tables "ttag",
"ttag_module", "ttag_policy_module" and "ttag_event".
* godmode/tag: Added new path.
* godmode/menu.php
godmode/tag/tag.php
godmode/tag/edit_tag.php: Tag editor for events correlation engine.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/setup/setup_auth.php
include/functions_config.php: Removed user and password from LDAP setup.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4381 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_agents.php: erased lost trace in source code.
* include/functions_db.php: in function "db_pandora_audit" added the check
the exists the id_user.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4379 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* images/cog_db.png
images/cross_undo.png
godmode/agentes/module_manager_editor.php: Added two new images to
queue and added check when relink a module into policy avoiding it
when te policy is applying
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4377 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/module_manager_editor_common.php: Added hidden field
in module edition form to keep the type when is disabled
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4375 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/agentes/alerts_status.php
include/functions_agents.php: Fixed filter Status in Alert Detail and pagination.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4368 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_agents.php: changed the source code to fixed the
enterprise call in function "agents_get_agents".
* operation/agentes/estado_agente.php: apply the change to the call
"agents_get_agents".
Fixes: #3303426
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4367 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php
operation/events/events.php: Changed the way to include flash
graph include.
* pandoradb.oracle.sql: Changed datatype on max_value field of
talert_templates table.
* pandoradb.data.oracle.sql: Fixes errors in Oracle installation.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/fgraph.php
include/config_process.php
include/functions_agents.php
operation/agentes/status_monitor.php
operation/agentes/estado_agente.php: Several corrections
over sql queries for Oracle DBMS.
* godmode/db/db_info.php: Added include to
functions_fsgraph.php
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4363 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* enterprise/include/functions_policies.php: Fixed bug: When I link again the module to policy, the linkation works fine but the message showed is "Error processing request".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4353 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.sql
pandoradb.postgreSQL.sql
pandoradb.oracle.sql
extras/pandoradb_migrate_v3.2_to_v4.0.sql: Moved some alter tables
from Enterprise side
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4352 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/agentes/estado_agente.php: fixed ACL when the user have a
"Pandora Management" in any group that show agents of all groups.
Fixes: #3300611
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4350 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_servers.php
include/functions_agents.php
operation/agentes/estado_agente.php: Fixed bad queries for console over
Oracle DBMS.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4349 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/users/configure_user.php: fixed the old call to function
"profile_create_user_profile", I sorry that the before overwrite was mine.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4348 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions.php: added new parameter for the "check_acl" function
the $id_agent, by default is 0, and this parameter now only is used in the
enterprise ACL check (as you see in the hook for enterprise into the
function source). And cleaned source code style.
* include/functions_agents.php, operation/search_modules.php,
operation/agentes/status_monitor.php,
operation/agentes/estado_ultimopaquete.php,
operation/agentes/alerts_status.php, operation/agentes/estado_agente.php,
operation/agentes/estado_monitores.php, operation/agentes/ver_agente.php,
godmode/agentes/module_manager.php, godmode/agentes/modificar_agente.php,
godmode/agentes/configurar_agente.php, godmode/alerts/alert_list.list.php:
added checks for the ACL enterprise.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4347 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* install.php: Correct a mistake that doesn't allow to create a
new database when drop database option is checked.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4339 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/search_modules.php, operation/search_agents.php,
operation/search_alerts.php: added the hook for ACL check for enterprise.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4338 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/module_manager_editor.php
include/javascript/pandora_modules.js: Fixed bug: Is possible to create a module plugin without module associated.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4337 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_io.php
include/config_process.php
include/functions_extensions.php
index.php
extensions/insert_data.php
extensions/system_info.php
extensions/extension_uploader.php
extensions/pandora_logs.php
extensions/agents_modules.php
extensions/update_manager.php
extensions/ssh_console.php
extensions/dbmanager.php
extensions/vnc_view.php
extensions/resource_registration.php
extensions/resource_exportation.php
extensions/users_connected.php
extensions/module_groups.php
extensions/plugin_registration.php
godmode/extensions.php: functions in
functions_extensions.php have "extensions_" prefix.
* install.php: Drop database action is not allowed when installation
it's performed over a new database.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4336 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_profile.php: modified the function "create_user_profile"
for to return the id of new user profile.
* include/functions_agents.php: added in function "agents_get_agents" the
code to filter with enterprise ACL.
* operation/agentes/estado_agente.php: cleaned source code style.
* godmode/agentes/modificar_agente.php: added the filter for to
enterprise ACL.
* godmode/users/configure_user.php: added hooks for to enterprise ACL.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4332 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: Do not count the empty start of an
interval as 0 (affects AVG and SLA).
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4329 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/agentes/estado_agente.php: Replaced a call to the old
get_db_all_rows_sql with db_get_all_rows_sql.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4325 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/fgraph.php: Added 'period' parameter to slicesbar_graph
function
* include/graphs/functions_pchart.php: Added 'period' variable and fixed
pch_slicebar_graph function
* include/functions_graph.php: Added 'date' to function graph_sla_slicebar
* include/functions_reporting.php: Fixed get_agentmodule_sla_array
function, and get_agentmodule_sla, updated some deprecated
printTrucateText calls, and the decimal data for displaying the SLA number
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4322 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.sql, pandoradb.postgreSQL.sql: fixed the default value for
timestamp, there was a own mistake in the order of date, sorry.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4321 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php: changed in the function
"grafico_modulo_sparse2" the order to include the javascripts for flash.
* include/functions_visual_map.php,
include/ajax/visual_console_builder.ajax.php,
godmode/reporting/visual_console_builder.editor.js: some fixes in the show
new graphs.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4320 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_fsgraph.php: fixed the call to
"clean_flash_string", renamed to "clean_flash_string2".
* include/functions_reporting.php: disabled the include old fsgraph.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4319 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.postgreSQL.sql: fixed the type of cell "id_agente_modulo" in the
table "tagente_datos_string".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4318 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/alerts/alert_list.list.php: Fixed filter parameters are not
taken over with offset selection.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4310 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_visual_map.php,
include/ajax/visual_console_builder.ajax.php: fixed the include the new
graph engine in the ajax calls.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4309 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/configurar_agente.php
godmode/agentes/module_manager_editor.php: Added the feature of
edit the modules from the agent config or create a module from
a local component or manually
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4307 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.sql, pandoradb.postgreSQL.sql,
extras/pandoradb_migrate_v3.2_to_v4.0.sql: changed the default value for
zero/null date "0000-00-00 00:00:00" to "01-01-1970 00:00:00".
* include/functions_graph.php,include/db/postgresql.php,
include/functions_modules.php, include/functions_agents.php,
operation/agentes/alerts_status.php,
operation/agentes/estado_generalagente.php,
operation/agentes/estado_agente.php, operation/agentes/exportdata.php,
operation/agentes/ver_agente.php, operation/servers/view_server.php,
operation/gis_maps/ajax.php, godmode/db/db_sanity.php,
godmode/agentes/agent_template.php,
godmode/agentes/module_manager_editor_network.php,
godmode/agentes/configurar_agente.php, godmode/servers/plugin.php,
godmode/snmpconsole/snmp_alert.php: small fixeds for the support the
PostgreSQL engine.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4306 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php, include/graphs/functions_pchart.php,
include/graphs/fgraph.php: back to previous version of Juan Manuel, because
he update old version of trunk.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4290 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/admin_access_logs.php: Fixed filter parameters are not
taken over with offset selection. (Fixed degraded.)
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4287 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_gd.php: Fontsize was not being passed
as parameter in drawRating(), now is passed.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4284 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/setup/setup_visuals.php
godmode/users/configure_user.php: Fixed some mistakes of my last
commit.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4282 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php
include/graphs/functions_gd.php
include/graphs/fgraph.php: Merged sancho works from
integria passing fonts and sizes in integria. Little
fixes
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4280 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php, include/graphs/functions_pchart.php,
include/graphs/fgraph.php: added parameter to choose if show all xaxis
marks or not.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4278 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb_data.sql, pandoradb.data.postgreSQL.sql,
pandoradb.data.oracle.sql: added the default value for flash_chart for
admin user. The value is "use the global conf".
* include/db/mysql.php: cleaned source code style.
* godmode/users/configure_user.php: fixed when update or create the user
in Pandora Console without Enterprise version installed.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4275 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php,
include/graphs/functions_pchart.php: some fixes, and set font size equal
for all text in graphs. And starte the change to vertical bar the graph
for string module.
* include/functions_reporting.php: added to take the font and size.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4273 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/fonts/unicode.ttf: renamed form code.ttf.
* include/fonts/smallfont.ttf: added new smaller font.
* include/functions_config.php, godmode/setup/setup_visuals.php: now you
can set the size of font for the graphs.
* include/functions_graph.php, include/graphs/functions_pchart.php,
include/graphs/fgraph.php: changed source code to set the size of font
in the graphs.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4270 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php, include/graphs/functions_pchart.php,
include/fgraph.php, operation/agentes/stat_win.php: fixed duplicate
functions, and start to support custom font in Pandora connector.
* index.php: fixed when include again the extension file.
* include/functions_html.php: fixed when include this file in other
location to index.
* godmode/reporting/graph_builder.preview.php: cleaned source code style.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4268 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_events.php
include/functions_reporting.php: Fixed some mistakes of my last commit.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4264 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* images/logo_vertical_water.png: added water mark for the graphs.
* godmode/db/db_info.php: cleaned source code style.
* include/graphs/pChart/pDraw.class.php: re-added lost line for the
rotation label value.
* include/functions_graph.php, include/graphs/functions_pchart.php,
include/graphs/functions_fsgraph.php, include/graphs/fgraph.php: added the
source code to show warter mark.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4261 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_events.php
include/functions_reporting.php
include/functions_alerts.php
operation/incidents/incident_detail.php
operation/agentes/status_events.php
operation/agentes/tactical.php
operation/integria_incidents/incident_detail.php
operation/events/events_validate.php
operation/events/events_list.php
operation/events/events.php
operation/reporting/reporting_xml.php: Functions in functions_events.php have "events_"
prefix.
* index.php: Added some "db_" prefixes that I forgot in my last commit. Functions in
functions_events.php have "events_" prefix.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4260 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_modules.php: Fixed an error about the agent status
* godmode/agentes/agent_template.php: Fixed an error about the agent
status
Fix: #3251822
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4256 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_db.php, pandoradb.sql,
pandoradb.postgreSQL.sql, pandoradb.oracle.sql,
extras/pandoradb_migrate_v3.2_to_v4.0.sql,
general/logon_ok.php, godmode/admin_access_logs.php: Several fixes to
make things work in MySQL, PostgreSQL and Oracle.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4254 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/modules/manage_network_components_form.php: Enabled port field
on Network Components - Remote SNMP network agent
* godmode/modules/manage_network_components_form_plugin.php: Added port
field on Network Components - Plugin Components
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4251 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php, include/fgraph.php,
operation/agentes/graphs.php, operation/agentes/stat_win.php: added the
new engine.
* include/graphs/functions_pchart.php: fixed the default value for some
graph data confs.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4249 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php
include/graphs/functions_fsgraph.php
include/graphs/fgraph.php: Fixed flash
area colors and lef margin in horizontal bar
graphs
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4246 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/pChart/pDraw.class.php: changed for show the some dark
border with same color of area when the data config of graph haven't this
values.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4243 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php, godmode/reporting/graph_builder.preview.php:
fixes for the new graph engine.
* operation/agentes/estado_monitores.php: added a toggle button to show the
the entire value or sub string for value (by default).
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4240 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_filemanager.php: Fixed a problem with html entities
* include/get_file.php: Added base64_decode for getting a get parameter
Fixes: #3286063
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4237 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php, include/graphs/functions_pchart.php,
include/graphs/fgraph.php, operation/agentes/estado_generalagente.php: some
fixes and changes in the new graph engine.
* operation/agentes/stat_win.php: fixed the tittle of popup window.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4236 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/admin_access_logs.php: Fixed filter parameters are not
taken over with offset selection.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4232 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php: added the parameter $homeurl in some
functions and in others rename from $homedir.
* include/graphs/functions_pchart.php: setted the default values in some
vars. And replaced the calls to new engine graph.
* include/graphs/fgraph.php: added the parameter $homeurl.
* include/functions_reporting.php: fixed in 'simple_graph' the
$content['id_agent_module'].
* include/functions_custom_graphs.php,
operation/reporting/reporting_xml.php,
godmode/admin_access_logs.php: cleaned source code style.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4230 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php
include/graphs/functions_fsgraph.php
include/graphs/fgraph.php: Increased the weight of the lines
in line graphs.
Clean code
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4227 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php: added function "graph_custom_sql_graph2".
* include/graphs/fgraph.php: added as $homedir parameter in some functions.
* include/functions_reporting.php: changed to new engine.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4226 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php
include/graphs/pChart/pDraw.class.php
include/graphs/fgraph.php: Added rotation in bar graphs
top axis.
Fixed pie legend position
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4224 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/massive/massive_edit_modules.php: Added functionality to edit
SNMP version on massive operations
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4222 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php: added method to force height or not,
changed to show all columns name in the hgraph and vgraph, fixed the colors
when passed the parameter "fine" to color. And in the function
"pch_bar_graph" change to calculate left margin instead to fixed value.
* include/graphs/fgraph.php: added new parameter in the function
"hbar_graph" to force or unforce the graph height.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4221 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php: setted the xmargin to 0.
* include/graphs/fgraph.php: in function "pie_graph" reduce to 8 the
portions for the pie.
* include/functions_db.php: changed the call "debug" to "ui_debug".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4220 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php
include/graphs/functions_gd.php
include/graphs/fgraph.php: Added x and y
axis name possibility to line, stacked line and
stacked area graphs.
Added dual posibility of calling to functions_gd
(thorugh url and with function call).
Clean code.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4219 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php
include/functions.php: Removed function popup_help from functions.php
and added in function_ui.php under ui_popup_help name.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4215 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php, godmode/db/db_info.php,
godmode/db/db_purge.php: added functions "grafico_db_agentes_purge2",
"grafico_db_agentes_paquetes2", "graph_db_agentes_modulos2", and changed
in the code for this functions.
* include/graphs/functions_pchart.php: in function "pch_bar_graph" fixed
when pass a empty array as color.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4211 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/servers/view_server_detail.php,
godmode/servers/manage_recontask.php,
godmode/servers/manage_recontask_form.php: Fixes bug #3286027. Also implement
the new "manual" mode for recon tasks.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4210 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php: Forgotted
restoring miguel modifications in the last commit
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4203 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php
include/functions_custom_graphs.php: Improved the
vertical graph legend to use in horizontal when
is possible.
Fixing a Miguel modification erased by me in the last
commit.
Fix a combined graph bug in the size
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4202 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php
include/graphs/functions_pchart.php
include/graphs/fgraph.php
include/functions_reporting.php
include/pchart_graph.php
include/fgraph.php: Change the slicebar graph
made by Javi to make it more generic and to
use the new pChart library. This graph has been
included into the graphs abstraction too
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4201 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php: added lost lines of source code to
set bottom margin.
* godmode/reporting/visual_console_builder.editor.js: changed to use new
progress bar.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4200 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php
include/graphs/functions_fsgraph.php
include/graphs/functions_gd.php
include/graphs/fgraph.php: Fixed long index bug into
stacked and line graphs.
Add entry for radar and polar charts (kiviat)
Clean code
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4198 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: Fixed the functionality for the sla
horitontal bar graph. Truncated some agent and module names. Cleaned the
code style
* include/ajax/reporting.ajax.php: Added functionality to add & delete
elements from the global reports
* include/functions_ui.php: Added function printSmallFont
* godmode/reporting/reporting_builder.item_editor.php: Fixed a wee
problem with the module combo size
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4195 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/users_connected.php
operation/incidents/incident.list.php
godmode/agentes/module_manager.php: Fixed some mistakes of my last
commit.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4194 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php: added constants for some graphs. Added
function "graphic_agentaccess2" and function "graph_event_module2".
* include/graphs/functions_pchart.php: added checked previous $color and
$legend to avoid PHP warnings, added some code to calculate the bottom
margin.
* include/graphs/fgraph.php: at the moment in this file call
"fs_3d_pie_chart2" instead "fs_3d_pie_chart". Erased the color and legend in
the piegraph.
* operation/agentes/estado_generalagente.php: use new graphics functions.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4193 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_fsgraph.php
include/graphs/fgraph.php
include/graphs/functions_utils.php: Created a function to
include flash charts javascript file into abstraction.
Clean code
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4192 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_fsgraph.php
include/graphs/functions_gd.php
include/graphs/images_graphs
include/graphs/images_graphs/outlimits.png
include/graphs/fgraph.php: Added new file with sd functions
of two graphs, histogram and progress bar. Added folder with
graph abstraction default images. Clean code
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4190 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/reporting/graph_builder.main.php: changed to use constants.
* include/graphs/fgraph.php: dded the show image when none data
and added the function "stacked_line_graph".
* include/graphs/functions_pchart.php: fixed when haven't the $xaxisname and
$yaxisname. Fixed typo mistake.
* include/graphs/functions_utils.php: added function "stack_data".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4186 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/reporting/reporting_builder.item_editor.php: The SLA elements
are listed again with labels instead with input texts.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4184 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php
include/graphs/functions_fsgraph.php
include/graphs/fgraph.php: Merged changes from integria like increasement
of margins in area static graphs, clean code and minor fixes
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4182 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php
include/graphs/functions_fsgraph.php
include/graphs/functions_utils.php: Improved the entry point
of the graphics abstraction and merged bar and pie configurations
from integria
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4179 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php: added call to paint the other graphs.
* include/graphs/functions_pchart.php: added stack area graph, and fixed
typo in the call to line graph.
* include/graphs/functions_fsgraph.php: added line graph and area graph.
* include/graphs/fgraph.php: added function "stacked_area_graph" and
"line_graph".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4178 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/fgraph.php: changed the img tag to autoclose.
* include/graphs/functions_fsgraph.php: changed the border to default 1, and
fixed the show legend.
* include/functions_graph.php: cleaned source code style. And the function
"graphic_combined_module2" added the show timestamp as human, add the
min, max, avg values.
* include/graphs/functions_pchart.php: changed the show leyend in the top
of graph, and added some comments lines for debug.
* include/functions_reporting.php, include/functions_custom_graphs.php,
godmode/reporting/graph_builder.preview.php: changed the graph to show with
new engine.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4177 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php: wip in the function
"graphic_combined_module2".
* include/graphs/functions_fsgraph.php: fixed when "fs_area_graph" when
send a graph without the colours or and legend.
* include/graphs/fgraph.php: erased lost session instructions in the
function "area_graph".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4175 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: Added case to display 'agent_module'
reports
* include/functions.php: Added the option 'agent_module' for the
reporting type in combo selecion
* godmode/reporting/reporting_builder.php: Added options to store
'agent_module' report info
* godmode/reporting/reporting_builder.item_editor.php: Added html fields
for the 'agent_module' report
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4174 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/pChart/pData.class.php
include/graphs/pChart/pDraw.class.php: Fixed avoid zero values
into area graphs and clean code
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4173 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_fsgraph.php, include/functions_graph.php,
include/graphs/functions_utils.php, include/fgraph.php: cleaned source code
style.
* include/functions_graph.php: added first version of function
"graphic_combined_module2".
* include/graphs/functions_pchart.php: fixed when pass a empty array as
colour for graphs.
* include/graphs/pChart/pDraw.class.php: fixed to set a color border when
the graphs haven't a external defined colour.
* include/graphs/fgraph.php: changed for pass the data to static image graph
generator.
* operation/agentes/graphs.php: changed to use the new graph engine.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4172 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/events/events_list.php, operation/events/events.php: fixed
nested forms incompatible with some browsers that fail when validate
several events and some errors in javascript when validate individual error.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4170 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_fsgraph.php: added check if loaded the class.
* include/graphs/functions_fsgraph.php: added check if loaded the class.
Rename some functions and erased the function "fs_module_chart".
* include/graphs/functions_pchart.php: erased some debug traces.
* include/graphs/fgraph.php: cleaned the function "area_graph".
* operation/agentes/stat_win.php: cleaned source code.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4169 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandora_console/godmode/modules/manage_network_templates.php: fixed the
output of description and name, and fixed the buttons to delete and export.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4164 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php
include/graphs/pChart/pDraw.class.php
include/graphs/fgraph.php
include/graphs/functions_utils.php: Changed the send data method
from sessions to files with serialize functions. Creation of a
utils functions file. Improvement of the pChart library adding
attributes to avoid ticks and grids when the data under the
xaxis is empty.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4160 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php, operation/agentes/stat_win.php: changes for
to show with new engine.
* include/graphs/functions_pchart.php,
include/graphs/pChart/pData.class.php,
include/graphs/pChart/pDraw.class.php,
include/graphs/functions_fsgraph.php,
include/graphs/fgraph.php: part of job is Sergio Martin in my laptop, the
changes to show borders in the static image graph.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4158 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/config_process.php: Fixed wrong condition when global
configuration for "flash_charts" option is override by user value.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4157 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/db/oracle.php: Added new functions for Oracle support.
include/functions_db.php: Added conditional code for Oracle engine.
* pandoradb.oracle.sql: Added new db procedure "insert_id" to
retrieve PK when insert is performed.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4156 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/pChart/pDraw.class.php: Added to
library an option to avoid draw zeros in area
charts
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4155 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/pChart/pDraw.class.php: Fixed
pchart library bug with default value for
forcetransparency attribute. Changed from NULL
to -1
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4154 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php, include/graphs/functions_fsgraph.php: add
to support and wip with new graph engine.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4153 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php: Improved
legend control and added limitation in showing
xaxis data to one each 10 pixels
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4152 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/reporting/reporting_builder.item_editor.php: Removed the option
to select 'show graph' in general reports
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4150 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php: Added features to
the vertical graphs function like colors, alpha values, legend...
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4149 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: Fixed a small problem passing 'width'
parameter in 'top_n' reports
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4148 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: Fixed a small problem when displaying
only the graph and not the table for the exception report.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4147 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php, include/graphs/*, include/graphs/fgraph.php:
added first version of common graph libraries with Integria and Babel.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4146 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: Fixed get_agentmodule_sla_array and
added functionality to show the table, table+graph or only graph
* include/pchart_graph.php: Fixed function graph_sla_horizontal
* include/pandora_graph.php: Changed function graph_sla_horizontal
prototype
* include/fgraph.php: Deleted function graph_sla_pie, fixed function
graph_sla_horizontal and added two more cases for printing graphs
* godmode/reporting/reporting_builder.php: Changed getting parameter
of two checkboxes for two comboboxes
* godmode/reporting/reporting_builder.item_editor.php: Added the options
for the combo to select display table, table+graph or only graph
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4145 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/reporting/reporting_builder.php,
godmode/reporting/reporting_builder.item_editor.php: added suppor for styles
in the report content, now support in columns and landscape in some cases.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4142 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/reporting/reporting_builder.php,
godmode/reporting/reporting_builder.item_editor.php: added suppor for styles
in the report content, now support in columns and landscape in some cases.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4141 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/fonts/FreeSans.ttf
include/FreeSans.ttf
include/functions_config.php Moved the freesans
font to the new fonts folder and set the unicode
font as default font into setup
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4140 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/fonts
include/fonts/DejaVuSerif-Bold.ttf
include/fonts/DejaVuSerif.ttf
include/fonts/DejaVuSerifCondensed-Bold.ttf
include/fonts/DejaVuSerifCondensed.ttf
include/fonts/DejaVuSerif-Italic.ttf
include/fonts/code.ttf
include/fonts/DejaVuSerif-BoldItalic.ttf
include/fonts/DejaVuSerifCondensed-Italic.ttf
include/fonts/DejaVuSerifCondensed-BoldItalic.ttf: move the
pdf library fonts from enterprise to open
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4139 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.sql, pandoradb.postgreSQL.sql, pandoradb.oracle.sql,
extras/pandoradb_migrate_v3.2_to_v4.0.sql: added column "style" for to
add style (as json encode) the many styles for the contents.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4138 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: Added get_agentmodule_sla_array
function and fixed some SLA graph details
* include/pchart_graph.php: Deleted some "debugPrint" calls found
* include/pandora_graph.php: Changed function 'graph_sla_horizontal'
prototype
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4137 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/config_process.php
* operation/users/user_edit.php
* godmode/users/configure_user.php:Now global configuration for
"flash_charts" and "block_size" options are not override for
default user values.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4134 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.oracle.sql: Added modifications in queries needed for
Pandora installer.
* pandoradb.data.postgreSQL.sql
pandoradb.data.oracle.sql: Added data for tconfig table like in
the mysql script version.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4132 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/pChart/pChart.class: some fixes to prevent notices and warning
PHP messages that corrupt image file.
* include/fgraph.php: some fixes to prevent noticies and warning PHP
messages that corrupt image file.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4131 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: fixed in the content "general" when the
report haven't agents.
* include/fgraph.php: fixed when extract the "sql" column in the table
"treport_custom_sql".
* godmode/reporting/reporting_builder.item_editor.php: fixed the show the
SQL query in the contents that have it.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4130 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/ajax/reporting.ajax.php: Added truncating for the agent and
module name into report SLA list.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4129 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/insert_data.php, extensions/system_info.php,
extensions/agents_modules.php, extensions/ssh_console.php,
extensions/resource_registration.php, extensions/resource_exportation.php,
extensions/plugin_registration.php: re-ordered and re-cleaned some parts or
lines of source code.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4123 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: fixed the include "fgraph", did'nt show
warning message in the generation of PDF.
2011-03-23 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php: erased the svn diff messages lost in
old times.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4122 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: cleaned source code style.
* extensions/resource_registration.php,
extensions/resource_exportation.php: added first version of extension to
import and export reports and visual console.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4113 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f