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

Added code to rr system

Browse Source
This commit is contained in:
Arturo Gonzalez 2017-03-16 16:28:27 +01:00
parent 54959257c0
commit c8a0946eda
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,6 @@ if (is_ajax ()) {
$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";
html_debug($file, true);
$dangerous_query = false; $dangerous_query = false;
$mr_file = fopen($file, "r"); $mr_file = fopen($file, "r");
while (!feof($mr_file)) { while (!feof($mr_file)) {
@ -50,8 +49,6 @@ if (is_ajax ()) {
else { else {
if (file_exists($dir) && is_dir($dir)) { if (file_exists($dir) && is_dir($dir)) {
if (is_readable($dir)) { if (is_readable($dir)) {
html_debug($number, true);
html_debug($config['MR'], true);
if (($number > $config['MR'] + 1) || ($number == $config['MR'])) { if (($number > $config['MR'] + 1) || ($number == $config['MR'])) {
$message = "bad_mr_filename"; $message = "bad_mr_filename";
} }
@ -64,6 +61,7 @@ if (is_ajax ()) {
if (copy($file, $file_dest)) { if (copy($file, $file_dest)) {
unlink($file); unlink($file);
} }
$message = "bad_mr_filename";
} }
else { else {
$result = db_run_sql_file($file); $result = db_run_sql_file($file);
@ -79,12 +77,10 @@ if (is_ajax ()) {
} }
$file_dest = $config["homedir"] . "/extras/mr/updated/$number.sql"; $file_dest = $config["homedir"] . "/extras/mr/updated/$number.sql";
html_debug("FILE EXISTS: " . (int)file_exists($file_dest), true);
if (file_exists($file_dest) !== 0) { chmod($file, 0777);
unlink($file); chmod($config["homedir"] . "/extras/mr/updated", 0777);
} if (copy($file, $file_dest)) {
else if (copy($file, $file_dest)) {
html_debug("FILE: " . $file, true);
unlink($file); unlink($file);
} }
} }

3
pandora_console/include/functions_db.php
View File

@ -1742,7 +1742,8 @@ function db_check_minor_relase_available_to_um ($package) {
$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");