mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix @tanghus's complains in avatars and clean up cropper after closing with "x"

This commit is contained in:
kondou 2013-09-01 19:12:54 +02:00
parent 76b1b5b6a3
commit c95d4cafa9
2 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/avatar/controller.php
View File

@ -46,7 +46,11 @@ class OC_Core_Avatar_Controller {
if (!empty($_FILES)) { if (!empty($_FILES)) {
$files = $_FILES['files']; $files = $_FILES['files'];
if ($files['error'][0] === 0) { if (
$files['error'][0] === 0 &&
is_uploaded_file($files['tmp_name'][0]) &&
!\OC\Files\Filesystem::isFileBlacklisted($files['tmp_name'][0])
) {
$newAvatar = file_get_contents($files['tmp_name'][0]); $newAvatar = file_get_contents($files['tmp_name'][0]);
unlink($files['tmp_name'][0]); unlink($files['tmp_name'][0]);
} }
@ -59,8 +63,21 @@ class OC_Core_Avatar_Controller {
} catch (\OC\NotSquareException $e) { } catch (\OC\NotSquareException $e) {
$image = new \OC_Image($newAvatar); $image = new \OC_Image($newAvatar);
\OC_Cache::set('tmpavatar', $image->data(), 7200); if ($image->valid()) {
\OC_JSON::error(array("data" => array("message" => "notsquare") )); \OC_Cache::set('tmpavatar', $image->data(), 7200);
\OC_JSON::error(array("data" => array("message" => "notsquare") ));
} else {
$l = new \OC_L10n('core');
$type = substr($image->mimeType(), -3);
if ($type === 'peg') { $type = 'jpg'; }
if ($type !== 'jpg' && $type !== 'png') {
\OC_JSON::error(array("data" => array("message" => $l->t("Unknown filetype")) ));
}
if (!$img->valid()) {
\OC_JSON::error(array("data" => array("message" => $l->t("Invalid image")) ));
}
}
} catch (\Exception $e) { } catch (\Exception $e) {
\OC_JSON::error(array("data" => array("message" => $e->getMessage()) )); \OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
} }
@ -74,7 +91,7 @@ class OC_Core_Avatar_Controller {
$avatar->remove($user); $avatar->remove($user);
\OC_JSON::success(); \OC_JSON::success();
} catch (\Exception $e) { } catch (\Exception $e) {
\OC_JSON::error(array("data" => array ("message" => $e->getMessage()) )); \OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
} }
} }
@ -93,11 +110,18 @@ class OC_Core_Avatar_Controller {
public static function postCroppedAvatar($args) { public static function postCroppedAvatar($args) {
$user = OC_User::getUser(); $user = OC_User::getUser();
$crop = $_POST['crop']; if (isset($_POST['crop'])) {
$crop = $_POST['crop'];
} else {
$l = new \OC_L10n('core');
\OC_JSON::error(array("data" => array("message" => $l->t("No crop data provided")) ));
return;
}
$tmpavatar = \OC_Cache::get('tmpavatar'); $tmpavatar = \OC_Cache::get('tmpavatar');
if ($tmpavatar === false) { if ($tmpavatar === false) {
\OC_JSON::error(); $l = new \OC_L10n('core');
\OC_JSON::error(array("data" => array("message" => $l->t("No temporary avatar available, try again")) ));
return; return;
} }

8
settings/js/personal.js
View File

@ -69,7 +69,8 @@ function showAvatarCropper() {
onSelect: saveCoords, onSelect: saveCoords,
aspectRatio: 1, aspectRatio: 1,
boxHeight: 500, boxHeight: 500,
boxWidth: 500 boxWidth: 500,
setSelect: [0, 0, 300, 300]
}); });
$cropperbox.ocdialog({ $cropperbox.ocdialog({
@ -77,7 +78,10 @@ function showAvatarCropper() {
text: t('settings', 'Crop'), text: t('settings', 'Crop'),
click: sendCropData, click: sendCropData,
defaultButton: true defaultButton: true
}] }],
close: function(){
$(this).remove();
}
}); });
}); });
} }