tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added a lot of modifications to integrate mr with um

Browse Source
This commit is contained in:
Arturo Gonzalez 2017-03-16 19:14:19 +01:00
parent 317b5cfb04
commit 831b5e2c7d
5 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/ajax/rolling_release.ajax.php
View File

@ -23,13 +23,18 @@ if (is_ajax ()) {
$number = get_parameter('number'); $number = get_parameter('number');
$package = get_parameter('package'); $package = get_parameter('package');
$ent = get_parameter('ent'); $ent = get_parameter('ent');
$offline = get_parameter('offline');
if (!$ent) { if (!$ent) {
$dir = $config['attachment_store'] . "/last_package/downloads/extras/mr"; $dir = $config['attachment_store'] . "/last_package/downloads/extras/mr";
} }
else { 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"; $file = "$dir/$number.sql";
$dangerous_query = false; $dangerous_query = false;

5
pandora_console/include/ajax/update_manager.ajax.php
View File

@ -359,13 +359,14 @@ if ($check_online_free_packages) {
if ($search_minor) { if ($search_minor) {
$package = get_parameter('package', ''); $package = get_parameter('package', '');
$ent = get_parameter('ent', false); $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; $return['have_minor'] = false;
if ($have_minor_releases) { if ($have_minor_releases) {
$return['have_minor'] = true; $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; $return['mr'] = $size_mr;
} }

9
pandora_console/include/functions.php
View File

@ -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; global $config;
if (!$ent) { if (!$ent) {
$dir = $config['attachment_store'] . "/last_package/downloads/extras/mr"; $dir = $config['attachment_store'] . "/last_package/downloads/extras/mr";
} }
else { 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(); $mr_size = array();

11
pandora_console/include/functions_db.php
View File

@ -1720,14 +1720,19 @@ function db_check_minor_relase_available () {
* *
* @return bool Return if minor release is available or not * @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; global $config;
if (!$ent) { if (!$ent) {
$dir = $config['attachment_store'] . "/last_package/downloads/extras/mr"; $dir = $config['attachment_store'] . "/last_package/downloads/extras/mr";
} }
else { 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; $have_minor_release = false;
@ -1747,8 +1752,6 @@ function db_check_minor_relase_available_to_um ($package, $ent) {
$exists = false; $exists = false;
foreach ($sqlfiles_num as $num) { foreach ($sqlfiles_num as $num) {
$file_dest = $config["homedir"] . "/extras/mr/updated/$num.sql"; $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)) { if (file_exists($file_dest)) {
$exists = true; $exists = true;
unlink("$dir/$num.sql"); unlink("$dir/$num.sql");

11
pandora_console/include/javascript/update_manager.js
View File

@ -210,6 +210,8 @@ function install_package (package, homeurl) {
var parameters = {}; var parameters = {};
parameters['page'] = 'include/ajax/update_manager.ajax'; parameters['page'] = 'include/ajax/update_manager.ajax';
parameters['search_minor'] = 1; parameters['search_minor'] = 1;
parameters['package'] = package;
parameters['ent'] = 1;
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
@ -231,7 +233,7 @@ function install_package (package, homeurl) {
buttons: { buttons: {
"Apply MR": function () { "Apply MR": function () {
var err = []; var err = [];
err = apply_minor_release(data['mr'], 1); err = apply_minor_release(data['mr'], package, 1, 1);
if (!err['error']) { if (!err['error']) {
if (err['message'] == 'bad_mr_filename') { if (err['message'] == 'bad_mr_filename') {
@ -957,6 +959,7 @@ function install_free_package_prev_step(package, version, homeurl) {
parameters['search_minor'] = 1; parameters['search_minor'] = 1;
parameters['ent'] = 0; parameters['ent'] = 0;
parameters['package'] = package; parameters['package'] = package;
parameters['offline'] = 0;
jQuery.post( jQuery.post(
home_url + "ajax.php", home_url + "ajax.php",
@ -979,7 +982,7 @@ function install_free_package_prev_step(package, version, homeurl) {
buttons: { buttons: {
"Apply MR": function () { "Apply MR": function () {
var err = []; var err = [];
err = apply_minor_release(data['mr'], 0); err = apply_minor_release(data['mr'], package, 0, 0);
if (!err['error']) { if (!err['error']) {
if (err['message'] == 'bad_mr_filename') { 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 = []; var error = [];
error['error'] = false; error['error'] = false;
$('#mr_dialog2').empty(); $('#mr_dialog2').empty();
@ -1472,6 +1475,8 @@ function apply_minor_release (n_mr, ent) {
params["updare_rr"] = 1; params["updare_rr"] = 1;
params["number"] = mr; params["number"] = mr;
params["ent"] = ent; params["ent"] = ent;
params["pkg"] = pkg;
params["off"] = off;
params["page"] = "include/ajax/rolling_release.ajax"; params["page"] = "include/ajax/rolling_release.ajax";
jQuery.ajax ({ jQuery.ajax ({