Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-01-27 09:50:03 +01:00
Code Issues Packages Projects Releases Activity

Reverted zip changes while adding extra details about unzip failure

Browse Source
This commit is contained in:
Djamil Legato
2018-03-29 13:07:11 -07:00
parent 3c26d831fd
commit 3248b97997
1 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
system/src/Grav/Common/GPM/Installer.php
View File

@@ -43,6 +43,11 @@ class Installer
*/
protected static $error = 0;
/**
* @var integer Zip Error Code
*/
protected static $error_zip = 0;
/**
* @var string Post install message
*/
@@ -189,7 +194,8 @@ class Installer
return $extracted_folder;
}
self::$error = $archive;
self::$error = self::ZIP_EXTRACT_ERROR;
self::$error_zip = $archive;
return false;
}
@@ -459,39 +465,42 @@ class Installer
break;
case self::ZIP_EXTRACT_ERROR:
$msg = 'An error occurred while extracting the package';
break;
$msg = 'Unable to extract the package. ';
if (self::$error_zip) {
switch(self::$error_zip) {
case \ZipArchive::ER_EXISTS:
$msg .= "File already exists.";
break;
case \ZipArchive::ER_EXISTS:
$msg = "File already exists.";
break;
case \ZipArchive::ER_INCONS:
$msg .= "Zip archive inconsistent.";
break;
case \ZipArchive::ER_INCONS:
$msg = "Zip archive inconsistent.";
break;
case \ZipArchive::ER_MEMORY:
$msg .= "Malloc failure.";
break;
case \ZipArchive::ER_MEMORY:
$msg = "Malloc failure.";
break;
case \ZipArchive::ER_NOENT:
$msg .= "No such file.";
break;
case \ZipArchive::ER_NOENT:
$msg = "No such file.";
break;
case \ZipArchive::ER_NOZIP:
$msg .= "Not a zip archive.";
break;
case \ZipArchive::ER_NOZIP:
$msg = "Not a zip archive.";
break;
case \ZipArchive::ER_OPEN:
$msg .= "Can't open file.";
break;
case \ZipArchive::ER_OPEN:
$msg = "Can't open file.";
break;
case \ZipArchive::ER_READ:
$msg .= "Read error.";
break;
case \ZipArchive::ER_READ:
$msg = "Read error.";
break;
case \ZipArchive::ER_SEEK:
$msg = "Seek error.";
case \ZipArchive::ER_SEEK:
$msg .= "Seek error.";
break;
}
}
break;
default: