friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

de-duplicate photo importation logic

This commit is contained in:
Mike Macgirvin 2010-10-26 14:50:38 -07:00
parent c16f314ec3
commit d2e20d029a
3 changed files with 61 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
include/Photo.php
View File

@ -208,3 +208,44 @@ class Photo {
}} }}
function import_profile_photo($photo,$uid,$cid) {
$a = get_app();
$photo_failure = false;
$filename = basename($photo);
$img_str = fetch_url($photo,true);
$img = new Photo($img_str);
if($img->is_valid()) {
$img->scaleImageSquare(175);
$hash = photo_new_resource();
$r = $img->store($uid, $cid, $hash, $filename, t('Contact Photos'), 4 );
if($r === false)
$photo_failure = true;
$img->scaleImage(80);
$r = $img->store($uid, $cid, $hash, $filename, t('Contact Photos'), 5 );
if($r === false)
$photo_failure = true;
$photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg';
$thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg';
}
else
$photo_failure = true;
if($photo_failure) {
$photo = $a->get_baseurl() . '/images/default-profile.jpg';
$thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg';
}
return(array($photo,$thumb));
}

87
mod/dfrn_confirm.php
View File

@ -229,40 +229,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
require_once("Photo.php"); require_once("Photo.php");
$photo_failure = false; $photos = import_profile_photo($contact['photo'],$uid,$contact_id);
$filename = basename($contact['photo']);
$img_str = fetch_url($contact['photo'],true);
$img = new Photo($img_str);
if($img->is_valid()) {
$img->scaleImageSquare(175);
$hash = photo_new_resource();
$r = $img->store($uid, $contact_id, $hash, $filename, t('Contact Photos'), 4 );
if($r === false)
$photo_failure = true;
$img->scaleImage(80);
$r = $img->store($uid, $contact_id, $hash, $filename, t('Contact Photos'), 5 );
if($r === false)
$photo_failure = true;
$photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg';
$thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg';
}
else
$photo_failure = true;
if($photo_failure) {
$photo = $a->get_baseurl() . '/images/default-profile.jpg';
$thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg';
}
if($contact['network'] === 'dfrn') { if($contact['network'] === 'dfrn') {
@ -281,8 +248,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
`duplex` = %d, `duplex` = %d,
`network` = 'dfrn' WHERE `id` = %d LIMIT 1 `network` = 'dfrn' WHERE `id` = %d LIMIT 1
", ",
dbesc($photo), dbesc($photos[0]),
dbesc($thumb), dbesc($photos[1]),
intval($new_relation), intval($new_relation),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
@ -324,8 +291,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
`pending` = 0 `pending` = 0
WHERE `id` = %d LIMIT 1 WHERE `id` = %d LIMIT 1
", ",
dbesc($photo), dbesc($photos[0]),
dbesc($thumb), dbesc($photos[1]),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
@ -463,47 +430,19 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
// We're good but now we have to scrape the profile photo and send notifications. // We're good but now we have to scrape the profile photo and send notifications.
require_once("Photo.php");
$photo_failure = false;
$r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1", $r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1",
intval($dfrn_record)); intval($dfrn_record));
if(count($r)) {
$filename = basename($r[0]['photo']); if(count($r))
$img_str = fetch_url($r[0]['photo'],true); $photo = $r[0]['photo'];
$img = new Photo($img_str);
if($img->is_valid()) {
$img->scaleImageSquare(175);
$hash = photo_new_resource();
$r = $img->store($local_uid, $dfrn_record, $hash, $filename, t('Contact Photos') , 4);
if($r === false)
$photo_failure = true;
$img->scaleImage(80);
$r = $img->store($local_uid, $dfrn_record, $hash, $filename, t('Contact Photos') , 5);
if($r === false)
$photo_failure = true;
$photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg';
$thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg';
}
else else
$photo_failure = true;
}
else
$photo_failure = true;
if($photo_failure) {
$photo = $a->get_baseurl() . '/images/default-profile.jpg'; $photo = $a->get_baseurl() . '/images/default-profile.jpg';
$thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg';
} require_once("Photo.php");
$photos = import_profile_photo($photo,$local_uid,$dfrn_record);
$new_relation = REL_FAN; $new_relation = REL_FAN;
if(($relation == REL_VIP) || ($duplex)) if(($relation == REL_VIP) || ($duplex))
@ -521,8 +460,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
`duplex` = %d, `duplex` = %d,
`network` = 'dfrn' WHERE `id` = %d LIMIT 1 `network` = 'dfrn' WHERE `id` = %d LIMIT 1
", ",
dbesc($photo), dbesc($photos[0]),
dbesc($thumb), dbesc($photos[1]),
intval($new_relation), intval($new_relation),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),

44
mod/follow.php
View File

@ -70,15 +70,17 @@ function follow_post(&$a) {
$vcard['photo'] = $a->get_baseurl() . '/images/default-profile.jpg' ; $vcard['photo'] = $a->get_baseurl() . '/images/default-profile.jpg' ;
// check if we already have a contact // check if we already have a contact
// the poll url is more reliable than the profile url, as we may have
// indirect links or webfinger links
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `poll` = '%s' LIMIT 1",
intval(local_user()), intval(local_user()),
dbesc($poll) dbesc($poll)
); );
if($r) { if(count($r)) {
// update contact // update contact
if($r[0]['rel'] == REL_VIP) { if($r[0]['rel'] == REL_VIP) {
q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1", q("UPDATE `contact` SET `rel` = %d , `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval(REL_BUD), intval(REL_BUD),
intval($r[0]['id']), intval($r[0]['id']),
intval(local_user()) intval(local_user())
@ -117,39 +119,7 @@ function follow_post(&$a) {
require_once("Photo.php"); require_once("Photo.php");
$photo_failure = false; $photos = import_profile_photo($vcard['photo'],local_user(),$contact_id);
$filename = basename($vcard['photo']);
$img_str = fetch_url($vcard['photo'],true);
$img = new Photo($img_str);
if($img->is_valid()) {
$img->scaleImageSquare(175);
$hash = photo_new_resource();
$r = $img->store(local_user(), $contact_id, $hash, $filename, t('Contact Photos'), 4 );
if($r === false)
$photo_failure = true;
$img->scaleImage(80);
$r = $img->store(local_user(), $contact_id, $hash, $filename, t('Contact Photos'), 5 );
if($r === false)
$photo_failure = true;
$photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg';
$thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg';
}
else
$photo_failure = true;
if($photo_failure) {
$photo = $a->get_baseurl() . '/images/default-profile.jpg';
$thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg';
}
$r = q("UPDATE `contact` SET `photo` = '%s', $r = q("UPDATE `contact` SET `photo` = '%s',
`thumb` = '%s', `thumb` = '%s',
@ -158,8 +128,8 @@ function follow_post(&$a) {
`avatar-date` = '%s' `avatar-date` = '%s'
WHERE `id` = %d LIMIT 1 WHERE `id` = %d LIMIT 1
", ",
dbesc($photo), dbesc($photos[0]),
dbesc($thumb), dbesc($photos[1]),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),