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

Merge pull request #8392 from MrPetovan/bug/fatal-errors

Browse source 
Ensure non-NULL values in $data array in Contact::updateAvatar
This commit is contained in:
Michael Vogel 2020-03-09 20:44:18 +01:00 committed by GitHub
parent 8d9d8512ce 07dde8deb8
commit d19bc3116c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/Model/Contact.php
View file

@ -32,6 +32,7 @@ use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Notify\Type; use Friendica\Model\Notify\Type;
use Friendica\Network\HTTPException;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub; use Friendica\Protocol\ActivityPub;
@ -196,7 +197,7 @@ class Contact
* @param int $uid User ID * @param int $uid User ID
* *
* @return boolean is the contact id a follower? * @return boolean is the contact id a follower?
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function isFollower($cid, $uid) public static function isFollower($cid, $uid)
@ -221,7 +222,7 @@ class Contact
* @param int $uid User ID * @param int $uid User ID
* *
* @return boolean is the contact id a follower? * @return boolean is the contact id a follower?
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function isFollowerByURL($url, $uid) public static function isFollowerByURL($url, $uid)
@ -242,7 +243,7 @@ class Contact
* @param int $uid User ID * @param int $uid User ID
* *
* @return boolean is the contact url being followed? * @return boolean is the contact url being followed?
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function isSharing($cid, $uid) public static function isSharing($cid, $uid)
@ -267,7 +268,7 @@ class Contact
* @param int $uid User ID * @param int $uid User ID
* *
* @return boolean is the contact url being followed? * @return boolean is the contact url being followed?
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function isSharingByURL($url, $uid) public static function isSharingByURL($url, $uid)
@ -288,7 +289,7 @@ class Contact
* @param boolean $dont_update Don't update the contact * @param boolean $dont_update Don't update the contact
* *
* @return string basepath * @return string basepath
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function getBasepath($url, $dont_update = false) public static function getBasepath($url, $dont_update = false)
@ -377,7 +378,7 @@ class Contact
* @param int $uid User ID * @param int $uid User ID
* *
* @return array with public and user's contact id * @return array with public and user's contact id
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function getPublicAndUserContacID($cid, $uid) public static function getPublicAndUserContacID($cid, $uid)
@ -583,7 +584,7 @@ class Contact
* @param int $uid User ID * @param int $uid User ID
* *
* @return boolean is the contact id blocked for the given user? * @return boolean is the contact id blocked for the given user?
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function isCollapsedByUser($cid, $uid) public static function isCollapsedByUser($cid, $uid)
@ -645,7 +646,7 @@ class Contact
* *
* @param int $uid * @param int $uid
* @return bool Operation success * @return bool Operation success
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
*/ */
public static function createSelfFromUserId($uid) public static function createSelfFromUserId($uid)
{ {
@ -692,7 +693,7 @@ class Contact
* *
* @param int $uid * @param int $uid
* @param boolean $update_avatar Force the avatar update * @param boolean $update_avatar Force the avatar update
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
*/ */
public static function updateSelfFromUserID($uid, $update_avatar = false) public static function updateSelfFromUserID($uid, $update_avatar = false)
{ {
@ -798,7 +799,7 @@ class Contact
* *
* @param int $id contact id * @param int $id contact id
* @return null * @return null
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
*/ */
public static function remove($id) public static function remove($id)
{ {
@ -822,7 +823,7 @@ class Contact
* @param array $contact Contact unfriended * @param array $contact Contact unfriended
* @param boolean $dissolve Remove the contact on the remote side * @param boolean $dissolve Remove the contact on the remote side
* @return void * @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function terminateFriendship(array $user, array $contact, $dissolve = false) public static function terminateFriendship(array $user, array $contact, $dissolve = false)
@ -875,7 +876,7 @@ class Contact
* *
* @param array $contact contact to mark for archival * @param array $contact contact to mark for archival
* @return null * @return null
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
*/ */
public static function markForArchival(array $contact) public static function markForArchival(array $contact)
{ {
@ -976,7 +977,7 @@ class Contact
* @param array $default If not data was found take this data as default value * @param array $default If not data was found take this data as default value
* *
* @return array Contact data * @return array Contact data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
*/ */
public static function getDetailsByURL($url, $uid = -1, array $default = []) public static function getDetailsByURL($url, $uid = -1, array $default = [])
{ {
@ -1126,7 +1127,7 @@ class Contact
* @param int $uid User id * @param int $uid User id
* *
* @return array Contact data * @return array Contact data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function getDetailsByAddr($addr, $uid = -1) public static function getDetailsByAddr($addr, $uid = -1)
@ -1181,7 +1182,7 @@ class Contact
* @param array $contact contact * @param array $contact contact
* @param int $uid optional, default 0 * @param int $uid optional, default 0
* @return array * @return array
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function photoMenu(array $contact, $uid = 0) public static function photoMenu(array $contact, $uid = 0)
@ -1444,7 +1445,7 @@ class Contact
* @param boolean $in_loop Internally used variable to prevent an endless loop * @param boolean $in_loop Internally used variable to prevent an endless loop
* *
* @return integer Contact ID * @return integer Contact ID
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function getIdForURL($url, $uid = 0, $no_update = false, $default = [], $in_loop = false) public static function getIdForURL($url, $uid = 0, $no_update = false, $default = [], $in_loop = false)
@ -1663,7 +1664,7 @@ class Contact
* @param int $cid contact id * @param int $cid contact id
* *
* @return boolean Is the contact archived? * @return boolean Is the contact archived?
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
*/ */
public static function isArchived(int $cid) public static function isArchived(int $cid)
{ {
@ -1707,7 +1708,7 @@ class Contact
* @param int $cid contact id * @param int $cid contact id
* *
* @return boolean Is the contact blocked? * @return boolean Is the contact blocked?
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
*/ */
public static function isBlocked($cid) public static function isBlocked($cid)
{ {
@ -1910,19 +1911,24 @@ class Contact
* @param int $cid Contact id * @param int $cid Contact id
* @param bool $force force picture update * @param bool $force force picture update
* *
* @return array Returns array of the different avatar sizes * @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws HTTPException\NotFoundException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function updateAvatar($avatar, $uid, $cid, $force = false) public static function updateAvatar($avatar, $uid, $cid, $force = false)
{ {
$contact = DBA::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid, 'self' => false]); $contact = DBA::selectFirst('contact', ['avatar', 'photo', 'thumb', 'micro', 'nurl'], ['id' => $cid, 'self' => false]);
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
return false; return;
} else {
$data = [$contact["photo"], $contact["thumb"], $contact["micro"]];
} }
$data = [
$contact['photo'] ?? '',
$contact['thumb'] ?? '',
$contact['micro'] ?? '',
];
foreach ($data as $image_uri) { foreach ($data as $image_uri) {
$image_rid = Photo::ridFromURI($image_uri); $image_rid = Photo::ridFromURI($image_uri);
if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) { if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
@ -1945,12 +1951,8 @@ class Contact
DBA::update('contact', $fields, ['id' => $pcontact['id']]); DBA::update('contact', $fields, ['id' => $pcontact['id']]);
} }
} }
return $photos;
} }
} }
return $data;
} }
/** /**
@ -2061,7 +2063,7 @@ class Contact
* @param string $network Optional network we are probing for * @param string $network Optional network we are probing for
* @param boolean $force Optional forcing of network probing (otherwise we use the cached data) * @param boolean $force Optional forcing of network probing (otherwise we use the cached data)
* @return boolean * @return boolean
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function updateFromProbe($id, $network = '', $force = false) public static function updateFromProbe($id, $network = '', $force = false)
@ -2255,7 +2257,7 @@ class Contact
* @param bool $interactive * @param bool $interactive
* @param string $network * @param string $network
* @return array * @return array
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function createFromProbe($uid, $url, $interactive = false, $network = '') public static function createFromProbe($uid, $url, $interactive = false, $network = '')
@ -2527,7 +2529,7 @@ class Contact
* @param bool $sharing True: Contact is now sharing with Owner; False: Contact is now following Owner (default) * @param bool $sharing True: Contact is now sharing with Owner; False: Contact is now following Owner (default)
* @param string $note Introduction additional message * @param string $note Introduction additional message
* @return bool|null True: follow request is accepted; False: relationship is rejected; Null: relationship is pending * @return bool|null True: follow request is accepted; False: relationship is rejected; Null: relationship is pending
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function addRelationship(array $importer, array $contact, array $datarray, $sharing = false, $note = '') public static function addRelationship(array $importer, array $contact, array $datarray, $sharing = false, $note = '')
@ -2761,7 +2763,7 @@ class Contact
* @param string $url An url that we will be redirected to after the authentication * @param string $url An url that we will be redirected to after the authentication
* *
* @return string with "redir" link * @return string with "redir" link
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function magicLink($contact_url, $url = '') public static function magicLink($contact_url, $url = '')
@ -2788,7 +2790,7 @@ class Contact
* @param string $url An url that we will be redirected to after the authentication * @param string $url An url that we will be redirected to after the authentication
* *
* @return string with "redir" link * @return string with "redir" link
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function magicLinkbyId($cid, $url = '') public static function magicLinkbyId($cid, $url = '')
@ -2805,7 +2807,7 @@ class Contact
* @param string $url An url that we will be redirected to after the authentication * @param string $url An url that we will be redirected to after the authentication
* *
* @return string with "redir" link * @return string with "redir" link
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public static function magicLinkByContact($contact, $url = '') public static function magicLinkByContact($contact, $url = '')