]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
authorSiebrand Mazeland <s.mazeland@xs4all.nl>
Sun, 10 Jan 2010 00:46:39 +0000 (01:46 +0100)
committerSiebrand Mazeland <s.mazeland@xs4all.nl>
Sun, 10 Jan 2010 00:46:39 +0000 (01:46 +0100)
22 files changed:
lib/mailhandler.php
plugins/APCPlugin.php
plugins/Autocomplete/AutocompletePlugin.php
plugins/Autocomplete/README [new file with mode: 0644]
plugins/Autocomplete/readme.txt [deleted file]
plugins/CasAuthentication/CasAuthenticationPlugin.php
plugins/EmailAuthentication/EmailAuthenticationPlugin.php
plugins/FirePHP/FirePHPPlugin.php
plugins/FirePHP/README
plugins/Gravatar/GravatarPlugin.php
plugins/Imap/ImapPlugin.php
plugins/Imap/imapdaemon.php
plugins/InfiniteScroll/InfiniteScrollPlugin.php
plugins/InfiniteScroll/README [new file with mode: 0644]
plugins/InfiniteScroll/readme.txt [deleted file]
plugins/LdapAuthentication/LdapAuthenticationPlugin.php
plugins/LdapAuthorization/LdapAuthorizationPlugin.php
plugins/Minify/MinifyPlugin.php
plugins/PubSubHubBub/PubSubHubBubPlugin.php
plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php
plugins/XCachePlugin.php

index 32a8cd9bc5ab34f5de04fef9071fe49b5f3d161f..85be89f1868540b10e41f232ed9d4cdff82f26e6 100644 (file)
@@ -139,7 +139,7 @@ class MailHandler
 
         $headers['From'] = $to;
         $headers['To'] = $from;
-        $headers['Subject'] = "Command complete";
+        $headers['Subject'] = _('Command complete');
 
         return mail_send(array($from), $headers, $response);
     }
@@ -225,7 +225,7 @@ class MailHandler
 
     function unsupported_type($type)
     {
-        $this->error(null, "Unsupported message type: " . $type);
+        $this->error(null, sprintf(_('Unsupported message type: %s'), $type));
     }
 
     function cleanup_msg($msg)
index 18409e29e537613b1d40f34f16dca658fd0d1199..666f64b147cede8f01f97a63a41bced6541acfec 100644 (file)
@@ -104,5 +104,16 @@ class APCPlugin extends Plugin
         Event::handle('EndCacheDelete', array($key));
         return false;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'APC',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:APC',
+                            'rawdescription' =>
+                            _m('Use the <a href="http://pecl.php.net/package/apc">APC</a> variable cache to cache query results.'));
+        return true;
+    }
 }
 
index baaec73c1672f770e83798946456af1788d3a52d..d586631a4a09dd4542784c1c7c0c2b239c9b137c 100644 (file)
@@ -61,5 +61,16 @@ class AutocompletePlugin extends Plugin
         }
     }
 
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Autocomplete',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:Autocomplete',
+                            'rawdescription' =>
+                            _m('The autocomplete plugin allows users to autocomplete screen names in @ replies. When an "@" is typed into the notice text area, an autocomplete box is displayed populated with the user\'s friend\' screen names.'));
+        return true;
+    }
+
 }
 ?>
diff --git a/plugins/Autocomplete/README b/plugins/Autocomplete/README
new file mode 100644 (file)
index 0000000..1db4c65
--- /dev/null
@@ -0,0 +1,8 @@
+Autocomplete allows users to autocomplete screen names in @ replies. When an "@" is typed into the notice text area, an autocomplete box is displayed populated with the user's friends' screen names.
+
+Note: This plugin doesn't work if the site is in Private mode, i.e. when $config['site']['private'] is set to true.
+
+Installation
+============
+Add "addPlugin('Autocomplete');" to the bottom of your config.php
+That's it!
diff --git a/plugins/Autocomplete/readme.txt b/plugins/Autocomplete/readme.txt
deleted file mode 100644 (file)
index 1db4c65..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-Autocomplete allows users to autocomplete screen names in @ replies. When an "@" is typed into the notice text area, an autocomplete box is displayed populated with the user's friends' screen names.
-
-Note: This plugin doesn't work if the site is in Private mode, i.e. when $config['site']['private'] is set to true.
-
-Installation
-============
-Add "addPlugin('Autocomplete');" to the bottom of your config.php
-That's it!
index 818a11f77e19ce76abc51881ca392b928952c08e..483b060abdba12d03806da23eccc0c26a129b063 100644 (file)
@@ -138,4 +138,15 @@ class CasAuthenticationPlugin extends AuthenticationPlugin
         $casSettings['port']=$this->port;
         $casSettings['path']=$this->path;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'CAS Authentication',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:CasAuthentication',
