Merge pull request #256 from annando/1502-new-community-setting

[friendica-addons.git] / gravatar / gravatar.php

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index b9435a317d16c06bfc2809a276f52d648c1cd0ff..c23d1b30f83c2255d2e68ea98a4897d0752fe813 100644 (file)
--- 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");
 }
 
 /**
@@ -55,7 +55,7 @@ function gravatar_lookup($a, &$b) {
  * 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');
@@ -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),
        ));