clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/friendica/friendica into develop

This commit is contained in:
Ralf Thees 2018-10-23 17:18:23 +02:00
parent 5583c070e0 1a1300f1bf
commit 53c7e50f12
16 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/api.md
View File

@ -1061,7 +1061,7 @@ possibile scale value are:
* 1: image with or height at <= 640 * 1: image with or height at <= 640
* 2: image with or height at <= 320 * 2: image with or height at <= 320
* 3: thumbnail 160x160 * 3: thumbnail 160x160
* 4: Profile image at 175x175 * 4: Profile image at 300x300
* 5: Profile image at 80x80 * 5: Profile image at 80x80
* 6: Profile image at 48x48 * 6: Profile image at 48x48

BIN
images/person-300.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

6
include/api.php
View File

@ -4556,11 +4556,11 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
// upload profile image (scales 4, 5, 6) // upload profile image (scales 4, 5, 6)
logger("photo upload: starting new profile image upload", LOGGER_DEBUG); logger("photo upload: starting new profile image upload", LOGGER_DEBUG);
if ($width > 175 || $height > 175) { if ($width > 300 || $height > 300) {
$Image->scaleDown(175); $Image->scaleDown(300);
$r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 4, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); $r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 4, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if (!$r) { if (!$r) {
logger("photo upload: profile image upload with scale 4 (175x175) failed"); logger("photo upload: profile image upload with scale 4 (300x300) failed");
} }
} }

2
mod/dfrn_confirm.php
View File

@ -537,7 +537,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
$photo = $contact['photo']; $photo = $contact['photo'];
} else { } else {
$photo = System::baseUrl() . '/images/person-175.jpg'; $photo = System::baseUrl() . '/images/person-300.jpg';
} }
Contact::updateAvatar($photo, $local_uid, $dfrn_record); Contact::updateAvatar($photo, $local_uid, $dfrn_record);

4
mod/photo.php
View File

@ -51,7 +51,7 @@ function photo_init(App $a)
exit; exit;
} }
$default = 'images/person-175.jpg'; $default = 'images/person-300.jpg';
$public = true; $public = true;
if (isset($type)) { if (isset($type)) {
@ -137,7 +137,7 @@ function photo_init(App $a)
if (isset($resolution)) { if (isset($resolution)) {
switch ($resolution) { switch ($resolution) {
case 4: case 4:
$data = file_get_contents('images/person-175.jpg'); $data = file_get_contents('images/person-300.jpg');
$mimetype = 'image/jpeg'; $mimetype = 'image/jpeg';
break; break;
case 5: case 5:

6
mod/profile_photo.php
View File

@ -80,13 +80,13 @@ function profile_photo_post(App $a)
$Image = new Image($base_image['data'], $base_image['type']); $Image = new Image($base_image['data'], $base_image['type']);
if ($Image->isValid()) { 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'], $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
L10n::t('Profile Photos'), 4, $is_default_profile); L10n::t('Profile Photos'), 4, $is_default_profile);
if ($r === false) { 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); $Image->scaleDown(80);
@ -288,7 +288,7 @@ function profile_photo_crop_ui_head(App $a, Image $image)
$height = $image->getHeight(); $height = $image->getHeight();
if ($width < 175 || $height < 175) { if ($width < 175 || $height < 175) {
$image->scaleUp(200); $image->scaleUp(300);
$width = $image->getWidth(); $width = $image->getWidth();
$height = $image->getHeight(); $height = $image->getHeight();
} }

4
src/Core/NotificationsManager.php
View File

@ -642,7 +642,7 @@ class NotificationsManager extends BaseObject
'madeby_zrl' => Contact::magicLink($it['url']), 'madeby_zrl' => Contact::magicLink($it['url']),
'madeby_addr' => $it['addr'], 'madeby_addr' => $it['addr'],
'contact_id' => $it['contact-id'], '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'], 'name' => $it['fname'],
'url' => $it['furl'], 'url' => $it['furl'],
'zrl' => Contact::magicLink($it['furl']), 'zrl' => Contact::magicLink($it['furl']),
@ -674,7 +674,7 @@ class NotificationsManager extends BaseObject
'uid' => $_SESSION['uid'], 'uid' => $_SESSION['uid'],
'intro_id' => $it['intro_id'], 'intro_id' => $it['intro_id'],
'contact_id' => $it['contact-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'], 'name' => $it['name'],
'location' => BBCode::convert($it['glocation'], false), 'location' => BBCode::convert($it['glocation'], false),
'about' => BBCode::convert($it['gabout'], false), 'about' => BBCode::convert($it['gabout'], false),

2
src/Model/Contact.php
View File

@ -465,7 +465,7 @@ class Contact extends BaseObject
$fields['micro'] = $prefix . '6' . $suffix; $fields['micro'] = $prefix . '6' . $suffix;
} else { } else {
// We hadn't found a photo entry, so we use the default avatar // 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['thumb'] = System::baseUrl() . '/images/person-80.jpg';
$fields['micro'] = System::baseUrl() . '/images/person-48.jpg'; $fields['micro'] = System::baseUrl() . '/images/person-48.jpg';
} }

2
src/Model/GContact.php
View File

@ -995,7 +995,7 @@ class GContact
"addr" => $user->nickname."@".$hostname, "addr" => $user->nickname."@".$hostname,
"nick" => $user->nickname, "nick" => $user->nickname,
"network" => Protocol::OSTATUS, "network" => Protocol::OSTATUS,
"photo" => System::baseUrl()."/images/person-175.jpg"]; "photo" => System::baseUrl()."/images/person-300.jpg"];
if (isset($user->bio)) { if (isset($user->bio)) {
$contact["about"] = $user->bio; $contact["about"] = $user->bio;

4
src/Model/Photo.php
View File

@ -115,7 +115,7 @@ class Photo
$type = Image::guessType($image_url, true); $type = Image::guessType($image_url, true);
$Image = new Image($img_str, $type); $Image = new Image($img_str, $type);
if ($Image->isValid()) { if ($Image->isValid()) {
$Image->scaleToSquare(175); $Image->scaleToSquare(300);
$r = self::store($Image, $uid, $cid, $hash, $filename, 'Contact Photos', 4); $r = self::store($Image, $uid, $cid, $hash, $filename, 'Contact Photos', 4);
@ -172,7 +172,7 @@ class Photo
} }
if ($photo_failure) { 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'; $thumb = System::baseUrl() . '/images/person-80.jpg';
$micro = System::baseUrl() . '/images/person-48.jpg'; $micro = System::baseUrl() . '/images/person-48.jpg';
} }

2
src/Model/User.php
View File

@ -642,7 +642,7 @@ class User
$Image = new Image($img_str, $type); $Image = new Image($img_str, $type);
if ($Image->isValid()) { if ($Image->isValid()) {
$Image->scaleToSquare(175); $Image->scaleToSquare(300);
$hash = Photo::newResource(); $hash = Photo::newResource();

2
src/Module/Proxy.php
View File

@ -103,7 +103,7 @@ class Proxy extends BaseModule
$sizetype = ':thumb'; $sizetype = ':thumb';
$url = substr($url, 0, -6); $url = substr($url, 0, -6);
} elseif (substr($url, -6) == ':small') { } elseif (substr($url, -6) == ':small') {
$size = 175; $size = 300;
$url = substr($url, 0, -6); $url = substr($url, 0, -6);
$sizetype = ':small'; $sizetype = ':small';
} elseif (substr($url, -7) == ':medium') { } elseif (substr($url, -7) == ':medium') {

2
src/Network/Probe.php
View File

@ -348,7 +348,7 @@ class Probe
if (x($data, "photo")) { if (x($data, "photo")) {
$data["baseurl"] = Network::getUrlMatch(normalise_link(defaults($data, "baseurl", "")), normalise_link($data["photo"])); $data["baseurl"] = Network::getUrlMatch(normalise_link(defaults($data, "baseurl", "")), normalise_link($data["photo"]));
} else { } else {
$data["photo"] = System::baseUrl().'/images/person-175.jpg'; $data["photo"] = System::baseUrl().'/images/person-300.jpg';
} }
if (empty($data["name"])) { if (empty($data["name"])) {

2
src/Protocol/DFRN.php
View File

@ -646,7 +646,7 @@ class DFRN
XML::addElement($doc, $author, "dfrn:handle", $owner["addr"], $attributes); XML::addElement($doc, $author, "dfrn:handle", $owner["addr"], $attributes);
$attributes = ["rel" => "photo", "type" => "image/jpeg", $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) { if (!$public || !$hidewall) {
$attributes["dfrn:updated"] = $picdate; $attributes["dfrn:updated"] = $picdate;

8
src/Protocol/OStatus.php
View File

@ -1450,8 +1450,8 @@ class OStatus
$attributes = [ $attributes = [
"rel" => "avatar", "rel" => "avatar",
"type" => "image/jpeg", // To-Do? "type" => "image/jpeg", // To-Do?
"media:width" => 175, "media:width" => 300,
"media:height" => 175, "media:height" => 300,
"href" => $owner["photo"]]; "href" => $owner["photo"]];
XML::addElement($doc, $author, "link", "", $attributes); XML::addElement($doc, $author, "link", "", $attributes);
@ -1769,8 +1769,8 @@ class OStatus
$attributes = [ $attributes = [
"rel" => "avatar", "rel" => "avatar",
"type" => "image/jpeg", // To-Do? "type" => "image/jpeg", // To-Do?
"media:width" => 175, "media:width" => 300,
"media:height" => 175, "media:height" => 300,
"href" => $contact["photo"]]; "href" => $contact["photo"]];
XML::addElement($doc, $object, "link", "", $attributes); XML::addElement($doc, $object, "link", "", $attributes);

4
src/Util/Network.php
View File

@ -516,7 +516,7 @@ class Network
public static function lookupAvatarByEmail($email) public static function lookupAvatarByEmail($email)
{ {
$avatar['size'] = 175; $avatar['size'] = 300;
$avatar['email'] = $email; $avatar['email'] = $email;
$avatar['url'] = ''; $avatar['url'] = '';
$avatar['success'] = false; $avatar['success'] = false;
@ -524,7 +524,7 @@ class Network
Addon::callHooks('avatar_lookup', $avatar); Addon::callHooks('avatar_lookup', $avatar);
if (! $avatar['success']) { 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); logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);