From cbc898d90296fba04b01772cef6f553eee7616cd Mon Sep 17 00:00:00 2001 From: vinzv Date: Tue, 23 Oct 2018 14:30:21 +0200 Subject: [PATCH 1/3] raising profile photo size to comply with frio sidebar profile photo skaling --- mod/profile_photo.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 19188ba23..0d692a660 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -80,13 +80,13 @@ function profile_photo_post(App $a) $Image = new Image($base_image['data'], $base_image['type']); if ($Image->isValid()) { - $Image->crop(175, $srcX, $srcY, $srcW, $srcH); + $Image->crop(300, $srcX, $srcY, $srcW, $srcH); $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'], L10n::t('Profile Photos'), 4, $is_default_profile); if ($r === false) { - notice(L10n::t('Image size reduction [%s] failed.', "175") . EOL); + notice(L10n::t('Image size reduction [%s] failed.', "300") . EOL); } $Image->scaleDown(80); From 95f9337e0e9e681a2e4610f21f2871a43ca1feb8 Mon Sep 17 00:00:00 2001 From: vinzv Date: Tue, 23 Oct 2018 15:16:58 +0200 Subject: [PATCH 2/3] adapted 300px image size for default avatar --- images/person-300.jpg | Bin 0 -> 11319 bytes mod/dfrn_confirm.php | 2 +- mod/photo.php | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 images/person-300.jpg diff --git a/images/person-300.jpg b/images/person-300.jpg new file mode 100644 index 0000000000000000000000000000000000000000..817308211344100b5b548adb1e3541a38ef3f746 GIT binary patch literal 11319 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 literal 0 HcmV?d00001 diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index f685d9e23..c41105966 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -537,7 +537,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) if (DBA::isResult($contact)) { $photo = $contact['photo']; } else { - $photo = System::baseUrl() . '/images/person-175.jpg'; + $photo = System::baseUrl() . '/images/person-300.jpg'; } Contact::updateAvatar($photo, $local_uid, $dfrn_record); diff --git a/mod/photo.php b/mod/photo.php index 083b7cfc9..54418f730 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -51,7 +51,7 @@ function photo_init(App $a) exit; } - $default = 'images/person-175.jpg'; + $default = 'images/person-300.jpg'; $public = true; if (isset($type)) { @@ -137,7 +137,7 @@ function photo_init(App $a) if (isset($resolution)) { switch ($resolution) { case 4: - $data = file_get_contents('images/person-175.jpg'); + $data = file_get_contents('images/person-300.jpg'); $mimetype = 'image/jpeg'; break; case 5: From cb75c40f4e041b30c64de93530c63e841b4b1504 Mon Sep 17 00:00:00 2001 From: vinzv Date: Tue, 23 Oct 2018 16:36:57 +0200 Subject: [PATCH 3/3] adapted profile pic resize to 300px for whole system --- doc/api.md | 2 +- include/api.php | 6 +++--- mod/profile_photo.php | 2 +- src/Core/NotificationsManager.php | 4 ++-- src/Model/Contact.php | 2 +- src/Model/GContact.php | 2 +- src/Model/Photo.php | 4 ++-- src/Model/User.php | 2 +- src/Module/Proxy.php | 2 +- src/Network/Probe.php | 2 +- src/Protocol/DFRN.php | 2 +- src/Protocol/OStatus.php | 8 ++++---- src/Util/Network.php | 4 ++-- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/doc/api.md b/doc/api.md index 07813b6a7..2715f4446 100644 --- a/doc/api.md +++ b/doc/api.md @@ -1061,7 +1061,7 @@ possibile scale value are: * 1: image with or height at <= 640 * 2: image with or height at <= 320 * 3: thumbnail 160x160 -* 4: Profile image at 175x175 +* 4: Profile image at 300x300 * 5: Profile image at 80x80 * 6: Profile image at 48x48 diff --git a/include/api.php b/include/api.php index 7e54fa382..86f2e3b2a 100644 --- a/include/api.php +++ b/include/api.php @@ -4556,11 +4556,11 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $ // upload profile image (scales 4, 5, 6) logger("photo upload: starting new profile image upload", LOGGER_DEBUG); - if ($width > 175 || $height > 175) { - $Image->scaleDown(175); + if ($width > 300 || $height > 300) { + $Image->scaleDown(300); $r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 4, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if (!$r) { - logger("photo upload: profile image upload with scale 4 (175x175) failed"); + logger("photo upload: profile image upload with scale 4 (300x300) failed"); } } diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 0d692a660..da45226fe 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -288,7 +288,7 @@ function profile_photo_crop_ui_head(App $a, Image $image) $height = $image->getHeight(); if ($width < 175 || $height < 175) { - $image->scaleUp(200); + $image->scaleUp(300); $width = $image->getWidth(); $height = $image->getHeight(); } diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php index fb7760573..9250bc2e5 100644 --- a/src/Core/NotificationsManager.php +++ b/src/Core/NotificationsManager.php @@ -642,7 +642,7 @@ class NotificationsManager extends BaseObject 'madeby_zrl' => Contact::magicLink($it['url']), 'madeby_addr' => $it['addr'], 'contact_id' => $it['contact-id'], - 'photo' => ((x($it, 'fphoto')) ? ProxyUtils::proxifyUrl($it['fphoto'], false, ProxyUtils::SIZE_SMALL) : "images/person-175.jpg"), + 'photo' => ((x($it, 'fphoto')) ? ProxyUtils::proxifyUrl($it['fphoto'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"), 'name' => $it['fname'], 'url' => $it['furl'], 'zrl' => Contact::magicLink($it['furl']), @@ -674,7 +674,7 @@ class NotificationsManager extends BaseObject 'uid' => $_SESSION['uid'], 'intro_id' => $it['intro_id'], 'contact_id' => $it['contact-id'], - 'photo' => ((x($it, 'photo')) ? ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_SMALL) : "images/person-175.jpg"), + 'photo' => ((x($it, 'photo')) ? ProxyUtils::proxifyUrl($it['photo'], false, ProxyUtils::SIZE_SMALL) : "images/person-300.jpg"), 'name' => $it['name'], 'location' => BBCode::convert($it['glocation'], false), 'about' => BBCode::convert($it['gabout'], false), diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 3524cd4ce..fdb49ac13 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -465,7 +465,7 @@ class Contact extends BaseObject $fields['micro'] = $prefix . '6' . $suffix; } else { // We hadn't found a photo entry, so we use the default avatar - $fields['photo'] = System::baseUrl() . '/images/person-175.jpg'; + $fields['photo'] = System::baseUrl() . '/images/person-300.jpg'; $fields['thumb'] = System::baseUrl() . '/images/person-80.jpg'; $fields['micro'] = System::baseUrl() . '/images/person-48.jpg'; } diff --git a/src/Model/GContact.php b/src/Model/GContact.php index 20e6f0751..cc7775377 100644 --- a/src/Model/GContact.php +++ b/src/Model/GContact.php @@ -995,7 +995,7 @@ class GContact "addr" => $user->nickname."@".$hostname, "nick" => $user->nickname, "network" => Protocol::OSTATUS, - "photo" => System::baseUrl()."/images/person-175.jpg"]; + "photo" => System::baseUrl()."/images/person-300.jpg"]; if (isset($user->bio)) { $contact["about"] = $user->bio; diff --git a/src/Model/Photo.php b/src/Model/Photo.php index 6b094ded6..a9b4c0fb7 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -115,7 +115,7 @@ class Photo $type = Image::guessType($image_url, true); $Image = new Image($img_str, $type); if ($Image->isValid()) { - $Image->scaleToSquare(175); + $Image->scaleToSquare(300); $r = self::store($Image, $uid, $cid, $hash, $filename, 'Contact Photos', 4); @@ -172,7 +172,7 @@ class Photo } if ($photo_failure) { - $image_url = System::baseUrl() . '/images/person-175.jpg'; + $image_url = System::baseUrl() . '/images/person-300.jpg'; $thumb = System::baseUrl() . '/images/person-80.jpg'; $micro = System::baseUrl() . '/images/person-48.jpg'; } diff --git a/src/Model/User.php b/src/Model/User.php index 27ed28fd4..bdea5e28f 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -642,7 +642,7 @@ class User $Image = new Image($img_str, $type); if ($Image->isValid()) { - $Image->scaleToSquare(175); + $Image->scaleToSquare(300); $hash = Photo::newResource(); diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php index 8c3493b2a..29e0f4f52 100644 --- a/src/Module/Proxy.php +++ b/src/Module/Proxy.php @@ -103,7 +103,7 @@ class Proxy extends BaseModule $sizetype = ':thumb'; $url = substr($url, 0, -6); } elseif (substr($url, -6) == ':small') { - $size = 175; + $size = 300; $url = substr($url, 0, -6); $sizetype = ':small'; } elseif (substr($url, -7) == ':medium') { diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 08ec4ae1c..f892c3a5c 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -348,7 +348,7 @@ class Probe if (x($data, "photo")) { $data["baseurl"] = Network::getUrlMatch(normalise_link(defaults($data, "baseurl", "")), normalise_link($data["photo"])); } else { - $data["photo"] = System::baseUrl().'/images/person-175.jpg'; + $data["photo"] = System::baseUrl().'/images/person-300.jpg'; } if (empty($data["name"])) { diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index e8cf4a631..1dcc1197a 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -646,7 +646,7 @@ class DFRN XML::addElement($doc, $author, "dfrn:handle", $owner["addr"], $attributes); $attributes = ["rel" => "photo", "type" => "image/jpeg", - "media:width" => 175, "media:height" => 175, "href" => $owner['photo']]; + "media:width" => 300, "media:height" => 300, "href" => $owner['photo']]; if (!$public || !$hidewall) { $attributes["dfrn:updated"] = $picdate; diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 0e3d5e6c0..fb78d2ebb 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -1450,8 +1450,8 @@ class OStatus $attributes = [ "rel" => "avatar", "type" => "image/jpeg", // To-Do? - "media:width" => 175, - "media:height" => 175, + "media:width" => 300, + "media:height" => 300, "href" => $owner["photo"]]; XML::addElement($doc, $author, "link", "", $attributes); @@ -1769,8 +1769,8 @@ class OStatus $attributes = [ "rel" => "avatar", "type" => "image/jpeg", // To-Do? - "media:width" => 175, - "media:height" => 175, + "media:width" => 300, + "media:height" => 300, "href" => $contact["photo"]]; XML::addElement($doc, $object, "link", "", $attributes); diff --git a/src/Util/Network.php b/src/Util/Network.php index 1038fa3f0..3b27a0550 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -516,7 +516,7 @@ class Network public static function lookupAvatarByEmail($email) { - $avatar['size'] = 175; + $avatar['size'] = 300; $avatar['email'] = $email; $avatar['url'] = ''; $avatar['success'] = false; @@ -524,7 +524,7 @@ class Network Addon::callHooks('avatar_lookup', $avatar); if (! $avatar['success']) { - $avatar['url'] = System::baseUrl() . '/images/person-175.jpg'; + $avatar['url'] = System::baseUrl() . '/images/person-300.jpg'; } logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);