X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=gravatar%2Fgravatar.php;h=c23d1b30f83c2255d2e68ea98a4897d0752fe813;hb=362efbc6c8f542fb7127613596fcc6b87821a3e6;hp=4464cd2cf7fb0f075e90c697c26c714d361af7fd;hpb=db22719bb8a9139fe8ee95ef74e599d239561a99;p=friendica-addons.git

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 4464cd2c..c23d1b30 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -2,7 +2,7 @@
 /**
  * Name: Gravatar Support
  * Description: If there is no avatar image for a new user or contact this plugin will look for one at Gravatar.
- * Version: 1.0
+ * Version: 1.1
  * Author: Klaus Weidenbach <http://friendica.dszdw.net/profile/klaus>
  */
 
@@ -12,7 +12,7 @@
 function gravatar_install() {
 	register_hook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
-	logger("installed gravatar");
+	logger("registered gravatar in avatar_lookup hook");
 }
 
 /**
@@ -21,7 +21,7 @@ function gravatar_install() {
 function gravatar_uninstall() {
 	unregister_hook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
-	logger("uninstalled gravatar");
+	logger("unregistered gravatar in avatar_lookup hook");
 }
 
 /**
@@ -36,7 +36,7 @@ function gravatar_lookup($a, &$b) {
 
 	// setting default value if nothing configured
 	if(! $default_avatar)
-		$default_avatar = 'identicon'; // pseudo-random geometric pattern based on email hash
+		$default_avatar = 'identicon'; // default image will be a random pattern
 	if(! $rating)
 		$rating = 'g'; // suitable for display on all websites with any audience type
 
@@ -47,14 +47,15 @@ function gravatar_lookup($a, &$b) {
 	if ($default_avatar != "gravatar")
 		$url .= '&d=' .$default_avatar;
 
-	$b['url'] = $url;
+	$b['url'] = $url;	
+	$b['success'] = true;
 }
 
 /**
  * Display admin settings for this addon
  */
 function gravatar_plugin_admin (&$a, &$o) {
-	$t = file_get_contents( dirname(__file__)."/admin.tpl");
+	$t = get_markup_template( "admin.tpl", "addon/gravatar/" );
 
 	$default_avatar = get_config('gravatar', 'default_img');
 	$rating = get_config('gravatar', 'rating');
@@ -67,12 +68,11 @@ function gravatar_plugin_admin (&$a, &$o) {
 
 	// Available options for the select boxes
 	$default_avatars = array(
-		'gravatar' => 'Gravatar',
-		'mm' => 'MM',
-		'identicon' => 'Identicon',
-		'monsterid' => 'Monsterid',
-		'wavatar' => 'Wavatar',
-		'retro' => 'Retro'
+		'mm' => t('generic profile image'),
+		'identicon' => t('random geometric pattern'),
+		'monsterid' => t('monster face'),
+		'wavatar' => t('computer generated face'),
+		'retro' => t('retro arcade style face'),
 	);
 	$ratings = array(
 		'g' => 'g',
@@ -81,9 +81,18 @@ function gravatar_plugin_admin (&$a, &$o) {
 		'x' => 'x'
 	);
 
-	$o = '<input type="hidden" name="form_security_token" value="' .get_form_security_token("gravatarsave") .'">';
+	// Check if Libravatar is enabled and show warning
+	$r = q("SELECT * FROM `addon` WHERE `name` = '%s' and `installed` = 1",
+		dbesc('libravatar')
+	);
+	if (count($r)) {
+		$o = '<h5>' .t('Information') .'</h5><p>' .t('Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'</p><br><br>';
+	}
+
+	// output Gravatar settings
+	$o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("gravatarsave") .'">';
 	$o .= replace_macros( $t, array(
-		'$submit' => t('Submit'),
+		'$submit' => t('Save Settings'),
 		'$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars),
 		'$rating' => array('rating', t('Rating of images'), $rating, t('Select the appropriate avatar rating for your site. See README'), $ratings),
 	));