From a33185f835838cacd1ffe4ee8c729d474f8a0f2a Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 14 Oct 2021 04:12:00 +0000 Subject: [PATCH] Use a constant for the profile photo album --- include/api.php | 2 +- mod/photos.php | 12 ++++++------ src/Model/Photo.php | 20 +------------------- src/Model/User.php | 6 +++--- src/Module/Settings/Profile/Photo/Crop.php | 8 ++++---- src/Module/Settings/Profile/Photo/Index.php | 4 ++-- src/Object/Image.php | 18 ------------------ 7 files changed, 17 insertions(+), 53 deletions(-) diff --git a/include/api.php b/include/api.php index c5c863bdd1..22a6ee4321 100644 --- a/include/api.php +++ b/include/api.php @@ -4408,7 +4408,7 @@ function api_account_update_profile_image($type) $media = $_FILES['media']; } // 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 if (is_array($media['type'])) { diff --git a/mod/photos.php b/mod/photos.php index f58e532249..ba964ce5fa 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -86,7 +86,7 @@ function photos_init(App $a) { $ret['albums'] = []; foreach ($albums as $k => $album) { //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; $entry = [ 'text' => $album['album'], @@ -195,7 +195,7 @@ function photos_post(App $a) } $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']); 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]); - if (!DBA::isResult($r) || ($album == DI::l10n()->t('Profile Photos'))) { + if (!DBA::isResult($r) || ($album == DI::l10n()->t(Photo::PROFILE_PHOTOS))) { $visible = 1; } else { $visible = 0; @@ -1025,7 +1025,7 @@ function photos_content(App $a) // edit album name 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) { $edit_tpl = Renderer::getMarkupTemplate('album_edit.tpl'); @@ -1042,7 +1042,7 @@ function photos_content(App $a) } } } 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']; $drop = [DI::l10n()->t('Drop Album'), 'photos/' . $user['nickname'] . '/album/' . bin2hex($album) . '/drop']; } @@ -1576,7 +1576,7 @@ function photos_content(App $a) $twist = false; foreach ($r as $rr) { //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; } diff --git a/src/Model/Photo.php b/src/Model/Photo.php index 1fdd55926d..d4d397b16d 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -45,6 +45,7 @@ use Friendica\Util\Strings; class Photo { const CONTACT_PHOTOS = 'Contact Photos'; + const PROFILE_PHOTOS = 'Profile Photos'; const DEFAULT = 0; const USER_AVATAR = 10; @@ -563,25 +564,6 @@ class Photo $image_url = DI::baseUrl() . "/photo/" . $resource_id . "-4." . $Image->getExt() . $suffix; $thumb = DI::baseUrl() . "/photo/" . $resource_id . "-5." . $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 { $photo_failure = true; } diff --git a/src/Model/User.php b/src/Model/User.php index fbee73c786..daa79a0a44 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -1161,7 +1161,7 @@ class User $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) { $photo_failure = true; @@ -1169,7 +1169,7 @@ class User $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) { $photo_failure = true; @@ -1177,7 +1177,7 @@ class User $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) { $photo_failure = true; diff --git a/src/Module/Settings/Profile/Photo/Crop.php b/src/Module/Settings/Profile/Photo/Crop.php index d9f04d8de4..890d397554 100644 --- a/src/Module/Settings/Profile/Photo/Crop.php +++ b/src/Module/Settings/Profile/Photo/Crop.php @@ -98,7 +98,7 @@ class Crop extends BaseSettings 0, $resource_id, $base_image['filename'], - DI::l10n()->t('Profile Photos'), + DI::l10n()->t(Photo::PROFILE_PHOTOS), 4, Photo::USER_AVATAR ); @@ -114,7 +114,7 @@ class Crop extends BaseSettings 0, $resource_id, $base_image['filename'], - DI::l10n()->t('Profile Photos'), + DI::l10n()->t(Photo::PROFILE_PHOTOS), 5, Photo::USER_AVATAR ); @@ -130,7 +130,7 @@ class Crop extends BaseSettings 0, $resource_id, $base_image['filename'], - DI::l10n()->t('Profile Photos'), + DI::l10n()->t(Photo::PROFILE_PHOTOS), 6, Photo::USER_AVATAR ); @@ -176,7 +176,7 @@ class Crop extends BaseSettings // set an already uloaded photo as profile photo // 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' => true], ['resource-id' => $resource_id, 'uid' => local_user()]); diff --git a/src/Module/Settings/Profile/Photo/Index.php b/src/Module/Settings/Profile/Photo/Index.php index 1584fe8f63..967c76e46c 100644 --- a/src/Module/Settings/Profile/Photo/Index.php +++ b/src/Module/Settings/Profile/Photo/Index.php @@ -92,13 +92,13 @@ class Index extends BaseSettings $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.')); } if ($width > 640 || $height > 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')); } } diff --git a/src/Object/Image.php b/src/Object/Image.php index 8c8ebfb29d..dd95903696 100644 --- a/src/Object/Image.php +++ b/src/Object/Image.php @@ -637,24 +637,6 @@ class 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 *