MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull

Browse source
This commit is contained in:
friendica 2012-04-10 15:28:48 -07:00
commit 3c66816938
7 changed files with 24 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/Scrape.php
View file

@ -446,7 +446,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
$phost = substr($url,strpos($url,'@')+1);
$profile = 'http://' . $phost;
// fix nick character range
$vcard = array('fn' => $name, 'nick' => $name, 'photo' => gravatar_img($url));
$vcard = array('fn' => $name, 'nick' => $name, 'photo' => avatar_img($url));
$notify = 'smtp ' . random_string();
$poll = 'email ' . random_string();
$priority = 0;
@ -655,7 +655,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
}
if((! $vcard['photo']) && strlen($email))
$vcard['photo'] = gravatar_img($email);
$vcard['photo'] = avatar_img($email);
if($poll === $profile)
$lnk = $feed->get_permalink();
if(isset($lnk) && strlen($lnk))

20
include/network.php
View file

@ -692,18 +692,16 @@ function allowed_email($email) {
}}
if(! function_exists('gravatar_img')) {
function gravatar_img($email) {
$size = 175;
$opt = 'identicon'; // psuedo-random geometric pattern if not found
$rating = 'pg';
$hash = md5(trim(strtolower($email)));
$url = 'http://www.gravatar.com/avatar/' . $hash . '.jpg'
. '?s=' . $size . '&d=' . $opt . '&r=' . $rating;
if(! function_exists('avatar_img')) {
function avatar_img($email) {
$avatar['size'] = 175;
$avatar['email'] = $email;
$avatar['url'] = '';
logger('gravatar: ' . $email . ' ' . $url);
return $url;
call_hooks('avatar_lookup', $avatar);
logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url']);
return $avatar['url'];
}}