From 831b5e2c7df539325506ee28b011a3df15b4a019 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Thu, 16 Mar 2017 19:14:19 +0100 Subject: [PATCH] Added a lot of modifications to integrate mr with um --- pandora_console/include/ajax/rolling_release.ajax.php | 9 +++++++-- pandora_console/include/ajax/update_manager.ajax.php | 5 +++-- pandora_console/include/functions.php | 9 +++++++-- pandora_console/include/functions_db.php | 11 +++++++---- pandora_console/include/javascript/update_manager.js | 11 ++++++++--- 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/pandora_console/include/ajax/rolling_release.ajax.php b/pandora_console/include/ajax/rolling_release.ajax.php index f28deec523..0415dcc2a6 100644 --- a/pandora_console/include/ajax/rolling_release.ajax.php +++ b/pandora_console/include/ajax/rolling_release.ajax.php @@ -23,13 +23,18 @@ if (is_ajax ()) { $number = get_parameter('number'); $package = get_parameter('package'); $ent = get_parameter('ent'); + $offline = get_parameter('offline'); if (!$ent) { $dir = $config['attachment_store'] . "/last_package/downloads/extras/mr"; } else { - $dir = sys_get_temp_dir() . "/pandora_oum/" . $package . "/extras/mr"; + if ($offline) { + $dir = $package . "extras/mr"; + } + else { + $dir = sys_get_temp_dir() . "/pandora_oum/" . $package . "/extras/mr"; + } } - $dir = sys_get_temp_dir() . "/pandora_oum/" . $package . "/extras/mr"; $file = "$dir/$number.sql"; $dangerous_query = false; diff --git a/pandora_console/include/ajax/update_manager.ajax.php b/pandora_console/include/ajax/update_manager.ajax.php index 3ff6a67aa7..d5eccfee0c 100644 --- a/pandora_console/include/ajax/update_manager.ajax.php +++ b/pandora_console/include/ajax/update_manager.ajax.php @@ -359,13 +359,14 @@ if ($check_online_free_packages) { if ($search_minor) { $package = get_parameter('package', ''); $ent = get_parameter('ent', false); + $offline = get_parameter('offline', false); - $have_minor_releases = db_check_minor_relase_available_to_um($package, $ent); + $have_minor_releases = db_check_minor_relase_available_to_um($package, $ent, $offline); $return['have_minor'] = false; if ($have_minor_releases) { $return['have_minor'] = true; - $size_mr = get_number_of_mr($package, $ent); + $size_mr = get_number_of_mr($package, $ent, $offline); $return['mr'] = $size_mr; } diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 90d2407ac1..c5e2b59993 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -2683,14 +2683,19 @@ function update_config_token ($cfgtoken, $cfgvalue) { } } -function get_number_of_mr($package, $ent) { +function get_number_of_mr($package, $ent, $offline) { global $config; if (!$ent) { $dir = $config['attachment_store'] . "/last_package/downloads/extras/mr"; } else { - $dir = sys_get_temp_dir() . "/pandora_oum/" . $package . "/extras/mr"; + if ($offline) { + $dir = $package . "extras/mr"; + } + else { + $dir = sys_get_temp_dir() . "/pandora_oum/" . $package . "/extras/mr"; + } } $mr_size = array(); diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index f87c67297c..049f624914 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -1720,14 +1720,19 @@ function db_check_minor_relase_available () { * * @return bool Return if minor release is available or not */ -function db_check_minor_relase_available_to_um ($package, $ent) { +function db_check_minor_relase_available_to_um ($package, $ent, $offline) { global $config; if (!$ent) { $dir = $config['attachment_store'] . "/last_package/downloads/extras/mr"; } else { - $dir = sys_get_temp_dir() . "/pandora_oum/" . $package . "/extras/mr"; + if ($offline) { + $dir = $package . "extras/mr"; + } + else { + $dir = sys_get_temp_dir() . "/pandora_oum/" . $package . "/extras/mr"; + } } $have_minor_release = false; @@ -1747,8 +1752,6 @@ function db_check_minor_relase_available_to_um ($package, $ent) { $exists = false; foreach ($sqlfiles_num as $num) { $file_dest = $config["homedir"] . "/extras/mr/updated/$num.sql"; - html_debug("AAAAA " . $file_dest, true); - html_debug(file_exists($file_dest), true); if (file_exists($file_dest)) { $exists = true; unlink("$dir/$num.sql"); diff --git a/pandora_console/include/javascript/update_manager.js b/pandora_console/include/javascript/update_manager.js index cc2619f115..17e3f99f94 100644 --- a/pandora_console/include/javascript/update_manager.js +++ b/pandora_console/include/javascript/update_manager.js @@ -210,6 +210,8 @@ function install_package (package, homeurl) { var parameters = {}; parameters['page'] = 'include/ajax/update_manager.ajax'; parameters['search_minor'] = 1; + parameters['package'] = package; + parameters['ent'] = 1; $.ajax({ type: 'POST', @@ -231,7 +233,7 @@ function install_package (package, homeurl) { buttons: { "Apply MR": function () { var err = []; - err = apply_minor_release(data['mr'], 1); + err = apply_minor_release(data['mr'], package, 1, 1); if (!err['error']) { if (err['message'] == 'bad_mr_filename') { @@ -957,6 +959,7 @@ function install_free_package_prev_step(package, version, homeurl) { parameters['search_minor'] = 1; parameters['ent'] = 0; parameters['package'] = package; + parameters['offline'] = 0; jQuery.post( home_url + "ajax.php", @@ -979,7 +982,7 @@ function install_free_package_prev_step(package, version, homeurl) { buttons: { "Apply MR": function () { var err = []; - err = apply_minor_release(data['mr'], 0); + err = apply_minor_release(data['mr'], package, 0, 0); if (!err['error']) { if (err['message'] == 'bad_mr_filename') { @@ -1463,7 +1466,7 @@ function install_free_package(package, version, homeurl) { }); } -function apply_minor_release (n_mr, ent) { +function apply_minor_release (n_mr, pkg, ent, off) { var error = []; error['error'] = false; $('#mr_dialog2').empty(); @@ -1472,6 +1475,8 @@ function apply_minor_release (n_mr, ent) { params["updare_rr"] = 1; params["number"] = mr; params["ent"] = ent; + params["pkg"] = pkg; + params["off"] = off; params["page"] = "include/ajax/rolling_release.ajax"; jQuery.ajax ({