[VersionBump] 1.19.0, fairly late

The core plugins whose version was attached to GS's were reseted to 2.0.0.

2.0.0 was chosen as reset version for plugins because it is higher than
  the one that was set by inheriting GS version. Furthermore, it's a
  major change from prior plugin versioning system thus it also makes
  semantic sense.

Justification for version bump:

== GS ==
9a4ab31f26 1.19.0
c13b935201 1.18.3
c13b935201 1.18.2
18fc39d2cf 1.18.1
c083a8bcc2 1.18.0
e8783d46d0 1.17.1
d9a42550ff 1.17.0
1536d3ef29 1.16.0
c03ed457a6 1.15.0
d2e6519bad 1.14.2
fe411e8138 1.14.1
b17e0b4169 1.14.0
daa5f87fd4 1.13.0
d75b5d2f4a 1.11.7
f6dbf66983 1.11.6
6cf674f8f8 1.11.5
7845a09b34 1.11.4
e4d432295d 1.11.3
339204f1ee 1.11.2
a4e679a118 1.11.1
7967db6ff5 1.11.0
bc030da320 1.10.1
9cc7df51d6 1.10.0
bf7f17474d 1.9.2
8a07edec5f 1.9.1
0042971d74 1.9.0
6b5450b7e6 1.8.0
5dcc98d1c6 1.7.0
e6667db0cd 1.6.0
3290227b50 1.5.0
a59c439b46 1.4.0
496ab8c920 1.3.10
986030060b 1.3.9
1d529c021a 1.3.8
f89c052cf8 1.3.7
38f2ecefac 1.3.6
e473937cb9 1.3.5
9a39ebe66f 1.3.4
ddc3cecfc0 1.3.3
2b43d484eb 1.3.2
e8e487187e 1.3.1

== Plugins ==
XMPP plugin
e0887220b0 bump patch
e186ad57d0 bump patch

OStatus
e186ad57d0 bump patch

Nodeinfo
ceae66a30f bump minor
586fb5a517 bump major
195296846e bump minor

README.md

@@ -1,4 +1,4 @@
-# GNU social 1.3.x
+# GNU social 1.19.x
 (c) 2010 Free Software Foundation, Inc
 
 This is the README file for GNU social, the free

lib/framework.php

@@ -22,8 +22,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 define('GNUSOCIAL_ENGINE', 'GNU social');
 define('GNUSOCIAL_ENGINE_URL', 'https://www.gnu.org/software/social/');
 
