* include/functions_events.php: erased lost debug trace.
* mobile/operation/events.php: some fixes in the pagination, and
now the events from the system show the name "system".
MERGED FROM BRANCH 4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8487 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/alerts/alert_list.builder.php: Small changes. Make
alert action list sorted (in the same order of extra action
list that appears at the defined alert list)
Merged from branch 4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8479 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/alerts/alert_list.builder.php: When creating new
alert, wrong action might be assigned to the alert (if you had
some deleted actions in the past).
Merged from branch 4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8477 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* mobile/include/style/images/*,
mobile/include/style/jquery.mobile-1.3.1.css,
mobile/include/javascript/jquery.js,
mobile/include/javascript/jquery.mobile-1.3.1.js: added the
jquery mobile, and made some changes in the css.
* mobile/include/style/main.css, mobile/operation/agents.php,
mobile/include/ui.class.php: some fixes.
MERGED FROM THE BRANCH 4.0.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8474 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php: fixed include javascript in the
static image for boolean module graph.
* mobile/operation/module_graph.php,
mobile/operation/modules.php,
mobile/include/style/main.css: a lot of fixes in mobile.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8472 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* mobile/operation/events.php, mobile/operation/module_graph.php,
mobile/operation/modules.php, mobile/operation/networkmaps.php,
mobile/operation/groups.php, mobile/operation/agents.php,
mobile/operation/tactical.php, mobile/operation/networkmap.php,
mobile/operation/alerts.php, mobile/operation/agent.php,
mobile/include/ui.class.php: added the back button in the head and
impoved the source code style to make more easy the merges with
the last branch.
* include/functions_graph.php: fixed PHP notices.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8468 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/snmpconsole/snmp_alert.php: Fixed malfunction of the
macros javascript in snmp alert editor
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8467 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* mobile/include/style/main.css: some fix for the module list
when it is embedded in agent view, now it is show in Android but
I need work more for to show in the jobs fashion gadget.
* mobile/operation/networkmaps.php: fixed to avoid
unused the javascript for mobile.
MERGED FROM THE BRANCH 4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8466 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/fgraph.php: change the source code style to make
more easy the merges with the last branch.
* include/graphs/functions_pchart.php: fixed the water mark for
pie graph as image.
MERGED FROM THE BRANCH 4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8462 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* mobile/operation/networkmap.php: fixed the scroll for browser
upper that microshit IE and equal as browser of Android 2.2.
MERGED FROM THE BRANCH 4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8460 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_config.php
include/help/en/help_custom_logo.php
include/help/es/help_custom_logo.php
include/help/ja/help_custom_logo.php
images/custom_logo/sourceforge.jpg
images/custom_logo/pandora_logo_head.jpg
images/custom_logo/artica_logo.png
images/custom_logo/sourceforge.png
images/custom_logo/pandora_logo_head.png
images/custom_logo/none.jpg
images/pandora_header_logo_enterprise.png
images/pandora_header_logo.png
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
general/header.php: Change the old system of custom logo
to be used in the unique logo (left side) of Pandora FMS 5
Bug #2241
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8458 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* mobile/index.php, mobile/operation/networkmaps.php,
mobile/operation/networkmap.php, mobile/operation/home.php,
mobile/include/ui.class.php, include/functions_networkmap.php,
include/functions_ui.php: uploaded the some changes and files
for to show networkmaps in the Pandora mobile.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/users/configure_user.php: improve the meta
setup screen hidding assigned server field when the
agent management is not checked
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8453 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_api.php: Changed the way of encode
data configuration in create/update config form API
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8450 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php
operation/agentes/stat_win.php: Fix string type graph colors
and data. Fix the "Avg only" option because is forced to "true".
Bug: 2284
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8443 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb_data.sql
pandoradb.data.postgreSQL.sql
pandoradb.data.oracle.sql: Added to default actions
some default values to avoid confusion in a clean installation
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8438 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/servers/plugin.php, godmode/setup/file_manager.php,
include/functions_filemanager.php: added the filemanager to server
plugin, and of course change the code for to make this feature.
MERGED FROM THE BRANCH PANDORA_4_0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8429 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql: added the new
columns in the table "talert_snmp".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8418 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/configurar_agente.php,
include/functions_agents.php: fixed the operations with the ip or
ips adress of agent.
MERGED FROM THE BRANCH PANDORA_4_0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8404 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/menu.php: fixed the default value for refresh in the
extensions.
Fixes: #2310
* include/functions_extensions.php: cleaned source code style.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8402 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/users/user_edit.php: fixed the "home page" for user,
now it does show ugly 0, show correct the dashboard and
visualmap and can set other.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8400 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/vnc_view.php: added the changes from the branch of
pandora_4 made for Sancho.
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8396 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/visual_console/render_view.php: fixed the javascript
draw lines when there is any error in the map.
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8394 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_visual_map.php: added more changes for to make
more easy the merges from the branch.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8389 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_visual_map.php: fixed the links of module
graphs into public visualmap.
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8387 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_visual_map.php,
operation/agentes/status_monitor.php: fixed the links to the items
that represents modules.
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8385 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/reporting/visual_console_builder.editor.js: fixed the
removed the relantionship between items.
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/reporting/visual_console_builder.editor.js: fixed the
moving the lines when the item is a graph.
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8380 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_visual_map.php,
include/ajax/visual_console_builder.ajax.php: fixed the color of
lines in the editor.
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8376 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/reporting/visual_console_builder.editor.js,
godmode/reporting/visual_console_builder.editor.php,
include/functions_visual_map_editor.php: changed the code to show
the list of parent in the select, now this selectbox doesn't show
the same item.
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8374 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/functions_pchart.php: fixed the graphs with all
values in negative Y axis. Now it shows correct.
Fixes: #2302
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8367 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/fgraph.php, include/graphs/functions_pchart.php:
merged the changes from the branch 4.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/modificar_agente.php: fixed the filter of the
list of agents. The branch 4 runs fine.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8361 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/events/events.php, operation/netflow/nf_live_view.php:
fixed the hook to call a enterprise function.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8360 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/graphs/pChart/pPie.class.php, include/graphs/fgraph.php:
fixed the htmlentities in the pie chart legend, the border was
fixed for older commits.
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8357 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/menu.php: showed the message entry in workspace menu for
all users.
* include/functions_groups.php: added filters into the function
"groups_get_users" for to avoid to get user without perms.
* operation/messages/message_edit.php: fixed the ACL for to
destination users.
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8347 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/incidents/incident.php,
operation/incidents/incident_detail.php: fixed to set the SYSTEM as
user for the incident.
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8344 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/snmpconsole/snmp_view.php: fixed the urls and forms to
set the filters.
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8342 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/agentes/networkmap.php: fixed to create networkmaps
with the same name (for example users with diferent groups ACL).
Fixes: #2285
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8339 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/alerts/configure_alert_action.php,
godmode/alerts/alert_commands.php: fixed the duplicated the rows
and did'nt hide the macros field rows.
Fixes: #2294
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8337 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
mdtrooper
hkosaka
zarzuelo
Ramon Novoa
mariopulido
jsatoh