kashire/lainchan
4
0
Fork 0
Code Issues 9 Pull Requests Releases Wiki Activity

Close and unzip zip file upon errors (?/upgrade)

Browse Source
This commit is contained in:
Michael Save 2012-03-21 22:04:58 +11:00
parent cf6bf2c7dc
commit 29dc55c4e8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod.php
View File

@ -350,6 +350,8 @@
} }
} }
$zip->close();
if($errors) { if($errors) {
$body = '<div class="ban"><h2>Error(s) upgrading</h2><p>Tinyboard can not self-upgrade until the following is fixed:</p><ul>'; $body = '<div class="ban"><h2>Error(s) upgrading</h2><p>Tinyboard can not self-upgrade until the following is fixed:</p><ul>';
foreach($errors as $error) { foreach($errors as $error) {
@ -357,6 +359,8 @@
} }
$body .= '</ul><p>Please fix the above errors and refresh to try again.</p></div>'; $body .= '</ul><p>Please fix the above errors and refresh to try again.</p></div>';
unlink($temp);
echo Element('page.html', Array( echo Element('page.html', Array(
'config' => $config, 'config' => $config,
'title' => 'Error(s) upgrading', 'title' => 'Error(s) upgrading',
@ -365,13 +369,11 @@
exit; exit;
} }
$zip->close();
// For some reason, reading the ZIP entries in PHP doesn't seem to work very well. // For some reason, reading the ZIP entries in PHP doesn't seem to work very well.
// Use shell instead. // Use shell instead.
shell_exec('TEMP_DIR=$(mktemp -d); unzip -q ' . escapeshellarg($temp) . ' -d $TEMP_DIR -x "' . escapeshellarg($dir) . 'inc/instance-config.php"; mv -v $TEMP_DIR/' . escapeshellarg($dir) . '* "' . getcwd() . '"; rm -rf $TEMP_DIR'); shell_exec('TEMP_DIR=$(mktemp -d); unzip -q ' . escapeshellarg($temp) . ' -d $TEMP_DIR -x "' . escapeshellarg($dir) . 'inc/instance-config.php"; mv -v $TEMP_DIR/' . escapeshellarg($dir) . '* "' . getcwd() . '"; rm -rf $TEMP_DIR');
unlink($temp); unlink($temp);
echo Element('page.html', Array( echo Element('page.html', Array(
'config' => $config, 'config' => $config,