-define('GNUSOCIAL_BASE_VERSION', '1.3.0');
+define('GNUSOCIAL_BASE_VERSION', '1.19.0');
-define('GNUSOCIAL_LIFECYCLE', 'beta5'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('GNUSOCIAL_LIFECYCLE', 'rc0'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 
 define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE);
 

plugins/AccountManager/AccountManagerPlugin.php

@@ -33,6 +33,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class AccountManagerPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     const AM_REL = 'acct-mgmt';
 
     function __construct()
@@ -77,7 +79,7 @@ class AccountManagerPlugin extends Plugin
     }
 
     function onLoginAction($action, &$login) {
-        switch ($action) 
+        switch ($action)
         {
          case 'AccountManagementControlDocument':
             $login = true;
@@ -90,7 +92,7 @@ class AccountManagerPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'AccountManager',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/AccountManager',
                             'rawdescription' =>

plugins/Activity/ActivityPlugin.php

@@ -46,7 +46,7 @@ if (!defined('STATUSNET')) {
  */
 class ActivityPlugin extends Plugin
 {
-    const VERSION = '0.1';
+    const PLUGIN_VERSION = '0.1.0';
     const SOURCE  = 'activity';
 
     // Flags to switch off certain activity notices
@@ -342,7 +342,7 @@ class ActivityPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Activity',
-                            'version' => self::VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Activity',
                             'rawdescription' =>

plugins/ActivitySpam/ActivitySpamPlugin.php

@@ -36,7 +36,7 @@ if (!defined('STATUSNET')) {
 
 /**
  * Check new notices with activity spam service.
- * 
+ *
  * @category  Spam
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
@@ -46,6 +46,8 @@ if (!defined('STATUSNET')) {
  */
 class ActivitySpamPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $server = null;
     public $hideSpam = false;
 
@@ -67,7 +69,7 @@ class ActivitySpamPlugin extends Plugin
 
         // Let DB_DataObject find Spam_score
 
-        common_config_set('db', 'class_location', 
+        common_config_set('db', 'class_location',
                           common_config('db', 'class_location') .':'.dirname(__FILE__));
 
         return true;
@@ -94,7 +96,7 @@ class ActivitySpamPlugin extends Plugin
 
     /**
      * When a notice is saved, check its spam score
-     * 
+     *
      * @param Notice $notice Notice that was just saved
      *
      * @return boolean hook value; true means continue processing, false means stop.
@@ -111,7 +113,7 @@ class ActivitySpamPlugin extends Plugin
             $this->log(LOG_INFO, "Notice " . $notice->id . " has spam score " . $score->score);
 
         } catch (Exception $e) {
-            // Log but continue 
+            // Log but continue
             $this->log(LOG_ERR, $e->getMessage());
         }
 
@@ -171,7 +173,7 @@ class ActivitySpamPlugin extends Plugin
 
         return true;
     }
-    
+
     /**
      * Map URLs to actions
      *
@@ -218,7 +220,7 @@ class ActivitySpamPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ActivitySpam',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ActivitySpam',
                             'description' =>

plugins/ActivityVerb/ActivityVerbPlugin.php

@@ -31,6 +31,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class ActivityVerbPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
 
     public function onRouterInitialized(URLMapper $m)
     {
@@ -47,7 +48,7 @@ class ActivityVerbPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Activity Verb',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://www.gnu.org/software/social/',
                             'rawdescription' =>

plugins/ActivityVerbPost/ActivityVerbPostPlugin.php

@@ -25,6 +25,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class ActivityVerbPostPlugin extends ActivityVerbHandlerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     // TODO: Implement a "fallback" feature which can handle anything _as_ an activityobject "note"
 
     public function tag()
@@ -128,7 +130,7 @@ class ActivityVerbPostPlugin extends ActivityVerbHandlerPlugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Post verb',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/',
                             'rawdescription' =>

plugins/AnonymousFave/AnonymousFavePlugin.php

@@ -43,7 +43,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-define('ANONYMOUS_FAVE_PLUGIN_VERSION', '0.1');
+define('ANONYMOUS_FAVE_PLUGIN_VERSION', '0.1.0');
 
 /**
  * Anonymous Fave plugin to allow anonymous (not logged in) users

plugins/AntiBrute/AntiBrutePlugin.php

@@ -3,6 +3,7 @@
 if (!defined('GNUSOCIAL')) { exit(1); }
 
 class AntiBrutePlugin extends Plugin {
+    const PLUGIN_VERSION = '2.0.0';
     protected $failed_attempts = 0;
     protected $unauthed_user = null;
     protected $client_ip = null;
@@ -71,7 +72,7 @@ class AntiBrutePlugin extends Plugin {
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'AntiBrute',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://gnu.io/',
                             'description' =>

plugins/ApiLogger/ApiLoggerPlugin.php

@@ -28,6 +28,7 @@ if (!defined('STATUSNET')) {
 
 class ApiLoggerPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     // Lower this to do random sampling of API requests rather than all.
     // 0.1 will check about 10% of hits, etc.
     public $frequency = 1.0;
@@ -78,7 +79,7 @@ class ApiLoggerPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ApiLogger',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ApiLogger',
                             'rawdescription' =>

plugins/AuthCrypt/AuthCryptPlugin.php

@@ -32,6 +32,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class AuthCryptPlugin extends AuthenticationPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     protected $hash         = '$6$';    // defaults to SHA512, i.e. '$6$', in onInitializePlugin()
     protected $statusnet    = true;     // if true, also check StatusNet style password hash
     protected $overwrite    = true;     // if true, password change means overwrite with crypt()
@@ -153,7 +154,7 @@ class AuthCryptPlugin extends AuthenticationPlugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'AuthCrypt',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/AuthCrypt',
                             'rawdescription' =>

plugins/AutoSandbox/AutoSandboxPlugin.php

@@ -38,6 +38,7 @@ define('AUTOSANDBOX', '0.1');
 
 class AutoSandboxPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     var $contact;
     var $debug;
 
@@ -59,7 +60,7 @@ class AutoSandboxPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'AutoSandbox',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Sean Carmody',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/AutoSandbox',
                             'rawdescription' =>

plugins/Autocomplete/AutocompletePlugin.php

@@ -34,6 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class AutocompletePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     function __construct()
     {
         parent::__construct();
@@ -55,7 +56,7 @@ class AutocompletePlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Autocomplete',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Autocomplete',
                             'rawdescription' =>

plugins/Awesomeness/AwesomenessPlugin.php

@@ -42,13 +42,13 @@ if (!defined('STATUSNET')) {
 
 class AwesomenessPlugin extends Plugin
 {
-    const VERSION = '0.0.42';
+    const PLUGIN_VERSION = '0.0.42';
 
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array(
             'name' => 'Awesomeness',
-            'version' => self::VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Jeroen De Dauw',
             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Awesomeness',
             // TRANS: Plugin description for a sample plugin.

plugins/BitlyUrl/BitlyUrlPlugin.php

@@ -35,6 +35,8 @@ if (!defined('STATUSNET')) {
 
 class BitlyUrlPlugin extends UrlShortenerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $shortenerName = 'bit.ly';
     public $serviceUrl = 'http://api.bit.ly/v3/shorten?longUrl=%s';
     public $login; // To set a site-default when admins or users don't override it.
@@ -147,7 +149,7 @@ class BitlyUrlPlugin extends UrlShortenerPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => sprintf('BitlyUrl (%s)', $this->shortenerName),
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews, Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/BitlyUrl',
                             'rawdescription' =>

plugins/Blacklist/BlacklistPlugin.php

@@ -40,7 +40,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class BlacklistPlugin extends Plugin
 {
-    const VERSION = GNUSOCIAL_VERSION;
+    const PLUGIN_VERSION = '2.0.0';
 
     public $nicknames = array();
     public $urls      = array();
@@ -265,7 +265,7 @@ class BlacklistPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Blacklist',
-                            'version' => self::VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' =>
                             'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Blacklist',

plugins/BlankAd/BlankAdPlugin.php

@@ -53,6 +53,7 @@ if (!defined('STATUSNET')) {
  */
 class BlankAdPlugin extends UAPPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     /**
      * Show a medium rectangle 'ad'
      *
@@ -120,7 +121,7 @@ class BlankAdPlugin extends UAPPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'BlankAd',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/BlankAdPlugin',
                             'rawdescription' =>

plugins/BlogspamNet/BlogspamNetPlugin.php

@@ -32,7 +32,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-define('BLOGSPAMNETPLUGIN_VERSION', '0.1');
+define('PLUGIN_VERSION', '0.1.0');
 
 /**
  * Plugin to check submitted notices with blogspam.net
@@ -145,13 +145,13 @@ class BlogspamNetPlugin extends Plugin
 
     function version()
     {
-        return BLOGSPAMNETPLUGIN_VERSION;
+        return PLUGIN_VERSION;
     }
 
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'BlogspamNet',
-                            'version' => BLOGSPAMNETPLUGIN_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou, Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/BlogspamNet',
                             'rawdescription' =>

plugins/Bookmark/BookmarkPlugin.php

@@ -43,7 +43,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class BookmarkPlugin extends MicroAppPlugin
 {
-    const VERSION         = '0.1';
+    const PLUGIN_VERSION         = '0.1.0';
     const IMPORTDELICIOUS = 'BookmarkPlugin:IMPORTDELICIOUS';
 
     /**
@@ -180,7 +180,7 @@ class BookmarkPlugin extends MicroAppPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Bookmark',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou, Stephane Berube, Jean Baptiste Favre, Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/social',
                             'description' =>

plugins/CacheLog/CacheLogPlugin.php

@@ -52,6 +52,8 @@ if (!defined('STATUSNET')) {
  */
 class CacheLogPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     function onStartCacheGet(&$key, &$value)
     {
         $this->log(LOG_INFO, "Fetching key '$key'");
@@ -99,7 +101,7 @@ class CacheLogPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'CacheLog',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/CacheLog',
                             'description' =>

plugins/CasAuthentication/CasAuthenticationPlugin.php

@@ -36,6 +36,8 @@ set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/ext
 
 class CasAuthenticationPlugin extends AuthenticationPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $server;
     public $port = 443;
     public $path = '';
@@ -152,7 +154,7 @@ class CasAuthenticationPlugin extends AuthenticationPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'CAS Authentication',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/CasAuthentication',
                             // TRANS: Plugin description. CAS is Central Authentication Service.

plugins/ChooseTheme/ChooseThemePlugin.php

@@ -23,6 +23,7 @@
  */
 
 class ChooseThemePlugin extends Plugin {
+    const PLUGIN_VERSION = '0.1.0';
 
     public function onRouterInitialized(URLMapper $m) {
         $m->connect('main/choosethemesettings', array('action' => 'choosethemesettings'));
@@ -31,7 +32,7 @@ class ChooseThemePlugin extends Plugin {
     public function onPluginVersion(array &$versions) {
 		
         $versions[] = array('name' => 'ChooseTheme',
-                            'version' => '0.1',
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Knut Erik "abjectio" Hollund',
                             'homepage' => 'https://gitlab.com/kollektivet0x242/gsp-choosetheme',
                             'rawdescription' =>

plugins/ClientSideShorten/ClientSideShortenPlugin.php

@@ -33,6 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class ClientSideShortenPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     function __construct()
     {
         parent::__construct();
@@ -57,7 +58,7 @@ class ClientSideShortenPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Shorten',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ClientSideShorten',
                             'rawdescription' =>

plugins/Comet/CometPlugin.php

@@ -44,6 +44,8 @@ require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php';
  */
 class CometPlugin extends RealtimePlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $server   = null;
     public $username = null;
     public $password = null;
@@ -107,7 +109,7 @@ class CometPlugin extends RealtimePlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Comet',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Comet',
                             'rawdescription' =>

plugins/ConversationTree/ConversationTreePlugin.php

@@ -25,6 +25,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class ConversationTreePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public function onStartShowConversation(Action $action, Conversation $conv, Profile $scoped=null) {
         $nl = new ConversationTree($conv->getNotices($action->getScoped()), $action);
         $cnt = $nl->show();
@@ -34,7 +36,7 @@ class ConversationTreePlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ConversationTree',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://gnu.io/',
                             'rawdescription' =>

plugins/Cronish/CronishPlugin.php

@@ -13,6 +13,8 @@
 if (!defined('GNUSOCIAL')) { exit(1); }
 
 class CronishPlugin extends Plugin {
+    const PLUGIN_VERSION = '2.0.0';
+
     public function onCronMinutely()
     {
         common_debug('CRON: Running near-minutely cron job!');
@@ -48,7 +50,7 @@ class CronishPlugin extends Plugin {
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Cronish',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://www.gnu.org/software/social/',
                             'description' =>

plugins/DefaultLayout/DefaultLayoutPlugin.php

@@ -31,6 +31,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class DefaultLayoutPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $prerender_replyforms = false;
 
     public function onEndShowThreadedNoticeTail(NoticeListItem $nli, Notice $notice, array $notices) {
@@ -46,7 +48,7 @@ class DefaultLayoutPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Default Layout',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://www.gnu.org/software/social/',
                             'rawdescription' =>

plugins/Diaspora/DiasporaPlugin.php

@@ -35,6 +35,8 @@ addPlugin('OStatus');
 
 class DiasporaPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '0.2.0';
+
     const REL_SEED_LOCATION = 'http://joindiaspora.com/seed_location';
     const REL_GUID          = 'http://joindiaspora.com/guid';
     const REL_PUBLIC_KEY    = 'diaspora-public-key';
@@ -79,7 +81,7 @@ class DiasporaPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Diaspora',
-                            'version' => '0.2',
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/social',
                             // TRANS: Plugin description.
@@ -148,7 +150,7 @@ class DiasporaPlugin extends Plugin
         /**
          * Encrypt your <decrypted_header> XML snippet using the “outer key”
          * and “outer iv” (using the aes-256-cbc cipher). This encrypted
-         * blob shall be referred to as “the ciphertext”. 
+         * blob shall be referred to as “the ciphertext”.
          */
         $ciphertext = $outer_key->encrypt($decrypted_header, \phpseclib\Crypt\RSA::PADDING_PKCS1);
 

plugins/DirectMessage/DirectMessagePlugin.php

@@ -24,6 +24,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class DirectMessagePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public function onCheckSchema()
     {
         $schema = Schema::get();
@@ -164,7 +166,7 @@ class DirectMessagePlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Direct Message',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://gnu.io/',
                             'rawdescription' =>

plugins/Directory/DirectoryPlugin.php

@@ -44,6 +44,8 @@ if (!defined('STATUSNET')) {
  */
 class DirectoryPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     private $dir = null;
 
     /**
@@ -255,7 +257,7 @@ class DirectoryPlugin extends Plugin
     {
         $versions[] = array(
             'name' => 'Directory',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Zach Copley',
             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Directory',
             // TRANS: Plugin description.

plugins/DiskCache/DiskCachePlugin.php

@@ -46,6 +46,8 @@ if (!defined('STATUSNET')) {
  */
 class DiskCachePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     var $root = '/tmp';
 
     function keyToFilename($key)
@@ -164,7 +166,7 @@ class DiskCachePlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'DiskCache',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/DiskCache',
                             'rawdescription' =>

plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php

@@ -52,6 +52,8 @@ require_once $_dir . '/extlib/regDomain.inc.php';
  */
 class DomainStatusNetworkPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     static $_thetree = null;
 
     function initialize()
@@ -193,7 +195,7 @@ class DomainStatusNetworkPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'DomainStatusNetwork',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/DomainStatusNetwork',
                             'rawdescription' =>

plugins/DomainWhitelist/DomainWhitelistPlugin.php

@@ -48,6 +48,8 @@ if (!defined('STATUSNET')) {
  */
 class DomainWhitelistPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Get the path to the plugin's installation directory. Used
      * to link in js files and whatnot.
@@ -270,7 +272,7 @@ class DomainWhitelistPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'DomainWhitelist',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou, Zach Copley',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/DomainWhitelist',
                             'rawdescription' =>

plugins/EmailAuthentication/EmailAuthenticationPlugin.php

@@ -31,6 +31,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class EmailAuthenticationPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     // $nickname for this plugin is the user's email address
     function onStartCheckPassword($nickname, $password, &$authenticatedUser)
     {
@@ -52,7 +54,7 @@ class EmailAuthenticationPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Email Authentication',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/EmailAuthentication',
                             'rawdescription' =>

plugins/EmailRegistration/EmailRegistrationPlugin.php

@@ -47,6 +47,8 @@ if (!defined('STATUSNET')) {
  */
 class EmailRegistrationPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     const CONFIRMTYPE = 'register';
 
     function onArgsInitialize(&$args)
@@ -175,7 +177,7 @@ class EmailRegistrationPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'EmailRegistration',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/EmailRegistration',
                             'rawdescription' =>

plugins/EmailReminder/EmailReminderPlugin.php

@@ -46,6 +46,8 @@ if (!defined('STATUSNET')) {
  */
 class EmailReminderPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Set up email_reminder table
      *
@@ -183,7 +185,7 @@ class EmailReminderPlugin extends Plugin
     {
         $versions[] = array(
             'name'           => 'EmailReminder',
-            'version'        => GNUSOCIAL_VERSION,
+            'version'        => self::PLUGIN_VERSION,
             'author'         => 'Zach Copley',
             'homepage'       => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/EmailReminder',
             // TRANS: Plugin description.

plugins/EmailSummary/EmailSummaryPlugin.php

@@ -45,6 +45,7 @@ if (!defined('STATUSNET')) {
  */
 class EmailSummaryPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     /**
      * Database schema setup
      *
@@ -69,7 +70,7 @@ class EmailSummaryPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'EmailSummary',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/EmailSummary',
                             'rawdescription' =>

plugins/Event/EventPlugin.php

@@ -42,6 +42,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class EventPlugin extends ActivityVerbHandlerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Set up our tables (event and rsvp)
      *
@@ -100,7 +102,7 @@ class EventPlugin extends ActivityVerbHandlerPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Event',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Event',
                             'description' =>

plugins/ExtendedProfile/ExtendedProfilePlugin.php

@@ -29,11 +29,13 @@ if (!defined('STATUSNET')) {
  */
 class ExtendedProfilePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     function onPluginVersion(array &$versions)
     {
         $versions[] = array(
             'name' => 'ExtendedProfile',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Brion Vibber, Samantha Doherty, Zach Copley',
             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ExtendedProfile',
             // TRANS: Plugin description.

plugins/Favorite/FavoritePlugin.php

@@ -25,6 +25,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class FavoritePlugin extends ActivityVerbHandlerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     protected $email_notify_fave = 1;
 
     public function tag()
@@ -558,7 +560,7 @@ class FavoritePlugin extends ActivityVerbHandlerPlugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Favorite',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://gnu.io/',
                             'rawdescription' =>

plugins/FeedPoller/FeedPollerPlugin.php

@@ -13,6 +13,8 @@
 if (!defined('GNUSOCIAL')) { exit(1); }
 
 class FeedPollerPlugin extends Plugin {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $interval = 5;   // interval in minutes for feed checks
 
     public function onEndInitializeQueueManager(QueueManager $qm)
@@ -50,7 +52,7 @@ class FeedPollerPlugin extends Plugin {
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'FeedPoller',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://www.gnu.org/software/social/',
                             'description' =>

plugins/FetchRemote/FetchRemotePlugin.php

@@ -30,6 +30,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class FetchRemotePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     static function fetchNoticeFromUrl($url)
     {
         if (!common_valid_http_url($url)) {
@@ -108,7 +110,7 @@ class FetchRemotePlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'FetchRemote',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://www.gnu.org/software/social/',
                             // TRANS: Plugin description.

plugins/FollowEveryone/FollowEveryonePlugin.php

@@ -48,6 +48,8 @@ if (!defined('STATUSNET')) {
  */
 class FollowEveryonePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Called when a new user is registered.
      *
@@ -168,7 +170,7 @@ class FollowEveryonePlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'FollowEveryone',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/FollowEveryone',
                             'rawdescription' =>

plugins/ForceGroup/ForceGroupPlugin.php

@@ -26,6 +26,8 @@ if (!defined('STATUSNET')) { exit(1); }
 
 class ForceGroupPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Members of these groups will have all their posts mirrored into
      * the group even if they don't explicitly mention it.
@@ -110,7 +112,7 @@ class ForceGroupPlugin extends Plugin
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ForceGroup';
 
         $versions[] = array('name' => 'ForceGroup',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Brion Vibber',
             'homepage' => $url,
             'rawdescription' =>

plugins/GeoURL/GeoURLPlugin.php

@@ -48,6 +48,8 @@ if (!defined('STATUSNET')) {
  */
 class GeoURLPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $ping = 'http://geourl.org/ping/';
 
     /**
@@ -119,7 +121,7 @@ class GeoURLPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'GeoURL',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/GeoURL',
                             'rawdescription' =>

plugins/Geonames/GeonamesPlugin.php

@@ -48,6 +48,8 @@ if (!defined('STATUSNET')) {
  */
 class GeonamesPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     const LOCATION_NS = 1;
 
     public $host     = 'ws.geonames.org';
@@ -490,7 +492,7 @@ class GeonamesPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Geonames',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Geonames',
                             'rawdescription' =>

plugins/GroupFavorited/GroupFavoritedPlugin.php

@@ -26,6 +26,8 @@ if (!defined('STATUSNET')) { exit(1); }
 
 class GroupFavoritedPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Hook for RouterInitialized event.
      *
@@ -70,7 +72,7 @@ class GroupFavoritedPlugin extends Plugin
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/GroupFavorited';
 
         $versions[] = array('name' => 'GroupFavorited',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Brion Vibber',
             'homepage' => $url,
             'rawdescription' =>

plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php

@@ -48,6 +48,8 @@ if (!defined('STATUSNET')) {
  */
 class GroupPrivateMessagePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Database schema setup
      *
@@ -408,7 +410,7 @@ class GroupPrivateMessagePlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'GroupPrivateMessage',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/GroupPrivateMessage',
                             'rawdescription' =>

plugins/HTMLPurifierSchemes/HTMLPurifierSchemesPlugin.php

@@ -28,10 +28,12 @@ require_once INSTALLDIR.'/extlib/HTMLPurifier/HTMLPurifier.auto.php';
  */
 class HTMLPurifierSchemesPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'HTMLPurifier Schemes',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/social',
                             'rawdescription' =>

plugins/ImageMagick/ImageMagickPlugin.php

@@ -46,6 +46,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class ImageMagickPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $preview_imageformat = 'PNG';    // Image format strings: http://www.imagemagick.org/script/formats.php#supported
     public $rasterize_vectors = false;       // Whether we want to turn SVG into PNG etc.
 
@@ -135,7 +137,7 @@ class ImageMagickPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ImageMagick',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://gnu.io/social',
                             'rawdescription' =>

plugins/Imap/ImapPlugin.php

@@ -44,6 +44,8 @@ if (!defined('STATUSNET')) {
  */
 class ImapPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $mailbox;
     public $user;
     public $password;
@@ -79,7 +81,7 @@ class ImapPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'IMAP',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/IMAP',
                             'rawdescription' =>

plugins/InProcessCache/InProcessCachePlugin.php

@@ -55,6 +55,8 @@ if (!defined('STATUSNET')) {
  */
 class InProcessCachePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     private $_items = array();
     private $_hits  = array();
     private $active;
@@ -175,7 +177,7 @@ class InProcessCachePlugin extends Plugin
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/InProcessCache';
 
         $versions[] = array('name' => 'InProcessCache',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => $url,
                             'description' =>

plugins/InfiniteScroll/InfiniteScrollPlugin.php

@@ -31,6 +31,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class InfiniteScrollPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $on_next_only = false;
 
     function onEndShowScripts(Action $action)
@@ -44,7 +46,7 @@ class InfiniteScrollPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'InfiniteScroll',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/InfiniteScroll',
                             'rawdescription' =>

plugins/LRDD/LRDDPlugin.php

@@ -31,6 +31,8 @@ set_include_path(get_include_path() . PATH_SEPARATOR . __DIR__ . '/extlib/');
 
 class LRDDPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public function onAutoload($cls)
     {
         switch ($cls) {
@@ -55,7 +57,7 @@ class LRDDPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'LRDD',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://www.gnu.org/software/social/',
                             // TRANS: Plugin description.

plugins/LdapAuthentication/LdapAuthenticationPlugin.php

@@ -33,6 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class LdapAuthenticationPlugin extends AuthenticationPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     function onInitializePlugin(){
         parent::onInitializePlugin();
         if(!isset($this->attributes['nickname'])){
@@ -145,7 +146,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'LDAP Authentication',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/LdapAuthentication',
                             'rawdescription' =>

plugins/LdapAuthorization/LdapAuthorizationPlugin.php

@@ -33,6 +33,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class LdapAuthorizationPlugin extends AuthorizationPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $roles_to_groups = array();
     public $login_group = null;
 
@@ -121,7 +123,7 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'LDAP Authorization',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/LdapAuthorization',
                             'rawdescription' =>

plugins/LilUrl/LilUrlPlugin.php

@@ -33,6 +33,8 @@ if (!defined('STATUSNET')) {
 
 class LilUrlPlugin extends UrlShortenerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $serviceUrl;
 
     function onInitializePlugin(){
@@ -60,7 +62,7 @@ class LilUrlPlugin extends UrlShortenerPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => sprintf('LilUrl (%s)', $this->shortenerName),
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/LilUrl',
                             'rawdescription' =>

plugins/LinkPreview/LinkPreviewPlugin.php

@@ -29,10 +29,12 @@ if (!defined('STATUSNET')) {
  */
 class LinkPreviewPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'LinkPreview',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/LinkPreview',
                             'rawdescription' =>

plugins/LogFilter/LogFilterPlugin.php

@@ -35,6 +35,8 @@ if (!defined('STATUSNET')) {
  */
 class LogFilterPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $default = true;     // Set to false to require opting things in
     public $priority = array(); // override by priority: array(LOG_ERR => true, LOG_DEBUG => false)
     public $regex = array();    // override by regex match of message: array('/twitter/i' => false)
@@ -42,7 +44,7 @@ class LogFilterPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'LogFilter',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/LogFilter',
                             'rawdescription' =>

plugins/Mapstraction/MapstractionPlugin.php

@@ -46,7 +46,7 @@ if (!defined('STATUSNET')) {
  */
 class MapstractionPlugin extends Plugin
 {
-    const VERSION = GNUSOCIAL_VERSION;
+    const PLUGIN_VERSION = '2.0.0';
 
     /** provider name, one of:
      'cloudmade', 'microsoft', 'openlayers', 'yahoo' */
@@ -168,7 +168,7 @@ class MapstractionPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Mapstraction',
-                            'version' => self::VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Mapstraction',
                             'rawdescription' =>

plugins/Memcache/MemcachePlugin.php

@@ -50,6 +50,8 @@ if (!defined('STATUSNET')) {
  */
 class MemcachePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     static $cacheInitialized = false;
 
     private $_conn  = null;
@@ -239,7 +241,7 @@ class MemcachePlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Memcache',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou, Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Memcache',
                             'rawdescription' =>

plugins/Memcached/MemcachedPlugin.php

@@ -54,6 +54,8 @@ if (!defined('STATUSNET')) {
  */
 class MemcachedPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     static $cacheInitialized = false;
 
     private $_conn  = null;
@@ -210,7 +212,7 @@ class MemcachedPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Memcached',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou, Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Memcached',
                             'rawdescription' =>

plugins/MentionURL/MentionURLPlugin.php

@@ -10,6 +10,8 @@ require_once __DIR__ . '/lib/util.php';
  */
 class MentionURLPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     function onEndFindMentions(Profile $sender, $text, &$mentions)
     {
         $matches = array();
@@ -73,7 +75,7 @@ class MentionURLPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'MentionURL',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Stephen Paul Weber',
                             'homepage' => 'http://gnu.io/',
                             'description' =>

plugins/Meteor/MeteorPlugin.php

@@ -44,6 +44,8 @@ require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php';
  */
 class MeteorPlugin extends RealtimePlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $webserver     = null;
     public $webport       = null;
     public $controlport   = null;
@@ -163,7 +165,7 @@ class MeteorPlugin extends RealtimePlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Meteor',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Meteor',
                             'rawdescription' =>

plugins/MobileProfile/MobileProfilePlugin.php

@@ -45,6 +45,8 @@ require_once INSTALLDIR.'/plugins/Mobile/WAP20Plugin.php';
  */
 class MobileProfilePlugin extends WAP20Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $DTD            = null;
     public $serveMobile    = false;
     public $reallyMobile   = false;
@@ -371,7 +373,7 @@ class MobileProfilePlugin extends WAP20Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'MobileProfile',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Sarven Capadisli',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/MobileProfile',
                             'rawdescription' =>

plugins/ModHelper/ModHelperPlugin.php

@@ -25,12 +25,14 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class ModHelperPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     static $rights = array(Right::SILENCEUSER, Right::TRAINSPAM, Right::REVIEWSPAM);
 
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ModHelper',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ModHelper',
                             'rawdescription' =>

plugins/ModLog/ModLogPlugin.php

@@ -49,6 +49,7 @@ if (!defined('STATUSNET')) {
 
 class ModLogPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     const VIEWMODLOG = 'ModLogPlugin::VIEWMODLOG';
 
     /**
@@ -187,7 +188,7 @@ class ModLogPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ModLog',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ModLog',
                             'description' =>

plugins/ModPlus/ModPlusPlugin.php

@@ -27,10 +27,12 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class ModPlusPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'ModPlus',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ModPlus',
                             'rawdescription' =>

plugins/Nodeinfo/NodeinfoPlugin.php

@@ -6,7 +6,7 @@ if (!defined('GNUSOCIAL')) {
 
 class NodeinfoPlugin extends Plugin
 {
-    const VERSION = '0.0.1';
+    const VERSION = '1.0.1';
 
     public function onRouterInitialized($m)
     {

plugins/OStatus/OStatusPlugin.php

@@ -30,6 +30,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class OStatusPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Hook for RouterInitialized event.
      *
@@ -1350,7 +1352,7 @@ class OStatusPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'OStatus',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou, James Walker, Brion Vibber, Zach Copley',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/OStatus',
                             // TRANS: Plugin description.

plugins/Oembed/OembedPlugin.php

@@ -4,6 +4,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class OembedPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     // settings which can be set in config.php with addPlugin('Oembed', array('param'=>'value', ...));
     // WARNING, these are _regexps_ (slashes added later). Always escape your dots and end your strings
     public $domain_whitelist = array(       // hostname => service provider
@@ -451,7 +453,7 @@ class OembedPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Oembed',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://gnu.io/',
                             'description' =>

plugins/OfflineBackup/OfflineBackupPlugin.php

@@ -4,7 +4,7 @@
  * Copyright (C) 2011, StatusNet, Inc.
  *
  * Offline backup
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -37,7 +37,7 @@ if (!defined('STATUSNET')) {
 /**
  * Offline backup
  *
- * Instead of a big 
+ * Instead of a big
  *
  * @category  General
  * @package   StatusNet
@@ -49,6 +49,7 @@ if (!defined('STATUSNET')) {
 
 class OfflineBackupPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
 
     function onRouterInitialized($m)
     {
@@ -74,7 +75,7 @@ class OfflineBackupPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'OfflineBackup',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/OfflineBackup',
                             'rawdescription' =>

plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php

@@ -42,6 +42,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class OpenExternalLinkTargetPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     function onEndShowScripts($action)
     {
         $action->inlineScript('$(document).on("click", "a[rel~=external]:not([class~=attachment])", function () { window.open(this.href); return false; });');
@@ -52,7 +54,7 @@ class OpenExternalLinkTargetPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'OpenExternalLinkTarget',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Sarven Capadisli',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/OpenExternalLinkTarget',
                             'rawdescription' =>

plugins/OpenID/OpenIDPlugin.php

@@ -50,6 +50,8 @@ if (!defined('STATUSNET')) {
  */
 class OpenIDPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     // Plugin parameter: set true to disallow non-OpenID logins
     // If set, overrides the setting in database or $config['site']['openidonly']
     public $openidOnly = null;
@@ -595,7 +597,7 @@ class OpenIDPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'OpenID',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou, Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/OpenID',
                             'rawdescription' =>

plugins/OpenX/OpenXPlugin.php

@@ -77,6 +77,8 @@ if (!defined('STATUSNET')) {
  */
 class OpenXPlugin extends UAPPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $adScript = null;
 
     function initialize()
@@ -202,7 +204,7 @@ ENDOFSCRIPT;
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'OpenX',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/OpenX',
                             'rawdescription' =>

plugins/OpportunisticQM/OpportunisticQMPlugin.php

@@ -1,6 +1,8 @@
 <?php
 
 class OpportunisticQMPlugin extends Plugin {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $qmkey = false;
     public $secs_per_action = 1; // total seconds to run script per action
     public $rel_to_pageload = true;  // relative to pageload or queue start
@@ -37,7 +39,7 @@ class OpportunisticQMPlugin extends Plugin {
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'OpportunisticQM',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'http://www.gnu.org/software/social/',
                             'description' =>

plugins/Orbited/OrbitedPlugin.php

@@ -47,6 +47,8 @@ require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php';
  */
 class OrbitedPlugin extends RealtimePlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $webserver   = null;
     public $webport     = null;
     public $channelbase = null;
@@ -162,7 +164,7 @@ class OrbitedPlugin extends RealtimePlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Orbited',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Orbited',
                             'rawdescription' =>

plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php

@@ -51,6 +51,8 @@ if (!defined('STATUSNET')) {
  */
 class PiwikAnalyticsPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /** the base of your Piwik installation */
     public $piwikroot = null;
     /** the Piwik Id of your statusnet installation */
@@ -106,7 +108,7 @@ ENDOFPIWIK;
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'PiwikAnalytics',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Tobias Diekershoff, Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Piwik',
                             'rawdescription' =>

plugins/Poll/PollPlugin.php

@@ -45,7 +45,7 @@ if (!defined('STATUSNET')) {
  */
 class PollPlugin extends MicroAppPlugin
 {
-    const VERSION         = '0.1';
+    const PLUGIN_VERSION = '0.1.0';
 
     // @fixme which domain should we use for these namespaces?
     const POLL_OBJECT          = 'http://activityschema.org/object/poll';
@@ -123,7 +123,7 @@ class PollPlugin extends MicroAppPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Poll',
-                            'version' => self::VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Poll',
                             'rawdescription' =>

plugins/PostDebug/PostDebugPlugin.php

@@ -34,6 +34,8 @@ if (!defined('STATUSNET')) {
 
 class PostDebugPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Set to a directory to dump individual items instead of
      * sending to the debug log
@@ -51,7 +53,7 @@ class PostDebugPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'PostDebug',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/PostDebug',
                             'rawdescription' =>

plugins/PtitUrl/PtitUrlPlugin.php

@@ -33,6 +33,8 @@ if (!defined('STATUSNET')) {
 
 class PtitUrlPlugin extends UrlShortenerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $serviceUrl;
 
     function onInitializePlugin(){
@@ -60,7 +62,7 @@ class PtitUrlPlugin extends UrlShortenerPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => sprintf('PtitUrl (%s)', $this->shortenerName),
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/PtitUrl',
                             'rawdescription' =>

plugins/QnA/QnAPlugin.php

@@ -46,6 +46,7 @@ if (!defined('STATUSNET')) {
  */
 class QnAPlugin extends MicroAppPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
 
     var $oldSaveNew = true;
 
@@ -128,7 +129,7 @@ class QnAPlugin extends MicroAppPlugin
     {
         $versions[] = array(
             'name'        => 'QnA',
-            'version'     => GNUSOCIAL_VERSION,
+            'version'     => self::PLUGIN_VERSION,
             'author'      => 'Zach Copley',
             'homepage'    => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/QnA',
             'description' =>

plugins/RSSCloud/RSSCloudPlugin.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-define('RSSCLOUDPLUGIN_VERSION', '0.1');
+define('RSSCLOUDPLUGIN_VERSION', '0.1.0');
 
 /**
  * Plugin class for adding RSSCloud capabilities to StatusNet

plugins/RegisterThrottle/RegisterThrottlePlugin.php

@@ -45,6 +45,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class RegisterThrottlePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Array of time spans in seconds to limits.
      *
@@ -239,7 +241,7 @@ class RegisterThrottlePlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'RegisterThrottle',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/RegisterThrottle',
                             'description' =>

plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php

@@ -53,6 +53,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 class RequireValidatedEmailPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Users created before this time will be grandfathered in
      * without the validation requirement.
@@ -216,7 +218,7 @@ class RequireValidatedEmailPlugin extends Plugin
     {
         $versions[] =
           array('name' => 'Require Validated Email',
-                'version' => GNUSOCIAL_VERSION,
+                'version' => self::PLUGIN_VERSION,
                 'author' => 'Craig Andrews, '.
                 'Evan Prodromou, '.
                 'Brion Vibber',

plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php

@@ -33,6 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
     //---interface implementation---//
 
     function onInitializePlugin(){
@@ -60,7 +61,7 @@ class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Reverse Username Authentication',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ReverseUsernameAuthentication',
                             'rawdescription' =>

plugins/SQLProfile/SQLProfilePlugin.php

@@ -29,12 +29,14 @@ if (!defined('STATUSNET')) {
  */
 class SQLProfilePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     private $recursionGuard = false;
 
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'SQLProfile',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SQLProfile',
                             'rawdescription' =>

plugins/SQLStats/SQLStatsPlugin.php

@@ -29,6 +29,8 @@ if (!defined('STATUSNET')) {
  */
 class SQLStatsPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     protected $queryCount = 0;
     protected $queryStart = 0;
     protected $queryTimes = array();
@@ -37,7 +39,7 @@ class SQLStatsPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'SQLStats',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SQLStats',
                             'rawdescription' =>

plugins/Sample/SamplePlugin.php

@@ -103,6 +103,8 @@ if (!defined('STATUSNET')) {
  */
 class SamplePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Plugins are configured using public instance attributes. To set
      * their values, site administrators use this syntax:
@@ -225,7 +227,7 @@ class SamplePlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Sample',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber, Evan Prodromou',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Sample',
                             'rawdescription' =>

plugins/SearchSub/SearchSubPlugin.php

@@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
  */
 class SearchSubPlugin extends Plugin
 {
-    const VERSION         = '0.1';
+    const PLUGIN_VERSION = '0.1.0';
 
     /**
      * Database schema setup
@@ -91,7 +91,7 @@ class SearchSubPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'SearchSub',
-                            'version' => self::VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Brion Vibber',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SearchSub',
                             'rawdescription' =>

plugins/SensitiveContent/SensitiveContentPlugin.php

@@ -6,12 +6,12 @@ if (!defined('GNUSOCIAL')) {
 
 class SensitiveContentPlugin extends Plugin
 {
-	const VERSION = '0.0.1';
+	const PLUGIN_VERSION = '0.0.1';
 
 	function onPluginVersion(array &$versions)
 	{
 		$versions[] = array('name' => 'Sensitive Content',
-			'version' => self::VERSION,
+			'version' => self::PLUGIN_VERSION,
 			'author' => 'MoonMan',
 			'homepage' => 'https://gitgud.io/ShitposterClub/SensitiveContent/',
 			'description' =>

plugins/Share/SharePlugin.php

@@ -25,6 +25,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class SharePlugin extends ActivityVerbHandlerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public function tag()
     {
         return 'share';
@@ -360,7 +362,7 @@ class SharePlugin extends ActivityVerbHandlerPlugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Share verb',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/',
                             'rawdescription' =>

plugins/ShareNotice/ShareNoticePlugin.php

@@ -26,6 +26,8 @@ if (!defined('STATUSNET')) { exit(1); }
 
 class ShareNoticePlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $targets = array(
         array('Twitter'),
         array('Facebook'),
@@ -214,7 +216,7 @@ class FacebookShareTarget extends NoticeShareTarget
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/ShareNotice';
 
         $versions[] = array('name' => 'ShareNotice',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Brion Vibber',
             'homepage' => $url,
             'rawdescription' =>

plugins/SimpleCaptcha/SimpleCaptchaPlugin.php

@@ -25,6 +25,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  */
 class SimpleCaptchaPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public function initialize()
     {
         // This probably needs some work. For example with IPv6 you can easily generate new IPs...
@@ -62,7 +64,7 @@ class SimpleCaptchaPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Simple Captcha',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/social',
                             'rawdescription' =>

plugins/SimpleUrl/SimpleUrlPlugin.php

@@ -33,6 +33,8 @@ if (!defined('STATUSNET')) {
 
 class SimpleUrlPlugin extends UrlShortenerPlugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $serviceUrl;
 
     function onInitializePlugin(){
@@ -50,7 +52,7 @@ class SimpleUrlPlugin extends UrlShortenerPlugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => sprintf('SimpleUrl (%s)', $this->shortenerName),
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SimpleUrl',
                             'rawdescription' =>

plugins/Sitemap/SitemapPlugin.php

@@ -46,6 +46,8 @@ if (!defined('STATUSNET')) {
  */
 class SitemapPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     const USERS_PER_MAP   = 50000;
     const NOTICES_PER_MAP = 50000;
 
@@ -178,7 +180,7 @@ class SitemapPlugin extends Plugin
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Sitemap';
 
         $versions[] = array('name' => 'Sitemap',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Evan Prodromou',
             'homepage' => $url,
             'rawdescription' =>

plugins/SlicedFavorites/SlicedFavoritesPlugin.php

@@ -26,6 +26,8 @@ if (!defined('STATUSNET')) { exit(1); }
 
 class SlicedFavoritesPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Example:
      *
@@ -100,7 +102,7 @@ class SlicedFavoritesPlugin extends Plugin
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SlicedFavorites';
 
         $versions[] = array('name' => 'SlicedFavorites',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Brion Vibber',
             'homepage' => $url,
             'rawdescription' =>

plugins/SphinxSearch/SphinxSearchPlugin.php

@@ -53,6 +53,8 @@ foreach($sphinxDefaults as $key => $val) {
  */
 class SphinxSearchPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     /**
      * Automatically load any classes used
      *
@@ -110,7 +112,7 @@ class SphinxSearchPlugin extends Plugin
         $url = 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/SphinxSearch';
 
         $versions[] = array('name' => 'SphinxSearch',
-            'version' => GNUSOCIAL_VERSION,
+            'version' => self::PLUGIN_VERSION,
             'author' => 'Brion Vibber',
             'homepage' => $url,
             'rawdescription' =>

plugins/StoreRemoteMedia/StoreRemoteMediaPlugin.php

@@ -6,6 +6,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class StoreRemoteMediaPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     // settings which can be set in config.php with addPlugin('Oembed', array('param'=>'value', ...));
     // WARNING, these are _regexps_ (slashes added later). Always escape your dots and end your strings
     public $domain_whitelist = array(       // hostname => service provider
@@ -201,7 +203,7 @@ class StoreRemoteMediaPlugin extends Plugin
     public function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'StoreRemoteMedia',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Mikael Nordfeldth',
                             'homepage' => 'https://gnu.io/',
                             'description' =>

plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php

@@ -31,6 +31,8 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class StrictTransportSecurityPlugin extends Plugin
 {
+    const PLUGIN_VERSION = '2.0.0';
+
     public $max_age = 15552000;
     public $includeSubDomains = false;
     public $preloadToken = false;
@@ -53,7 +55,7 @@ class StrictTransportSecurityPlugin extends Plugin
     function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'StrictTransportSecurity',
-                            'version' => GNUSOCIAL_VERSION,
+                            'version' => self::PLUGIN_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/StrictTransportSecurity',
                             'rawdescription' =>