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

fixed open online update

This commit is contained in:
alejandro-campos 2020-09-01 08:12:57 +02:00
parent 881a8e6a01
commit 0345d36d08
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions.php
View File

@ -3361,6 +3361,10 @@ function get_number_of_mr($package, $ent, $offline)
$sqlfiles_num = preg_replace($pattern, $replacement, $sqlfiles); $sqlfiles_num = preg_replace($pattern, $replacement, $sqlfiles);
foreach ($sqlfiles_num as $num) { foreach ($sqlfiles_num as $num) {
if ($num <= $config['MR']) {
continue;
}
$mr_size[] = $num; $mr_size[] = $num;
} }
} }

12
pandora_console/include/functions_update_manager.php
View File

@ -53,6 +53,7 @@ function update_manager_verify_registration()
return false; return false;
} }
/** /**
* Check if a trial license is in use. * Check if a trial license is in use.
* *
@ -63,7 +64,7 @@ function update_manager_verify_trial()
global $config; global $config;
if (isset($config['license_licensed_to']) 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; return true;
} }
@ -71,6 +72,7 @@ function update_manager_verify_trial()
return false; return false;
} }
/** /**
* Parses responses from configuration wizard. * Parses responses from configuration wizard.
* *
@ -1841,9 +1843,15 @@ function update_manager_recurse_copy($src, $dst, $black_list)
while (false !== ( $file = readdir($dir))) { while (false !== ( $file = readdir($dir))) {
if (( $file != '.' ) && ( $file != '..' ) && (!in_array($file, $black_list))) { if (( $file != '.' ) && ( $file != '..' ) && (!in_array($file, $black_list))) {
if (is_dir($src.'/'.$file)) { if (is_dir($src.'/'.$file)) {
$dir_dst = $dst;
if ($file != 'pandora_console') {
$dir_dst .= '/'.$file;
}
if (!update_manager_recurse_copy( if (!update_manager_recurse_copy(
$src.'/'.$file, $src.'/'.$file,
$dst.'/'.$file, $dir_dst,
$black_list $black_list
) )
) { ) {