AS1024
/
Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch error when trying to upload empty or invalid avatar

This commit is contained in:
Manfred Hoffmann 2021-04-20 07:42:58 +02:00 committed by GitHub
parent 6f8f5aff33
commit ae39544e10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 100 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Controller/AvatarFileController.php
View File

@ -33,8 +33,14 @@ class AvatarFileController extends BaseController
$this->checkCSRFParam();
$user = $this->getUser();
if (! $this->avatarFileModel->uploadImageFile($user['id'], $this->request->getFileInfo('avatar'))) {
$this->flash->failure(t('Unable to upload files, check the permissions of your data folder.'));
if (! $this->request->getFileInfo('avatar')['name']) {
$this->flash->failure(t('You must select a file to upload as your avatar!'));
} elseif (! $this->avatarFileModel->isAvatarImage($this->request->getFileInfo('avatar')['name'])) {
$this->flash->failure(t('The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)'));
} else {
if (! $this->avatarFileModel->uploadImageFile($user['id'], $this->request->getFileInfo('avatar'))) {
$this->flash->failure(t('Unable to upload files, check the permissions of your data folder.'));
}
}
$this->renderResponse($user['id']);

2
app/Locale/bs_BA/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/ca_ES/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/cs_CZ/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - Bitcoin',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/da_DK/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - Bitcoin',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/de_DE/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - Bitcoin',
'You must select a file to upload as your avatar!' => 'Sie müssen eine Datei auswählen, die als Avatar hochgeladen werden soll!',
'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => 'Die hochgeladene Datei ist kein gültiges Bild! (Nur *.gif, *.jpg, *.jpeg and *.png sind erlaubt!)',
);

2
app/Locale/de_DE_du/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - Bitcoin',
'You must select a file to upload as your avatar!' => 'Du musst eine Datei auswählen, die als Avatar hochgeladen werden soll!',
'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => 'Die hochgeladene Datei ist kein gültiges Bild! (Nur *.gif, *.jpg, *.jpeg and *.png sind erlaubt!)',
);

2
app/Locale/el_GR/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/es_ES/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - Bitcoin',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/es_VE/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - Bitcoin',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/fa_IR/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - بیت کوین',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/fi_FI/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/fr_FR/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
'Estimated vs actual time per column' => 'Temps estimé vs temps réel par colonne',
'HUF - Hungarian Forint' => 'HUF - Forint hongrois',
'XBT - Bitcoin' => 'XBT - Bitcoin',
'You must select a file to upload as your avatar!' => 'Vous devez sélectionner un fichier à télécharger pour votre avatar !',
'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => 'Le fichier que vous avez téléchargé n\'est pas une image valide ! (Seuls * .gif, * .jpg, * .jpeg et * .png sont autorisés !)',
);

2
app/Locale/hr_HR/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/hu_HU/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
'HUF - Hungarian Forint' => 'HUF – magyar forint',
'XBT - Bitcoin' => 'XBT – Bitcoin',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/id_ID/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - Bitcoin',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/it_IT/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/ja_JP/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - Bitcoin',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/ko_KR/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/mk_MK/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - биткоин',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/my_MY/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/nb_NO/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/nl_NL/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/pl_PL/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - Bitcoin',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/pt_BR/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - Bitcoin',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/pt_PT/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - Bitcoin',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/ro_RO/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/ru_RU/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - Биткоин',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/sk_SK/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT – Bitcoin',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/sr_Latn_RS/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - Bitkoin',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/sv_SE/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/th_TH/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/tr_TR/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - Bitcoin',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/uk_UA/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT – Біткоїн',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/vi_VN/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/zh_CN/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
'XBT - Bitcoin' => 'XBT - 比特币',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

2
app/Locale/zh_TW/translations.php
View File

@ -1427,4 +1427,6 @@ return array(
// 'Estimated vs actual time per column' => '',
// 'HUF - Hungarian Forint' => '',
// 'XBT - Bitcoin' => '',
// 'You must select a file to upload as your avatar!' => '',
// 'The file you uploaded is not a valid image! (Only *.gif, *.jpg, *.jpeg and *.png are allowed!)' => '',
);

20
app/Model/AvatarFileModel.php
View File

@ -136,4 +136,24 @@ class AvatarFileModel extends Base
{
return implode(DIRECTORY_SEPARATOR, array(self::PATH_PREFIX, $user_id, hash('sha1', $filename.time())));
}
/**
* Check if a filename is an image (file types that can be shown as avatar)
*
* @access public
* @param string $filename Filename
* @return bool
*/
public function isAvatarImage($filename)
{
switch (get_file_extension($filename)) {
case 'jpeg':
case 'jpg':
case 'png':
case 'gif':
return true;
}
return false;
}
}