aboutsummaryrefslogtreecommitdiffstats
path: root/include/network.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-11 19:35:51 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-11 19:35:51 +0200
commitee714daf4d33f8258e1301438423fc10a3bdc916 (patch)
treee3da18226db88c42819e2f29b67763581eb1c293 /include/network.php
parentc88c2515e43f7a446a9b358fb657290a8a6c847a (diff)
parenta1d5026abf129fc520327881a293d17c1ab21eff (diff)
downloadvolse-hubzilla-ee714daf4d33f8258e1301438423fc10a3bdc916.tar.gz
volse-hubzilla-ee714daf4d33f8258e1301438423fc10a3bdc916.tar.bz2
volse-hubzilla-ee714daf4d33f8258e1301438423fc10a3bdc916.zip
Merge commit 'upstream/master'
Diffstat (limited to 'include/network.php')
-rw-r--r--include/network.php27
1 files changed, 16 insertions, 11 deletions
diff --git a/include/network.php b/include/network.php
index 38d0980d5..23ef50b21 100644
--- a/include/network.php
+++ b/include/network.php
@@ -692,18 +692,23 @@ 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) {
+
+ $a = get_app();
+
+ $avatar['size'] = 175;
+ $avatar['email'] = $email;
+ $avatar['url'] = '';
+ $avatar['success'] = false;
+
+ call_hooks('avatar_lookup', $avatar);
+
+ if(! $avatar['success'])
+ $avatar['url'] = $a->get_baseurl() . '/images/person-175.jpg';
- logger('gravatar: ' . $email . ' ' . $url);
- return $url;
+ logger('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], LOGGER_DEBUG);
+ return $avatar['url'];
}}