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

Merge pull request #8812 from josh4trunks/avatar_rotate 

Automatically Rotate Avatar based on exif data
This commit is contained in:
Vincent Petry 2014-06-02 19:06:46 +02:00
parent e8ec81110d d0548b92c0
commit c88c0b9a13
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
core/avatar/controller.php
View File

@ -46,7 +46,12 @@ class Controller {
if (isset($_POST['path'])) {
$path = stripslashes($_POST['path']);
$view = new \OC\Files\View('/'.$user.'/files');
$newAvatar = $view->file_get_contents($path);
$fileInfo = $view->getFileInfo($path);
if($fileInfo['encrypted'] === true) {
$fileName = $view->toTmpFile($path);
} else {
$fileName = $view->getLocalFile($path);
}
} elseif (!empty($_FILES)) {
$files = $_FILES['files'];
if (
@ -54,7 +59,9 @@ class Controller {
is_uploaded_file($files['tmp_name'][0]) &&
!\OC\Files\Filesystem::isFileBlacklisted($files['tmp_name'][0])
) {
$newAvatar = file_get_contents($files['tmp_name'][0]);
\OC\Cache::set('avatar_upload', file_get_contents($files['tmp_name'][0]), 7200);
$view = new \OC\Files\View('/'.$user.'/cache');
$fileName = $view->getLocalFile('avatar_upload');
unlink($files['tmp_name'][0]);
}
} else {
@ -64,11 +71,9 @@ class Controller {
}
try {
$avatar = new \OC_Avatar($user);
$avatar->set($newAvatar);
\OC_JSON::success();
} catch (\OC\NotSquareException $e) {
$image = new \OC_Image($newAvatar);
$image = new \OC_Image();
$image->loadFromFile($fileName);
$image->fixOrientation();
if ($image->valid()) {
\OC\Cache::set('tmpavatar', $image->data(), 7200);