clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #827 from nupplaphil/issue/6338-php_notices 

[js_upload] Fixing missing extension index
This commit is contained in:
Hypolite Petovan 2019-03-13 22:50:57 -04:00 committed by GitHub
parent e8633a6c3d e0815309d0
commit c5ba1cae69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 126 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js_upload/js_upload.php
View File

@ -14,6 +14,7 @@
* Module Author: Chris Case
*
*/
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
@ -217,7 +218,7 @@ class qqUploadedFileXhr {
fclose($input);
fclose($temp);
if ($realSize != $this->getSize()){
if ($realSize != $this->getSize()) {
return false;
}
return true;
@ -307,7 +308,7 @@ class qqFileUploader {
*/
function handleUpload(){
if (!$this->file){
if (!$this->file) {
return ['error' => L10n::t('No files were uploaded.')];
}
@ -333,7 +334,10 @@ class qqFileUploader {
$pathinfo = pathinfo($this->file->getName());
$filename = $pathinfo['filename'];
$ext = $pathinfo['extension'];
if (!isset($pathinfo['extension'])) {
Logger::warning('extension isn\'t set.', ['filename' => $filename]);
}
$ext = defaults($pathinfo, 'extension', '');
if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){
$these = implode(', ', $this->allowedExtensions);
@ -342,13 +346,13 @@ class qqFileUploader {
if ($this->file->save()){
return [
'success'=>true,
'success' => true,
'path' => $this->file->getPath(),
'filename' => $filename . '.' . $ext
];
} else {
return [
'error'=> L10n::t('Upload was cancelled, or server error encountered'),
'error' => L10n::t('Upload was cancelled, or server error encountered'),
'path' => $this->file->getPath(),
'filename' => $filename . '.' . $ext
];