harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

issue #225

Browse Source
This commit is contained in:
friendica 2013-12-05 18:17:16 -08:00
parent 539988b62f
commit 38577cf26c
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/zot.php
View File

@ -670,10 +670,31 @@ function import_xchan($arr,$ud_flags = 1) {
require_once('include/photo/photo_driver.php'); require_once('include/photo/photo_driver.php');
// see if this is a channel clone that's hosted locally - which we treat different from other xchans/connections
$local = q("select channel_account_id, channel_id from channel where channel_hash = '%s' limit 1",
dbesc($xchan_hash)
);
if($local) {
$ph = z_fetch_url($arr['photo'],true);
if($ph['success']) {
import_channel_photo($ph['body'], $arr['photo_mimetype'], $local[0]['channel_account_id'],$local[0]['channel_id']);
// reset the names in case they got messed up when we had a bug in this function
$photos = array(
z_root() . '/photo/profile/l/' . $local[0]['channel_id'],
z_root() . '/photo/profile/m/' . $local[0]['channel_id'],
z_root() . '/photo/profile/s/' . $local[0]['channel_id'],
$arr['photo_mimetype']
);
}
}
else {
$photos = import_profile_photo($arr['photo'],$xchan_hash); $photos = import_profile_photo($arr['photo'],$xchan_hash);
}
if($photos) {
$r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' $r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s'
where xchan_hash = '%s' limit 1", where xchan_hash = '%s' limit 1",
dbesc($arr['photo_updated']), dbesc(datetime_convert('UTC','UTC',$arr['photo_updated'])),
dbesc($photos[0]), dbesc($photos[0]),
dbesc($photos[1]), dbesc($photos[1]),
dbesc($photos[2]), dbesc($photos[2]),
@ -684,6 +705,7 @@ function import_xchan($arr,$ud_flags = 1) {
$what .= 'photo '; $what .= 'photo ';
$changed = true; $changed = true;
} }
}
// what we are missing for true hub independence is for any changes in the primary hub to // what we are missing for true hub independence is for any changes in the primary hub to
// get reflected not only in the hublocs, but also to update the URLs and addr in the appropriate xchan // get reflected not only in the hublocs, but also to update the URLs and addr in the appropriate xchan

2
mod/authtest.php
View File

@ -31,6 +31,8 @@ function authtest_content(&$a) {
$z = z_fetch_url($x['url'] . '&test=1'); $z = z_fetch_url($x['url'] . '&test=1');
if($z['success']) { if($z['success']) {
$j = json_decode($z['body'],true); $j = json_decode($z['body'],true);
if(! $j)
$o .= 'json_decode failure from remote site. ' . print_r($z['body'],true);
$o .= 'Remote site responded: ' . print_r($j,true); $o .= 'Remote site responded: ' . print_r($j,true);
} }
else { else {

2
mod/profile_photo.php
View File

@ -42,7 +42,7 @@ function profile_photo_post(&$a) {
intval($_REQUEST['profile']), intval($_REQUEST['profile']),
intval(local_user()) intval(local_user())
); );
if(count($r) && (! intval($r[0]['is_default']))) if(($r) && (! intval($r[0]['is_default'])))
$is_default_profile = 0; $is_default_profile = 0;
} }