project "snakebite"

This commit is contained in:
friendica 2014-02-17 14:30:02 -08:00
parent f38ab09041
commit 08b571c9d0
3 changed files with 60 additions and 8 deletions

View file

@ -725,14 +725,60 @@ function import_author_xchan($x) {
return $arr['xchan_hash'];
if((! array_key_exists('network', $x)) || ($x['network'] === 'zot')) {
return import_author_zot($x);
$y = import_author_zot($x);
}
// TODO: create xchans for other common and/or aligned networks
if($x['network'] === 'rss') {
$y = import_author_rss($x);
}
return(($y) ? $y : false);
}
function import_author_rss($x) {
if(! $x['url'])
return false;
$r = q("select xchan_hash from xchan where xchan_network = 'rss' and xchan_url = '%s' limit 1",
dbesc($x['url'])
);
if($r) {
logger('import_author_rss: in cache' , LOGGER_DEBUG);
return $r[0]['xchan_hash'];
}
$name = trim($x['name']);
$r = q("insert into xchan ( xchan_hash, xchan_url, xchan_name, xchan_network )
values ( '%s', '%s', '%s', '%s' )",
dbesc($x['url']),
dbesc($x['url']),
dbesc(($name) ? $name : t('Unknown')),
dbesc('rss')
);
if($r) {
$photos = import_profile_photo($x['photo'],$x['url']);
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' where xchan_url = '%s' and xchan_network = 'rss' limit 1",
dbesc(datetime_convert('UTC','UTC',$arr['photo_updated'])),
dbesc($photos[0]),
dbesc($photos[1]),
dbesc($photos[2]),
dbesc($photos[3]),
dbesc($x['url'])
);
if($r)
return $x['url'];
}
}
return false;
}
function encode_item($item) {
$x = array();
$x['type'] = 'activity';

View file

@ -538,14 +538,20 @@ function import_profile_photo($photo,$xchan,$thing = false) {
}
$photo_failure = false;
$img_str = '';
if($photo) {
$filename = basename($photo);
$type = guess_image_type($photo,true);
$filename = basename($photo);
$type = guess_image_type($photo,true);
$result = z_fetch_url($photo,true);
if(! $type)
$type = 'image/jpeg';
if($result['success'])
$img_str = $result['body'];
$result = z_fetch_url($photo,true);
if($result['success'])
$img_str = $result['body'];
}
$img = photo_factory($img_str, $type);
if($img->is_valid()) {

View file

@ -1 +1 @@
2014-02-16.590
2014-02-17.591