maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

extract auto-update archive to correct folder regardless of the folder being named 'froxlor' or not, future auto-update archives will not have the froxlor-folder prefixed, fixes #1645

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-08-04 21:49:33 +02:00
parent b2f815617c
commit cdd97b142f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin_autoupdate.php
View File

@@ -166,8 +166,8 @@ elseif ($page == 'extract') {
$zip = new ZipArchive; $zip = new ZipArchive;
$res = $zip->open($localArchive); $res = $zip->open($localArchive);
if ($res === true) { if ($res === true) {
$log->logAction(ADM_ACTION, LOG_NOTICE, "Extracting ".$localArchive." to ".dirname(FROXLOR_INSTALL_DIR)); $log->logAction(ADM_ACTION, LOG_NOTICE, "Extracting ".$localArchive." to ".FROXLOR_INSTALL_DIR);
$zip->extractTo(dirname(FROXLOR_INSTALL_DIR)); $zip->extractTo(FROXLOR_INSTALL_DIR);
$zip->close(); $zip->close();
// success - remove unused archive // success - remove unused archive
@unlink($localArchive); @unlink($localArchive);