friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

profile_photo: use Photo model function to get photo and image

This commit is contained in:
fabrixxm 2018-11-21 16:29:23 +01:00 committed by Hypolite Petovan
parent 3ca0b0bf9d
commit 76579e02cc
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mod/profile_photo.php
View File

@ -73,14 +73,12 @@ function profile_photo_post(App $a)
$srcW = $_POST['xfinal'] - $srcX; $srcW = $_POST['xfinal'] - $srcX;
$srcH = $_POST['yfinal'] - $srcY; $srcH = $_POST['yfinal'] - $srcY;
$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1", DBA::escape($image_id), $base_image = Photo::selectFirst([], ['resource-id' => $image_id, 'uid' => local_user(), 'scale' => $scale]);
DBA::escape(local_user()), intval($scale));
$path = 'profile/' . $a->user['nickname']; $path = 'profile/' . $a->user['nickname'];
if (DBA::isResult($r)) { if (DBA::isResult($base_image)) {
$base_image = $r[0];
$Image = new Image($base_image['data'], $base_image['type']); $Image = Photo::getImageForPhoto($base_image);
if ($Image->isValid()) { if ($Image->isValid()) {
$Image->crop(300, $srcX, $srcY, $srcW, $srcH); $Image->crop(300, $srcX, $srcY, $srcW, $srcH);
@ -194,9 +192,14 @@ function profile_photo_content(App $a)
$resource_id = $a->argv[2]; $resource_id = $a->argv[2];
//die(":".local_user()); //die(":".local_user());
$r = Photo::select([], ["resource-id" => $resource_id, "uid" => local_user()], ["order" => ["scale"=>false]]);
/*
$r = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC", intval(local_user()), $r = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC", intval(local_user()),
DBA::escape($resource_id) DBA::escape($resource_id)
); );
*/
if (!DBA::isResult($r)) { if (!DBA::isResult($r)) {
notice(L10n::t('Permission denied.') . EOL); notice(L10n::t('Permission denied.') . EOL);
@ -230,7 +233,8 @@ function profile_photo_content(App $a)
$a->internalRedirect('profile/' . $a->user['nickname']); $a->internalRedirect('profile/' . $a->user['nickname']);
return; // NOTREACHED return; // NOTREACHED
} }
$ph = new Image($r[0]['data'], $r[0]['type']); $ph = Photo::getImageForPhoto($r[0]);
$imagecrop = profile_photo_crop_ui_head($a, $ph); $imagecrop = profile_photo_crop_ui_head($a, $ph);
// go ahead as we have jus uploaded a new photo to crop // go ahead as we have jus uploaded a new photo to crop
} }

2
src/Module/Photo.php
View File

@ -124,7 +124,7 @@ class Photo extends BaseModule
private static function stripExtension($name) private static function stripExtension($name)
{ {
$name = str_replace([".jpg", ".png", ".gif"], ["", "", ""], $name); $name = str_replace([".jpg", ".png", ".gif"], ["", "", ""], $name);
foreach (Image::supportedTypes() AS $m => $e) { foreach (Image::supportedTypes() as $m => $e) {
$name = str_replace("." . $e, "", $name); $name = str_replace("." . $e, "", $name);
} }
return $name; return $name;