aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/dfrn_confirm.php87
-rw-r--r--mod/follow.php44
2 files changed, 20 insertions, 111 deletions
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index cc1edea22..705f74f13 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -229,40 +229,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
require_once("Photo.php");
- $photo_failure = false;
-
- $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';
- }
-
+ $photos = import_profile_photo($contact['photo'],$uid,$contact_id);
if($contact['network'] === 'dfrn') {
@@ -281,8 +248,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
`duplex` = %d,
`network` = 'dfrn' WHERE `id` = %d LIMIT 1
",
- dbesc($photo),
- dbesc($thumb),
+ dbesc($photos[0]),
+ dbesc($photos[1]),
intval($new_relation),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
@@ -324,8 +291,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
`pending` = 0
WHERE `id` = %d LIMIT 1
",
- dbesc($photo),
- dbesc($thumb),
+ dbesc($photos[0]),
+ dbesc($photos[1]),
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.
- require_once("Photo.php");
- $photo_failure = false;
$r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1",
intval($dfrn_record));
- if(count($r)) {
-
- $filename = basename($r[0]['photo']);
- $img_str = fetch_url($r[0]['photo'],true);
- $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
- $photo_failure = true;
- }
+ if(count($r))
+ $photo = $r[0]['photo'];
else
- $photo_failure = true;
-
- if($photo_failure) {
$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;
if(($relation == REL_VIP) || ($duplex))
@@ -521,8 +460,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
`duplex` = %d,
`network` = 'dfrn' WHERE `id` = %d LIMIT 1
",
- dbesc($photo),
- dbesc($thumb),
+ dbesc($photos[0]),
+ dbesc($photos[1]),
intval($new_relation),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
diff --git a/mod/follow.php b/mod/follow.php
index 7ac9a50c3..29c5f4230 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -70,15 +70,17 @@ function follow_post(&$a) {
$vcard['photo'] = $a->get_baseurl() . '/images/default-profile.jpg' ;
// 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",
intval(local_user()),
dbesc($poll)
);
- if($r) {
+ if(count($r)) {
// update contact
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($r[0]['id']),
intval(local_user())
@@ -117,39 +119,7 @@ function follow_post(&$a) {
require_once("Photo.php");
- $photo_failure = false;
-
- $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';
- }
+ $photos = import_profile_photo($vcard['photo'],local_user(),$contact_id);
$r = q("UPDATE `contact` SET `photo` = '%s',
`thumb` = '%s',
@@ -158,8 +128,8 @@ function follow_post(&$a) {
`avatar-date` = '%s'
WHERE `id` = %d LIMIT 1
",
- dbesc($photo),
- dbesc($thumb),
+ dbesc($photos[0]),
+ dbesc($photos[1]),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 23:30:09 +0000