mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-24 08:14:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve system import/export

Browse Source 
Miss checking presence of zip extension during import

See https://github.com/marienfressinaud/FreshRSS/issues/494
This commit is contained in:
Marien Fressinaud
2014-08-11 19:02:27 +02:00
parent bc71a577fe
commit 94570aaf5a
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Controllers/importExportController.php
View File

@@ -39,7 +39,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
// We try to list all files according to their type
// A zip file is first opened and then its files are listed
$list = array();
if ($type_file === 'zip') {
if ($type_file === 'zip' && extension_loaded('zip')) {
$zip = zip_open($file['tmp_name']);
while (($zipfile = zip_read($zip)) !== false) {
@@ -56,6 +56,14 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
}
zip_close($zip);
} elseif ($type_file === 'zip') {
// Zip extension is not loaded
Minz_Session::_param('notification', array(
'type' => 'bad',
'content' => _t('no_zip_extension')
));
Minz_Request::forward(array('c' => 'importExport'), true);
} elseif ($type_file !== 'unknown') {
$list_files[$type_file][] = file_get_contents(
$file['tmp_name']