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

code standards

This commit is contained in:
Philipp Holzer 2019-03-01 17:27:46 +01:00
parent 2daadb8c36
commit b4a59f32c7
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Model/Photo.php
View File

@ -369,20 +369,20 @@ class Photo extends BaseObject
$logger = $a->getLogger(); $logger = $a->getLogger();
$profiler = $a->getProfiler(); $profiler = $a->getProfiler();
$isStored = DBA::p( $stmtUser = DBA::p(
"SELECT `user`.`nickname`, `user`.`page-flags`, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid` "SELECT `user`.`nickname`, `user`.`page-flags`, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
WHERE `user`.`uid` = %d AND `user`.`blocked` = 0 AND `contact`.`self` = 1 LIMIT 1", WHERE `user`.`uid` = %d AND `user`.`blocked` = 0 AND `contact`.`self` = 1 LIMIT 1",
intval($uid) intval($uid)
); );
if (!DBA::isResult($isStored)) { if (!DBA::isResult($stmtUser)) {
$logger->info("Can't detect user data.", ['uid' => $uid]); $logger->info("Can't detect user data.", ['uid' => $uid]);
return []; return [];
} else { } else {
$isStored = DBA::toArray($isStored); $user = DBA::toArray($stmtUser);
} }
$page_owner_nick = $isStored[0]['nickname']; $page_owner_nick = $user[0]['nickname'];
/// @TODO /// @TODO
/// $default_cid = $isStored[0]['id']; /// $default_cid = $isStored[0]['id'];
@ -457,18 +457,18 @@ class Photo extends BaseObject
return []; return [];
} }
$image = ["page" => System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash, $image = ["page" => $a->getBaseURL() . '/photos/' . $page_owner_nick . '/image/' . $hash,
"full" => $a->getBaseURL()."/photo/{$hash}-0.".$image->getExt()]; "full" => $a->getBaseURL() . "/photo/{$hash}-0." . $image->getExt()];
if ($width > 800 || $height > 800) { if ($width > 800 || $height > 800) {
$image["large"] = System::baseUrl()."/photo/{$hash}-0.".$image->getExt(); $image["large"] = $a->getBaseURL() . "/photo/{$hash}-0." . $image->getExt();
} }
if ($width > 640 || $height > 640) { if ($width > 640 || $height > 640) {
$image->scaleDown(640); $image->scaleDown(640);
$isStored = self::store($image, $uid, $visitor, $hash, $tempFile, L10n::t('Wall Photos'), 1, 0, $defperm); $isStored = self::store($image, $uid, $visitor, $hash, $tempFile, L10n::t('Wall Photos'), 1, 0, $defperm);
if ($isStored) { if ($isStored) {
$image["medium"] = System::baseUrl()."/photo/{$hash}-1.".$image->getExt(); $image["medium"] = $a->getBaseURL() . "/photo/{$hash}-1." . $image->getExt();
} }
} }
@ -476,7 +476,7 @@ class Photo extends BaseObject
$image->scaleDown(320); $image->scaleDown(320);
$isStored = self::store($image, $uid, $visitor, $hash, $tempFile, L10n::t('Wall Photos'), 2, 0, $defperm); $isStored = self::store($image, $uid, $visitor, $hash, $tempFile, L10n::t('Wall Photos'), 2, 0, $defperm);
if ($isStored) { if ($isStored) {
$image["small"] = System::baseUrl()."/photo/{$hash}-2.".$image->getExt(); $image["small"] = $a->getBaseURL() . "/photo/{$hash}-2." . $image->getExt();
} }
} }