+                            'rawdescription' =>
+                            _m('The CAS Authentication plugin allows for StatusNet to handle authentication through CAS (Central Authentication Service).'));
+        return true;
+    }
 }
index 25e5377354ce129a5746ad4e68214ecddc439bf3..406c000731d5e28d15b06bd3f7405cb88d9480fe 100644 (file)
@@ -50,5 +50,16 @@ class EmailAuthenticationPlugin extends Plugin
             }
         }
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Email Authentication',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:EmailAuthentication',
+                            'rawdescription' =>
+                            _m('The Email Authentication plugin allows users to login using their email address.'));
+        return true;
+    }
 }
 
index 37b397796e3d11b76ea892a464eaa943fc6ad4b3..452f7902422392507fd5c21901c0e306b112e750 100644 (file)
@@ -55,5 +55,16 @@ class FirePHPPlugin extends Plugin
         $priority = $firephp_priorities[$priority];
         $this->firephp->fb($msg, $priority);
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'FirePHP',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:FirePHP',
+                            'rawdescription' =>
+                            _m('The FirePHP plugin writes StatusNet\'s log output to FirePHP.'));
+        return true;
+    }
 }
 
index ee22794d51da13d9c73fa2ce89e26ac63f6cb3de..22ed1e9be3decd20e0763e9e125e012f30be21ed 100644 (file)
@@ -1,4 +1,4 @@
-The FirePHP writes StatusNet's log output to FirePHP.
+The FirePHP plugin writes StatusNet's log output to FirePHP.
 
 Using FirePHP on production sites can expose sensitive information.
     You must protect the security of your application by disabling FirePHP
index 3c61a682ed6e917d9ca6e22665d8dc608e9c77cf..580852072ddbe32a78d7f4d5b5b923d0814dc166 100644 (file)
@@ -185,4 +185,16 @@ class GravatarPlugin extends Plugin
                 "&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;
+    }
 }
index 034444222210819e5cbab3f1fae1bd8d7c0d2172..d9768b680205e8e31b3aed737fa9adae7bacf523 100644 (file)
@@ -82,4 +82,15 @@ class ImapPlugin extends Plugin
         }
         return true;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'IMAP',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:IMAP',
+                            'rawdescription' =>
+                            _m('The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for incoming mail containing user posts.'));
+        return true;
+    }
 }
index a45c603cec1ec9a3b298fb97989a0120d3f13968..7e60e137632cf06fe346cc1584880d522d8a90fd 100755 (executable)
@@ -117,7 +117,7 @@ class IMAPMailHandler extends MailHandler
     {
         $this->log(LOG_INFO, "Error: $from $msg");
         $headers['To'] = $from;
-        $headers['Subject'] = "Error";
+        $headers['Subject'] = _m('Error');
 
         return mail_send(array($from), $headers, $msg);
     }
index 5928c007fe1a3991f8fa64290bace4c496329c2b..a4d1a5d05ce11f05b43d77119a61ac91a4d3ca79 100644 (file)
@@ -43,4 +43,15 @@ class InfiniteScrollPlugin extends Plugin
         $action->script('plugins/InfiniteScroll/jquery.infinitescroll.js');
         $action->script('plugins/InfiniteScroll/infinitescroll.js');
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'InfiniteScroll',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:InfiniteScroll',
+                            'rawdescription' =>
+                            _m('Infinite Scroll adds the following functionality to your StatusNet installation: When a user scrolls towards the bottom of the page, the next page of notices is automatically retrieved and appended. This means they never need to click "Next Page", which dramatically increases stickiness.'));
+        return true;
+    }
 }
diff --git a/plugins/InfiniteScroll/README b/plugins/InfiniteScroll/README
new file mode 100644 (file)
index 0000000..2428cc6
--- /dev/null
@@ -0,0 +1,6 @@
+Infinite Scroll adds the following functionality to your StatusNet installation: When a user scrolls towards the bottom of the page, the next page of notices is automatically retrieved and appended. This means they never need to click "Next Page", which dramatically increases stickiness.
+
+Installation
+============
+Add "addPlugin('InfiniteScroll');" to the bottom of your config.php
+That's it!
diff --git a/plugins/InfiniteScroll/readme.txt b/plugins/InfiniteScroll/readme.txt
deleted file mode 100644 (file)
index 2428cc6..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-Infinite Scroll adds the following functionality to your StatusNet installation: When a user scrolls towards the bottom of the page, the next page of notices is automatically retrieved and appended. This means they never need to click "Next Page", which dramatically increases stickiness.
-
-Installation
-============
-Add "addPlugin('InfiniteScroll');" to the bottom of your config.php
-That's it!
index c14fa21a9c66c74c35bb3d275662e3ab91673b29..eb3a05117a4c72e2440190fce1dd8f90c7ffa87d 100644 (file)
@@ -346,4 +346,15 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
 
         return $str;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'LDAP Authentication',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:LdapAuthentication',
+                            'rawdescription' =>
+                            _m('The LDAP Authentication plugin allows for StatusNet to handle authentication through LDAP.'));
+        return true;
+    }
 }
index e5e22c0ddeab1dbce49cae5443166fc87bfdcac9..7f48ce5e1b0fd8b35578200fd49adb5ae4a4c24a 100644 (file)
@@ -206,4 +206,15 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
             return false;
         }
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'LDAP Authorization',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:LdapAuthorization',
+                            'rawdescription' =>
+                            _m('The LDAP Authorization plugin allows for StatusNet to handle authorization through LDAP.'));
+        return true;
+    }
 }
index 718bfd163530d92db7ed03c16acd14de55d04cb2..b49b6a4bad1dc63c296edab6b6a8bbc5fe735c72 100644 (file)
@@ -164,5 +164,16 @@ class MinifyPlugin extends Plugin
         require_once('Minify/CSS.php');
         return Minify_CSS::minify($code,$options);
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Minify',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:Minify',
+                            'rawdescription' =>
+                            _m('The Minify plugin minifies your CSS and Javascript, removing whitespace and comments.'));
+        return true;
+    }
 }
 
index d15a869cba3b9f967736cb73e5f357f64cd5d4be..c40d906a538655f463bc2d66bc05332a954c893e 100644 (file)
@@ -118,4 +118,16 @@ class PubSubHubBubPlugin extends Plugin
             }
         }
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'PubSubHubBub',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:PubSubHubBub',
+                            'rawdescription' =>
+                            _m('The PubSubHubBub plugin pushes RSS/Atom updates to a <a href="http://pubsubhubbub.googlecode.com/">PubSubHubBub</a> hub.'));
+
+        return true;
+    }
 }
index 04adbf00ee9101cdc5397363724a1e3642411278..3581f1de9240b5d283f56cc968a82c9dda4ee3de 100644 (file)
@@ -96,5 +96,16 @@ class RequireValidatedEmailPlugin extends Plugin
         }
         return false;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Require Validated Email',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews, Evan Prodromou, Brion Vibber',
+                            'homepage' => 'http://status.net/wiki/Plugin:RequireValidatedEmail',
+                            'rawdescription' =>
+                            _m('The Require Validated Email plugin disables posting for accounts that do not have a validated email address.'));
+        return true;
+    }
 }
 
index d157ea067cf70def1d750451b63d6e93473dd3ae..d9d2137f827dded3ade0f7ee6b2de6160a3f2679 100644 (file)
@@ -53,4 +53,15 @@ class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin
         $registration_data['nickname'] = $username ;
         return User::register($registration_data);
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Reverse Username Authentication',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:ReverseUsernameAuthentication',
+                            'rawdescription' =>
+                            _m('The Reverse Username Authentication plugin allows for StatusNet to handle authentication by checking if the provided password is the same as the reverse of the username.'));
+        return true;
+    }
 }
index 03cb0c06ea94cc54a8e3605a94932b291ef0176f..2baa290ed294cee8cdc98f17a805fd4bf39f8d44 100644 (file)
@@ -109,5 +109,16 @@ class XCachePlugin extends Plugin
         Event::handle('EndCacheDelete', array($key));
         return false;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'XCache',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:XCache',
+                            'rawdescription' =>
+                            _m('Use the <a href="http://xcache.lighttpd.net/">XCache</a> variable cache to cache query results.'));
+        return true;
+    }
 }