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

2012-04-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* 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
This commit is contained in:
juanmanuelr 2012-04-19 16:00:32 +00:00
parent bfae770761
commit 3e1cc1475d
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2012-04-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_config.php: Added check for update manager in
the config process.
2012-04-19 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* extensions/update_license_info.php: Delete innecesary extension.

40
pandora_console/include/functions_config.php
View File

@ -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;
}
}
}
}