diff --git a/system/src/Grav/Common/GPM/Installer.php b/system/src/Grav/Common/GPM/Installer.php index 25507f261..819806bfd 100644 --- a/system/src/Grav/Common/GPM/Installer.php +++ b/system/src/Grav/Common/GPM/Installer.php @@ -189,60 +189,10 @@ class Installer return $extracted_folder; } - self::$error = self::getZipError($archive); + self::$error = $archive; return false; } - /** - * Output a more useful ZIP error - * - * @param $res - * @return string - */ - protected static function getZipError($res) - { - switch($res){ - case \ZipArchive::ER_EXISTS: - $error = "File already exists."; - break; - - case \ZipArchive::ER_INCONS: - $error = "Zip archive inconsistent."; - break; - - case \ZipArchive::ER_MEMORY: - $error = "Malloc failure."; - break; - - case \ZipArchive::ER_NOENT: - $error = "No such file."; - break; - - case \ZipArchive::ER_NOZIP: - $error = "Not a zip archive."; - break; - - case \ZipArchive::ER_OPEN: - $error = "Can't open file."; - break; - - case \ZipArchive::ER_READ: - $error = "Read error."; - break; - - case \ZipArchive::ER_SEEK: - $error = "Seek error."; - break; - - default: - $error = self::ZIP_EXTRACT_ERROR; - break; - } - - return $error; - } - - /** * Instantiates and returns the package installer class * @@ -512,6 +462,38 @@ class Installer $msg = 'An error occurred while extracting the package'; break; + case \ZipArchive::ER_EXISTS: + $msg = "File already exists."; + break; + + case \ZipArchive::ER_INCONS: + $msg = "Zip archive inconsistent."; + break; + + case \ZipArchive::ER_MEMORY: + $msg = "Malloc failure."; + break; + + case \ZipArchive::ER_NOENT: + $msg = "No such file."; + break; + + case \ZipArchive::ER_NOZIP: + $msg = "Not a zip archive."; + break; + + case \ZipArchive::ER_OPEN: + $msg = "Can't open file."; + break; + + case \ZipArchive::ER_READ: + $msg = "Read error."; + break; + + case \ZipArchive::ER_SEEK: + $msg = "Seek error."; + break; + default: $msg = 'Unknown Error'; break;