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

2013-02-28 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_config.php, include/functions_io.php: fixed the
	update the config without enterprise version.
	
	Fixes: #3606331




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7740 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-28 10:17:39 +00:00
parent a9ae04d72d
commit 47ca638ee8
3 changed files with 22 additions and 13 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-02-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php, include/functions_io.php: fixed the
update the config without enterprise version.
Fixes: #3606331
2013-02-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_reporting.php: fixed php warning message when

4
pandora_console/include/functions_config.php
View File

@ -167,7 +167,7 @@ function config_update_config () {
$values = array("value" => $license_info_key);
$where = array("key" => 'customer_key');
$update_manage_settings_result = db_process_sql_update('tupdate_settings', $values, $where);
if (!$update_manage_settings_result)
if ($update_manage_settings_result === false)
$error_update[] = __('License information');
}
}
@ -500,7 +500,7 @@ function config_update_config () {
$config['error_config_update_config'] = array();
$config['error_config_update_config']['correct'] = false;
$values = implode(', ', $error_update);
$config['error_config_update_config']['message'] = sprint(__('Failed updated: the next values cannot update: %s'), $values);
$config['error_config_update_config']['message'] = sprintf(__('Failed updated: the next values cannot update: %s'), $values);
}
else {
$config['error_config_update_config'] = array();

24
pandora_console/include/functions_io.php
View File

@ -382,17 +382,19 @@ function __ ($string /*, variable arguments */) {
return $tranlateString;
}
}
elseif ($config['enterprise_installed'] &&
isset($config['translate_string_extension_installed']) &&
$config['translate_string_extension_installed'] == 1 &&
array_key_exists('translate_string.php', $extensions)) {
enterprise_include_once('extensions/translate_string/functions.php');
$tranlateString = get_defined_translation($string);
if ($tranlateString !== false) {
return $tranlateString;
elseif (isset($config['enterprise_installed'])) {
if ($config['enterprise_installed'] &&
isset($config['translate_string_extension_installed']) &&
$config['translate_string_extension_installed'] == 1 &&
array_key_exists('translate_string.php', $extensions)) {
enterprise_include_once('extensions/translate_string/functions.php');
$tranlateString = get_defined_translation($string);
if ($tranlateString !== false) {
return $tranlateString;
}
}
}