diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index ac30902c9f..d6226b2de7 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2010-03-03 Sancho Lerena + + * (A lot of files): Updated include("config.php") and replaced by + global $config. + + * functions_db.php, functions_html.php: Fixed way to get data from the hash + instead from the array. + 2010-03-03 Miguel de Dios * include/functions_gis.php: add in the last time a function "printMap2" diff --git a/pandora_console/extensions/update_manager/main.php b/pandora_console/extensions/update_manager/main.php index 5837d191f7..1bf4125d4a 100644 --- a/pandora_console/extensions/update_manager/main.php +++ b/pandora_console/extensions/update_manager/main.php @@ -13,7 +13,7 @@ // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/extensions/update_manager/settings.php b/pandora_console/extensions/update_manager/settings.php index 97ee74e5da..b627b9d5c6 100644 --- a/pandora_console/extensions/update_manager/settings.php +++ b/pandora_console/extensions/update_manager/settings.php @@ -12,7 +12,7 @@ // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/admin_access_logs.php b/pandora_console/godmode/admin_access_logs.php index 834f39a0c5..81e0454efc 100644 --- a/pandora_console/godmode/admin_access_logs.php +++ b/pandora_console/godmode/admin_access_logs.php @@ -14,7 +14,8 @@ // GNU General Public License for more details. -require_once ("include/config.php"); +global $config; + if ($config['flash_charts']) { require_once ("include/fgraph.php"); } diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index bfa7add2e0..8ae5fde767 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -15,7 +15,8 @@ // Load global vars -require_once ("include/config.php"); +global $config; + enterprise_include ('godmode/agentes/configurar_agente.php'); check_login (); diff --git a/pandora_console/godmode/agentes/manage_config_remote.php b/pandora_console/godmode/agentes/manage_config_remote.php index c06482e40f..f842a5c761 100644 --- a/pandora_console/godmode/agentes/manage_config_remote.php +++ b/pandora_console/godmode/agentes/manage_config_remote.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login(); diff --git a/pandora_console/godmode/agentes/planned_downtime.php b/pandora_console/godmode/agentes/planned_downtime.php index 0f7e9b9dfb..fe39d0dc3c 100644 --- a/pandora_console/godmode/agentes/planned_downtime.php +++ b/pandora_console/godmode/agentes/planned_downtime.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login(); diff --git a/pandora_console/godmode/db/db_audit.php b/pandora_console/godmode/db/db_audit.php index e21a7bfd46..e6c731b011 100644 --- a/pandora_console/godmode/db/db_audit.php +++ b/pandora_console/godmode/db/db_audit.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/db/db_event.php b/pandora_console/godmode/db/db_event.php index 5c08d1808c..2e314ba608 100644 --- a/pandora_console/godmode/db/db_event.php +++ b/pandora_console/godmode/db/db_event.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/db/db_info.php b/pandora_console/godmode/db/db_info.php index acdfcfbb6c..5ac21c25f5 100644 --- a/pandora_console/godmode/db/db_info.php +++ b/pandora_console/godmode/db/db_info.php @@ -16,7 +16,8 @@ // Load global vars -require_once ("include/config.php"); +global $config; + if ($config['flash_charts']) { require('include/fgraph.php'); } diff --git a/pandora_console/godmode/db/db_main.php b/pandora_console/godmode/db/db_main.php index 24982f0cfe..255c38a492 100644 --- a/pandora_console/godmode/db/db_main.php +++ b/pandora_console/godmode/db/db_main.php @@ -15,7 +15,8 @@ // Load global vars -require_once ("include/config.php"); +global $config; + if ($config['flash_charts']) { require_once ("include/fgraph.php"); } diff --git a/pandora_console/godmode/db/db_purge.php b/pandora_console/godmode/db/db_purge.php index ac6be07f87..f032be57c9 100644 --- a/pandora_console/godmode/db/db_purge.php +++ b/pandora_console/godmode/db/db_purge.php @@ -16,7 +16,8 @@ // Load global vars -require("include/config.php"); +global $config; + if ($config['flash_charts']) { require('include/fgraph.php'); } diff --git a/pandora_console/godmode/db/db_refine.php b/pandora_console/godmode/db/db_refine.php index 0b525a2017..2be6924907 100644 --- a/pandora_console/godmode/db/db_refine.php +++ b/pandora_console/godmode/db/db_refine.php @@ -16,7 +16,7 @@ // Load global vars -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/db/db_sanity.php b/pandora_console/godmode/db/db_sanity.php index 07ef2d661f..c8270eeb07 100644 --- a/pandora_console/godmode/db/db_sanity.php +++ b/pandora_console/godmode/db/db_sanity.php @@ -15,7 +15,8 @@ // Load global vars -require("include/config.php"); +global $config; + check_login(); if (! give_acl ($config["id_user"], 0, "DM")) { diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php index b2c6fbc5b2..ade949e50c 100644 --- a/pandora_console/godmode/gis_maps/configure_gis_map.php +++ b/pandora_console/godmode/gis_maps/configure_gis_map.php @@ -13,7 +13,7 @@ // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login (); @@ -888,4 +888,4 @@ function downLayer(idLayer) { updateArrowLayers(); } } - \ No newline at end of file + diff --git a/pandora_console/godmode/gis_maps/index.php b/pandora_console/godmode/gis_maps/index.php index 52d0e84554..4b13080a47 100644 --- a/pandora_console/godmode/gis_maps/index.php +++ b/pandora_console/godmode/gis_maps/index.php @@ -13,7 +13,7 @@ // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login (); @@ -135,4 +135,4 @@ function setDefault(id_tgis_map) { }); } } - \ No newline at end of file + diff --git a/pandora_console/godmode/modules/manage_nc_groups_form.php b/pandora_console/godmode/modules/manage_nc_groups_form.php index 3d697d95dd..73ac9e5d40 100644 --- a/pandora_console/godmode/modules/manage_nc_groups_form.php +++ b/pandora_console/godmode/modules/manage_nc_groups_form.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/modules/manage_network_components_form.php b/pandora_console/godmode/modules/manage_network_components_form.php index 048965c570..d2aacca1a8 100644 --- a/pandora_console/godmode/modules/manage_network_components_form.php +++ b/pandora_console/godmode/modules/manage_network_components_form.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/modules/manage_network_components_form_common.php b/pandora_console/godmode/modules/manage_network_components_form_common.php index 440bcc0b5f..f7875888fd 100644 --- a/pandora_console/godmode/modules/manage_network_components_form_common.php +++ b/pandora_console/godmode/modules/manage_network_components_form_common.php @@ -13,8 +13,7 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. - -require_once ('include/config.php'); +global $config; if (! give_acl ($config['id_user'], 0, "PM")) { audit_db ($config['id_user'], $REMOTE_ADDR, "ACL Violation", diff --git a/pandora_console/godmode/modules/manage_network_components_form_network.php b/pandora_console/godmode/modules/manage_network_components_form_network.php index b180566f0c..824dca99ac 100644 --- a/pandora_console/godmode/modules/manage_network_components_form_network.php +++ b/pandora_console/godmode/modules/manage_network_components_form_network.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/modules/manage_network_components_form_plugin.php b/pandora_console/godmode/modules/manage_network_components_form_plugin.php index a14d427428..07b3ced3f0 100644 --- a/pandora_console/godmode/modules/manage_network_components_form_plugin.php +++ b/pandora_console/godmode/modules/manage_network_components_form_plugin.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global variables -require_once ('include/config.php'); +global $config; check_login (); diff --git a/pandora_console/godmode/modules/manage_network_components_form_wmi.php b/pandora_console/godmode/modules/manage_network_components_form_wmi.php index 85c683bf46..65216806e6 100644 --- a/pandora_console/godmode/modules/manage_network_components_form_wmi.php +++ b/pandora_console/godmode/modules/manage_network_components_form_wmi.php @@ -15,7 +15,7 @@ // Load global variables -require ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/modules/manage_network_templates_form.php b/pandora_console/godmode/modules/manage_network_templates_form.php index ec686cafe3..5e64a496ad 100644 --- a/pandora_console/godmode/modules/manage_network_templates_form.php +++ b/pandora_console/godmode/modules/manage_network_templates_form.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/profiles/profile_list.php b/pandora_console/godmode/profiles/profile_list.php index 142aa3f41e..e80c4c1ee7 100644 --- a/pandora_console/godmode/profiles/profile_list.php +++ b/pandora_console/godmode/profiles/profile_list.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Global variables -require ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/reporting/graph_builder.php b/pandora_console/godmode/reporting/graph_builder.php index b9558bae8a..14e852e8b1 100644 --- a/pandora_console/godmode/reporting/graph_builder.php +++ b/pandora_console/godmode/reporting/graph_builder.php @@ -13,6 +13,8 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. +global $config; + if (is_ajax ()) { $search_agents = (bool) get_parameter ('search_agents'); @@ -42,8 +44,6 @@ if (is_ajax ()) { return; } -// Login check -require_once ("include/config.php"); if ($config['flash_charts']) { require_once ('include/fgraph.php'); } diff --git a/pandora_console/godmode/reporting/graphs.php b/pandora_console/godmode/reporting/graphs.php index 3d1cd948cc..d069905ea1 100644 --- a/pandora_console/godmode/reporting/graphs.php +++ b/pandora_console/godmode/reporting/graphs.php @@ -13,7 +13,7 @@ // GNU General Public License for more details. // Load global variables -require ("include/config.php"); +global $config; require_once ('include/functions_custom_graphs.php'); diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index 952dab6e69..296c93456b 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -13,6 +13,8 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. +global $config; + if (is_ajax ()) { $search_agents = (bool) get_parameter ('search_agents'); @@ -38,8 +40,6 @@ if (is_ajax ()) { } } -require_once ("include/config.php"); - check_login (); if (! give_acl ($config['id_user'], 0, "IW")) { diff --git a/pandora_console/godmode/reporting/map_builder_wizard.php b/pandora_console/godmode/reporting/map_builder_wizard.php index 66c832bccc..d446ec1a75 100644 --- a/pandora_console/godmode/reporting/map_builder_wizard.php +++ b/pandora_console/godmode/reporting/map_builder_wizard.php @@ -14,6 +14,8 @@ // GNU General Public License for more details. // Load global vars +global $config; + check_login (); if (! give_acl ($config['id_user'], 0, "AW")) { diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 9ea4742ffa..c36395df17 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -15,7 +15,7 @@ // Login check -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/servers/manage_export.php b/pandora_console/godmode/servers/manage_export.php index 176e8fab32..0b92db2489 100644 --- a/pandora_console/godmode/servers/manage_export.php +++ b/pandora_console/godmode/servers/manage_export.php @@ -16,7 +16,7 @@ // Load global vars -require ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/servers/manage_export_form.php b/pandora_console/godmode/servers/manage_export_form.php index d577dea2d3..692d63635a 100644 --- a/pandora_console/godmode/servers/manage_export_form.php +++ b/pandora_console/godmode/servers/manage_export_form.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/servers/manage_recontask.php b/pandora_console/godmode/servers/manage_recontask.php index b4ab5458d7..a9139de9c9 100644 --- a/pandora_console/godmode/servers/manage_recontask.php +++ b/pandora_console/godmode/servers/manage_recontask.php @@ -15,7 +15,7 @@ // Load global vars -require ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/servers/manage_recontask_form.php b/pandora_console/godmode/servers/manage_recontask_form.php index 5522a0a80c..af1c75194f 100644 --- a/pandora_console/godmode/servers/manage_recontask_form.php +++ b/pandora_console/godmode/servers/manage_recontask_form.php @@ -15,7 +15,7 @@ // Load global vars -require ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/servers/modificar_server.php b/pandora_console/godmode/servers/modificar_server.php index 8bde84f005..258a92e9b5 100644 --- a/pandora_console/godmode/servers/modificar_server.php +++ b/pandora_console/godmode/servers/modificar_server.php @@ -14,7 +14,8 @@ // GNU General Public License for more details. // Load global vars -require("include/config.php"); +global $config; + require_once ("include/functions_servers.php"); check_login(); diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php index 4838c84244..113b2f9c13 100644 --- a/pandora_console/godmode/servers/plugin.php +++ b/pandora_console/godmode/servers/plugin.php @@ -16,7 +16,7 @@ // Load global vars -require ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/setup/file_manager.php b/pandora_console/godmode/setup/file_manager.php index 09c51f348c..4bcee59877 100644 --- a/pandora_console/godmode/setup/file_manager.php +++ b/pandora_console/godmode/setup/file_manager.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/setup/gis.php b/pandora_console/godmode/setup/gis.php index a9adbc88de..f3bfc71ab8 100755 --- a/pandora_console/godmode/setup/gis.php +++ b/pandora_console/godmode/setup/gis.php @@ -14,7 +14,7 @@ */ // Load global vars -require_once ("include/config.php"); +global $config; check_login (); @@ -72,4 +72,4 @@ print_input_hidden ('action','create_connection_map'); print_submit_button (__('Create'), '', false, 'class="sub next"'); echo ''; echo ''; -?> \ No newline at end of file +?> diff --git a/pandora_console/godmode/setup/gis_step_2.php b/pandora_console/godmode/setup/gis_step_2.php index 2b940702e3..5c2458f7f8 100755 --- a/pandora_console/godmode/setup/gis_step_2.php +++ b/pandora_console/godmode/setup/gis_step_2.php @@ -14,7 +14,7 @@ */ // Load global vars -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/setup/links.php b/pandora_console/godmode/setup/links.php index e5258a6a6a..616da156dd 100644 --- a/pandora_console/godmode/setup/links.php +++ b/pandora_console/godmode/setup/links.php @@ -13,8 +13,7 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// Load global vars -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/setup/news.php b/pandora_console/godmode/setup/news.php index 687807a1f1..89c8cd6481 100644 --- a/pandora_console/godmode/setup/news.php +++ b/pandora_console/godmode/setup/news.php @@ -13,7 +13,7 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/setup/performance.php b/pandora_console/godmode/setup/performance.php index 860030f646..1e3f4f368f 100644 --- a/pandora_console/godmode/setup/performance.php +++ b/pandora_console/godmode/setup/performance.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/setup/setup.php b/pandora_console/godmode/setup/setup.php index bc12bd2428..e95f3400dc 100644 --- a/pandora_console/godmode/setup/setup.php +++ b/pandora_console/godmode/setup/setup.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php index 11f06bf480..e17560ab33 100644 --- a/pandora_console/godmode/setup/setup_visuals.php +++ b/pandora_console/godmode/setup/setup_visuals.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/godmode/users/configure_user.php b/pandora_console/godmode/users/configure_user.php index 479ccf68ab..d3bc0b6090 100644 --- a/pandora_console/godmode/users/configure_user.php +++ b/pandora_console/godmode/users/configure_user.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require_once ('include/config.php'); +global $config; check_login (); $id = get_parameter ('id', $config['id_user']); // ID given as parameter diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php index 9adc7d63f0..c7d8d033b9 100644 --- a/pandora_console/godmode/users/user_list.php +++ b/pandora_console/godmode/users/user_list.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load globar vars -require_once ("include/config.php"); +global $config; check_login (); diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index efc867bb5b..9ff4c6f69f 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -1688,8 +1688,9 @@ function get_db_value_sql ($sql) { if($result === false) return false; - - return $result[0][0]; + + foreach ($result[0] as $f) + return $f; } /** @@ -1804,12 +1805,17 @@ function get_db_row_filter ($table, $filter, $fields = false, $where_join = 'AND * * @return mixed The selected field of the first row in a select statement. */ -function get_db_sql ($sql, $field = 0, $search_history_db = false) { - $result = get_db_all_rows_sql ($sql, $search_history_db); - if($result === false) - return false; - return $result[0][$field]; +function get_db_sql ($sql, $field = 0, $search_history_db = false) { + $result = get_db_all_rows_sql ($sql, $search_history_db); + if($result === false) + return false; + $ax = 0; + foreach ($result[0] as $f){ + if ($field == $ax) + return $f; + $ax++; + } } /** diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 8e35653f6a..78be975d17 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -261,7 +261,9 @@ function print_select_from_sql ($sql, $name, $selected = '', $script = '', $noth $result = array (); foreach ($result as $row) { - $fields[$row[0]] = $row[1]; + $id = array_shift($row); + $value = array_shift($row); + $fields[$id] = $value; } return print_select ($fields, $name, $selected, $script, $nothing, $nothing_value, $return, $multiple, $sort,'',$disabled); diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php index ab2a3e0087..ce39b3cef8 100644 --- a/pandora_console/operation/agentes/tactical.php +++ b/pandora_console/operation/agentes/tactical.php @@ -15,7 +15,8 @@ // Load global vars -require_once ("include/config.php"); +global $config; + require_once ("include/functions_events.php"); require_once ("include/functions_servers.php"); require_once ("include/functions_reporting.php"); @@ -44,8 +45,13 @@ function print_cells_temp ($cells) { if ($row[1] === 0) { $row[1] = "-"; } - echo ''.$row[1].''; - } + + if (isset($row["href"])) + echo ''.$row[1].''; + else + echo ''.$row[1].''; + } } if ($config["realtimestats"] == 0){ @@ -198,6 +204,12 @@ $cells[1][1] = $data["server_sanity"] . "%"; $cells[1]["color"] = "#000"; $cells[1]["href"] = "index.php?sec=estado_server&sec2=operation/servers/view_server&refr=60"; +$cells[2][0] = __('Agents unknown'); +$cells[2][1] = $data["agents_unknown"]; +$cells[2]["color"] = "#000"; +$cells[2]["url"] = ""; + + print_cells_temp ($cells); echo ""; diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php index 049a47948e..6869e05796 100644 --- a/pandora_console/operation/gis_maps/render_view.php +++ b/pandora_console/operation/gis_maps/render_view.php @@ -14,7 +14,7 @@ // GNU General Public License for more details. // Load global vars -require_once ("include/config.php"); +global $config; check_login (); @@ -171,4 +171,4 @@ if ($layers != false) { activateSelectControl(); activateAjaxRefresh($layers, $timestampLastOperation); } -?> \ No newline at end of file +?>