From 3e1cc1475d136005c371e6cb12d7d2bae717e788 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Thu, 19 Apr 2012 16:00:32 +0000 Subject: [PATCH] 2012-04-19 Juan Manuel Ramon * include/functions_config.php: Added check for update manager in the config process. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6043 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++ pandora_console/include/functions_config.php | 40 +++++++++++--------- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index cd1af9903c..831bc040fa 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2012-04-19 Juan Manuel Ramon + + * include/functions_config.php: Added check for update manager in + the config process. + 2012-04-19 Juan Manuel Ramon * extensions/update_license_info.php: Delete innecesary extension. diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 0fa2459868..fada56abfb 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -755,27 +755,31 @@ function config_check (){ } if (enterprise_installed()) { - um_db_connect ('mysql', $config['dbhost'], $config['dbuser'], - $config['dbpass'], $config['dbname']); - - $settings = um_db_load_settings (); - - $result_check_keygen = check_keygen($settings); - - if (!empty($result_check_keygen)) { - $config["alert_cnt"]++; - $_SESSION["alert_msg"] .= $result_check_keygen; + if ($config['update_manager_installed'] == 1) { + um_db_connect ('mysql', $config['dbhost'], $config['dbuser'], + $config['dbpass'], $config['dbname']); + + $settings = um_db_load_settings (); + + $result_check_keygen = check_keygen($settings); + + if (!empty($result_check_keygen)) { + $config["alert_cnt"]++; + $_SESSION["alert_msg"] .= $result_check_keygen; + } } } else { - require_once("extensions/update_manager/lib/functions.ajax.php"); - - $result_check_keygen = check_keygen_online(); - - if (!empty($result_check_keygen)) { - $config["alert_cnt"]++; - $_SESSION["alert_msg"] .= $result_check_keygen; - } + if ($config['update_manager_installed'] == 1) { + require_once("extensions/update_manager/lib/functions.ajax.php"); + + $result_check_keygen = check_keygen_online(); + + if (!empty($result_check_keygen)) { + $config["alert_cnt"]++; + $_SESSION["alert_msg"] .= $result_check_keygen; + } + } } }