strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use a constant for the profile photo album

Browse source
This commit is contained in:
Michael 2021-10-14 04:12:00 +00:00
parent f05fecaec1
commit a33185f835
7 changed files with 17 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/api.php
View file

@ -4408,7 +4408,7 @@ function api_account_update_profile_image($type)
$media = $_FILES['media']; $media = $_FILES['media'];
} }
// save new profile image // save new profile image
$data = save_media_to_database("profileimage", $media, $type, DI::l10n()->t('Profile Photos'), "", "", "", "", "", Photo::USER_AVATAR); $data = save_media_to_database("profileimage", $media, $type, DI::l10n()->t(Photo::PROFILE_PHOTOS), "", "", "", "", "", Photo::USER_AVATAR);
// get filetype // get filetype
if (is_array($media['type'])) { if (is_array($media['type'])) {

12
mod/photos.php
View file

@ -86,7 +86,7 @@ function photos_init(App $a) {
$ret['albums'] = []; $ret['albums'] = [];
foreach ($albums as $k => $album) { foreach ($albums as $k => $album) {
//hide profile photos to others //hide profile photos to others
if (!$is_owner && !Session::getRemoteContactID($owner['uid']) && ($album['album'] == DI::l10n()->t('Profile Photos'))) if (!$is_owner && !Session::getRemoteContactID($owner['uid']) && ($album['album'] == DI::l10n()->t(Photo::PROFILE_PHOTOS)))
continue; continue;
$entry = [ $entry = [
'text' => $album['album'], 'text' => $album['album'],
@ -195,7 +195,7 @@ function photos_post(App $a)
} }
$album = hex2bin(DI::args()->getArgv()[3]); $album = hex2bin(DI::args()->getArgv()[3]);
if ($album === DI::l10n()->t('Profile Photos') || $album === Photo::CONTACT_PHOTOS || $album === DI::l10n()->t(Photo::CONTACT_PHOTOS)) { if ($album === DI::l10n()->t(Photo::PROFILE_PHOTOS) || $album === Photo::CONTACT_PHOTOS || $album === DI::l10n()->t(Photo::CONTACT_PHOTOS)) {
DI::baseUrl()->redirect($_SESSION['photo_return']); DI::baseUrl()->redirect($_SESSION['photo_return']);
return; // NOTREACHED return; // NOTREACHED
} }
@ -614,7 +614,7 @@ function photos_post(App $a)
$r = Photo::selectToArray([], ['`album` = ? AND `uid` = ? AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR', $album, $page_owner_uid]); $r = Photo::selectToArray([], ['`album` = ? AND `uid` = ? AND `created` > UTC_TIMESTAMP() - INTERVAL 3 HOUR', $album, $page_owner_uid]);
if (!DBA::isResult($r) || ($album == DI::l10n()->t('Profile Photos'))) { if (!DBA::isResult($r) || ($album == DI::l10n()->t(Photo::PROFILE_PHOTOS))) {
$visible = 1; $visible = 1;
} else { } else {
$visible = 0; $visible = 0;
@ -1025,7 +1025,7 @@ function photos_content(App $a)
// edit album name // edit album name
if ($cmd === 'edit') { if ($cmd === 'edit') {
if (($album !== DI::l10n()->t('Profile Photos')) && ($album !== Photo::CONTACT_PHOTOS) && ($album !== DI::l10n()->t(Photo::CONTACT_PHOTOS))) { if (($album !== DI::l10n()->t(Photo::PROFILE_PHOTOS)) && ($album !== Photo::CONTACT_PHOTOS) && ($album !== DI::l10n()->t(Photo::CONTACT_PHOTOS))) {
if ($can_post) { if ($can_post) {
$edit_tpl = Renderer::getMarkupTemplate('album_edit.tpl'); $edit_tpl = Renderer::getMarkupTemplate('album_edit.tpl');
@ -1042,7 +1042,7 @@ function photos_content(App $a)
} }
} }
} else { } else {
if (($album !== DI::l10n()->t('Profile Photos')) && ($album !== Photo::CONTACT_PHOTOS) && ($album !== DI::l10n()->t(Photo::CONTACT_PHOTOS)) && $can_post) { if (($album !== DI::l10n()->t(Photo::PROFILE_PHOTOS)) && ($album !== Photo::CONTACT_PHOTOS) && ($album !== DI::l10n()->t(Photo::CONTACT_PHOTOS)) && $can_post) {
$edit = [DI::l10n()->t('Edit Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/edit']; $edit = [DI::l10n()->t('Edit Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/edit'];
$drop = [DI::l10n()->t('Drop Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/drop']; $drop = [DI::l10n()->t('Drop Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/drop'];
} }
@ -1576,7 +1576,7 @@ function photos_content(App $a)
$twist = false; $twist = false;
foreach ($r as $rr) { foreach ($r as $rr) {
//hide profile photos to others //hide profile photos to others
if (!$is_owner && !Session::getRemoteContactID($owner_uid) && ($rr['album'] == DI::l10n()->t('Profile Photos'))) { if (!$is_owner && !Session::getRemoteContactID($owner_uid) && ($rr['album'] == DI::l10n()->t(Photo::PROFILE_PHOTOS))) {
continue; continue;
} }

20
src/Model/Photo.php
View file

@ -45,6 +45,7 @@ use Friendica\Util\Strings;
class Photo class Photo
{ {
const CONTACT_PHOTOS = 'Contact Photos'; const CONTACT_PHOTOS = 'Contact Photos';
const PROFILE_PHOTOS = 'Profile Photos';
const DEFAULT = 0; const DEFAULT = 0;
const USER_AVATAR = 10; const USER_AVATAR = 10;
@ -563,25 +564,6 @@ class Photo
$image_url = DI::baseUrl() . "/photo/" . $resource_id . "-4." . $Image->getExt() . $suffix; $image_url = DI::baseUrl() . "/photo/" . $resource_id . "-4." . $Image->getExt() . $suffix;
$thumb = DI::baseUrl() . "/photo/" . $resource_id . "-5." . $Image->getExt() . $suffix; $thumb = DI::baseUrl() . "/photo/" . $resource_id . "-5." . $Image->getExt() . $suffix;
$micro = DI::baseUrl() . "/photo/" . $resource_id . "-6." . $Image->getExt() . $suffix; $micro = DI::baseUrl() . "/photo/" . $resource_id . "-6." . $Image->getExt() . $suffix;
// Remove the cached photo
$a = DI::app();
$basepath = $a->getBasePath();
if (is_dir($basepath . "/photo")) {
$filename = $basepath . "/photo/" . $resource_id . "-4." . $Image->getExt();
if (file_exists($filename)) {
unlink($filename);
}
$filename = $basepath . "/photo/" . $resource_id . "-5." . $Image->getExt();
if (file_exists($filename)) {
unlink($filename);
}
$filename = $basepath . "/photo/" . $resource_id . "-6." . $Image->getExt();
if (file_exists($filename)) {
unlink($filename);
}
}
} else { } else {
$photo_failure = true; $photo_failure = true;
} }

6
src/Model/User.php
View file

@ -1161,7 +1161,7 @@ class User
$resource_id = Photo::newResource(); $resource_id = Photo::newResource();
$r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 4); $r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t(Photo::PROFILE_PHOTOS), 4);
if ($r === false) { if ($r === false) {
$photo_failure = true; $photo_failure = true;
@ -1169,7 +1169,7 @@ class User
$Image->scaleDown(80); $Image->scaleDown(80);
$r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 5); $r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t(Photo::PROFILE_PHOTOS), 5);
if ($r === false) { if ($r === false) {
$photo_failure = true; $photo_failure = true;
@ -1177,7 +1177,7 @@ class User
$Image->scaleDown(48); $Image->scaleDown(48);
$r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 6); $r = Photo::store($Image, $uid, 0, $resource_id, $filename, DI::l10n()->t(Photo::PROFILE_PHOTOS), 6);
if ($r === false) { if ($r === false) {
$photo_failure = true; $photo_failure = true;

8
src/Module/Settings/Profile/Photo/Crop.php
View file

@ -98,7 +98,7 @@ class Crop extends BaseSettings
0, 0,
$resource_id, $resource_id,
$base_image['filename'], $base_image['filename'],
DI::l10n()->t('Profile Photos'), DI::l10n()->t(Photo::PROFILE_PHOTOS),
4, 4,
Photo::USER_AVATAR Photo::USER_AVATAR
); );
@ -114,7 +114,7 @@ class Crop extends BaseSettings
0, 0,
$resource_id, $resource_id,
$base_image['filename'], $base_image['filename'],
DI::l10n()->t('Profile Photos'), DI::l10n()->t(Photo::PROFILE_PHOTOS),
5, 5,
Photo::USER_AVATAR Photo::USER_AVATAR
); );
@ -130,7 +130,7 @@ class Crop extends BaseSettings
0, 0,
$resource_id, $resource_id,
$base_image['filename'], $base_image['filename'],
DI::l10n()->t('Profile Photos'), DI::l10n()->t(Photo::PROFILE_PHOTOS),
6, 6,
Photo::USER_AVATAR Photo::USER_AVATAR
); );
@ -176,7 +176,7 @@ class Crop extends BaseSettings
// set an already uloaded photo as profile photo // set an already uloaded photo as profile photo
// if photo is in 'Profile Photos', change it in db // if photo is in 'Profile Photos', change it in db
if ($photos[0]['album'] == DI::l10n()->t('Profile Photos') && $havescale) { if ($photos[0]['album'] == DI::l10n()->t(Photo::PROFILE_PHOTOS) && $havescale) {
Photo::update(['profile' => false], ['uid' => local_user()]); Photo::update(['profile' => false], ['uid' => local_user()]);
Photo::update(['profile' => true], ['resource-id' => $resource_id, 'uid' => local_user()]); Photo::update(['profile' => true], ['resource-id' => $resource_id, 'uid' => local_user()]);

4
src/Module/Settings/Profile/Photo/Index.php
View file

@ -92,13 +92,13 @@ class Index extends BaseSettings
$filename = ''; $filename = '';
if (!Photo::store($Image, local_user(), 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 0)) { if (!Photo::store($Image, local_user(), 0, $resource_id, $filename, DI::l10n()->t(Photo::PROFILE_PHOTOS), 0)) {
notice(DI::l10n()->t('Image upload failed.')); notice(DI::l10n()->t('Image upload failed.'));
} }
if ($width > 640 || $height > 640) { if ($width > 640 || $height > 640) {
$Image->scaleDown(640); $Image->scaleDown(640);
if (!Photo::store($Image, local_user(), 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 1)) { if (!Photo::store($Image, local_user(), 0, $resource_id, $filename, DI::l10n()->t(Photo::PROFILE_PHOTOS), 1)) {
notice(DI::l10n()->t('Image size reduction [%s] failed.', '640')); notice(DI::l10n()->t('Image size reduction [%s] failed.', '640'));
} }
} }

18
src/Object/Image.php
View file

@ -637,24 +637,6 @@ class Image
$this->height = imagesy($this->image); $this->height = imagesy($this->image);
} }
/**
* @param string $path file path
* @return mixed
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public function saveToFilePath($path)
{
if (!$this->isValid()) {
return false;
}
$string = $this->asString();
DI::profiler()->stopRecording('file');
file_put_contents($path, $string);
DI::profiler()->stopRecording();
}
/** /**
* Magic method allowing string casting of an Image object * Magic method allowing string casting of an Image object
* *