tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-01-22 Sergio Martin <sergio.martin@artica.es> 

* include/functions_tags.php: Fix a empty value return
	to array() to avoid foreach problems

	* index.php: Redirect to metaconsole when activate it 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7517 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-01-22 09:22:56 +00:00
parent 218c87584b
commit d2a7ddd468
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-01-22 Sergio Martin <sergio.martin@artica.es>
* 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 <sergio.martin@artica.es>
* include/functions_users.php

2
pandora_console/include/functions_tags.php
View File

@ -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){

5
pandora_console/index.php
View File

@ -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");