Mascali
/
raspisms
mirror of https://github.com/RaspbianFrance/raspisms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bad mimetype when importing csv from a windows computer

This commit is contained in:
osaajani 2020-07-03 03:59:37 +02:00
parent b12738073b
commit cafe210f69
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/internals/Tool.php
View File

@ -214,6 +214,7 @@ namespace controllers\internals;
'content' => 'Une erreur inconnue est survenue.',
'error_code' => $file['error'] ?? 99,
'mime_type' => false,
'extension' => false,
];
if (UPLOAD_ERR_OK !== $file['error'])
@ -265,7 +266,8 @@ namespace controllers\internals;
return $result;
}
$result['mime_type'] = 'text/plain' === mime_content_type($tmp_filename) ? $file['type'] : mime_content_type($tmp_filename);
$result['extension'] = pathinfo($file['name'])['extension'];
$result['mime_type'] = mime_content_type($tmp_filename);
$file_handler = fopen($tmp_filename, 'r');
$result['success'] = true;

13
controllers/publics/Contact.php
View File

@ -302,7 +302,18 @@ namespace controllers\publics;
break;
default:
$invalid_type = true;
if ($read_file['extension'] === 'csv')
{
$result = $this->internal_contact->import_csv($id_user, $read_file['content']);
}
elseif ($read_file['extension'] === 'json')
{
$result = $this->internal_contact->import_json($id_user, $read_file['content']);
}
else
{
$invalid_type = true;
}
}
if ($invalid_type)