diff options
| author | friendica <info@friendica.com> | 2012-04-10 15:28:48 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-04-10 15:28:48 -0700 |
| commit | 3c66816938bdc97490dee52e98433164aa9f81a7 (patch) | |
| tree | c7c0e189018703459d8b699e6d2d773696eba547 /include | |
| parent | 35b978bb1e5a935d99015098029f2ed29ff07498 (diff) | |
| parent | 1f9fe8b5eeebfb6bc1275cba7dbb4daac1a2e910 (diff) | |
| download | volse-hubzilla-3c66816938bdc97490dee52e98433164aa9f81a7.tar.gz volse-hubzilla-3c66816938bdc97490dee52e98433164aa9f81a7.tar.bz2 volse-hubzilla-3c66816938bdc97490dee52e98433164aa9f81a7.zip | |
Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull
Diffstat (limited to 'include')
| -rw-r--r-- | include/Scrape.php | 4 | ||||
| -rw-r--r-- | include/network.php | 20 |
2 files changed, 11 insertions, 13 deletions
diff --git a/include/Scrape.php b/include/Scrape.php index 9c237916b..141c90dcf 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -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)) diff --git a/include/network.php b/include/network.php index 38d0980d5..58cef4756 100644 --- a/include/network.php +++ b/include/network.php @@ -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'] = ''; + + call_hooks('avatar_lookup', $avatar); - logger('gravatar: ' . $email . ' ' . $url); - return $url; + logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url']); + return $avatar['url']; }} |