Merge branch 'master' into 0.9.x

[quix0rs-gnu-social.git] / plugins / Gravatar / GravatarPlugin.php

diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php
index 3c61a682ed6e917d9ca6e22665d8dc608e9c77cf..dd8ff7217615e8138ee55a5623fa04126de75868 100644 (file)
--- a/plugins/Gravatar/GravatarPlugin.php
+++ b/plugins/Gravatar/GravatarPlugin.php
@@ -30,20 +30,23 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class GravatarPlugin extends Plugin
 {
-    function onInitializePlugin() {
+    function onInitializePlugin()
+    {
         return true;
     }
-    
-    function onStartAvatarFormData($action) {
+
+    function onStartAvatarFormData($action)
+    {
         $user = common_current_user();
         $hasGravatar = $this->hasGravatar($user->id);
-        
+
         if($hasGravatar) {
             return false;
         }
     }
-    
-    function onEndAvatarFormData(&$action) {
+
+    function onEndAvatarFormData($action)
+    {
         $user = common_current_user();
         $hasGravatar = $this->hasGravatar($user->id);
 
@@ -88,8 +91,9 @@ class GravatarPlugin extends Plugin
                              _m('To use a Gravatar first enter in an email address.'));
         }
     }
-    
-    function onStartAvatarSaveForm($action) {
+
+    function onStartAvatarSaveForm($action)
+    {
         if ($action->arg('add')) {
             $result = $this->gravatar_save();
 
@@ -127,19 +131,18 @@ class GravatarPlugin extends Plugin
         }
         return false;
      }
- 
 
     function gravatar_save()
     {
         $cur = common_current_user();
-        
+
         if(empty($cur->email)) {
-            return array('message' => _m('You do not have a email set in your profile.'),
+            return array('message' => _m('You do not have an email address set in your profile.'),
                          'success' => false);
         }
         //Get rid of previous Avatar
         $this->gravatar_remove();
-        
+
         foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
             $gravatar = new Avatar();
             $gravatar->profile_id = $cur->id;
@@ -152,7 +155,7 @@ class GravatarPlugin extends Plugin
             $gravatar->created = DB_DataObject_Cast::dateTime(); # current time
 
             if (!$gravatar->insert()) {
-                return array('message' => _m('Failed to save Gravatar to the DB.'),
+                return array('message' => _m('Failed to save Gravatar to the database.'),
                              'success' => false);
             }
         }
@@ -177,12 +180,25 @@ class GravatarPlugin extends Plugin
         return array('message' => _m('Gravatar removed.'),
                      'success' => true);
     }
- 
-    function gravatar_url($email, $size) {
+
+    function gravatar_url($email, $size)
+    {
         $url = "http://www.gravatar.com/avatar.php?gravatar_id=".
                 md5(strtolower($email)).
                 "&default=".urlencode(Avatar::defaultImage($size)).
                 "&size=".$size;
             return $url;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Gravatar',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Eric Helgeson',
+                            'homepage' => 'http://status.net/wiki/Plugin:Gravatar',
+                            'rawdescription' =>
+                            _m('The Gravatar plugin allows users to use their <a href="http://www.gravatar.com/">Gravatar</a> with StatusNet.'));
+
+        return true;
+    }
 }