diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index bd00517098..270549de0a 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2013-01-22 Sergio Martin + + * include/functions_tags.php: Fix a empty value return + to array() to avoid foreach problems + + * index.php: Redirect to metaconsole when activate it + 2013-01-21 Sergio Martin * include/functions_users.php diff --git a/pandora_console/include/functions_tags.php b/pandora_console/include/functions_tags.php index cb5e0bb1d2..ad4590256e 100644 --- a/pandora_console/include/functions_tags.php +++ b/pandora_console/include/functions_tags.php @@ -516,7 +516,7 @@ function tags_get_module_tags ($id_agent_module){ $tags = db_get_all_rows_filter('ttag_module', array('id_agente_modulo' => $id_agent_module), false); if ($tags === false) - return false; + return array(); $return = array(); foreach ($tags as $tag){ diff --git a/pandora_console/index.php b/pandora_console/index.php index 74c4b4daa0..83e43842d1 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -62,6 +62,11 @@ if ((! file_exists ("include/config.php")) || (! is_readable ("include/config.ph session_start (); require_once ("include/config.php"); +// If metaconsole activated, redirect to it +if($config['metaconsole'] == 1 && $config['enterprise_installed'] == 1) { + header ("Location: " . $config['homeurl'] . "enterprise/meta"); +} + /* Enterprise support */ if (file_exists (ENTERPRISE_DIR . "/load_enterprise.php")) { include_once (ENTERPRISE_DIR . "/load_enterprise.php");