diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 7d5af653cb..9485d39fc1 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -3361,6 +3361,10 @@ function get_number_of_mr($package, $ent, $offline) $sqlfiles_num = preg_replace($pattern, $replacement, $sqlfiles); foreach ($sqlfiles_num as $num) { + if ($num <= $config['MR']) { + continue; + } + $mr_size[] = $num; } } diff --git a/pandora_console/include/functions_update_manager.php b/pandora_console/include/functions_update_manager.php index 2ea5615088..77b6e5e432 100755 --- a/pandora_console/include/functions_update_manager.php +++ b/pandora_console/include/functions_update_manager.php @@ -53,6 +53,7 @@ function update_manager_verify_registration() return false; } + /** * Check if a trial license is in use. * @@ -63,7 +64,7 @@ function update_manager_verify_trial() global $config; if (isset($config['license_licensed_to']) - && strstr($config['license_licensed_to'], 'info@pandorafms.com') !== FALSE + && strstr($config['license_licensed_to'], 'info@pandorafms.com') !== false ) { return true; } @@ -71,6 +72,7 @@ function update_manager_verify_trial() return false; } + /** * Parses responses from configuration wizard. * @@ -1841,9 +1843,15 @@ function update_manager_recurse_copy($src, $dst, $black_list) while (false !== ( $file = readdir($dir))) { if (( $file != '.' ) && ( $file != '..' ) && (!in_array($file, $black_list))) { if (is_dir($src.'/'.$file)) { + $dir_dst = $dst; + + if ($file != 'pandora_console') { + $dir_dst .= '/'.$file; + } + if (!update_manager_recurse_copy( $src.'/'.$file, - $dst.'/'.$file, + $dir_dst, $black_list ) ) {