diff --git a/actions/apignusocialversion.php b/actions/apignusocialversion.php index 88fb5c51a6..a56630c666 100644 --- a/actions/apignusocialversion.php +++ b/actions/apignusocialversion.php @@ -52,12 +52,12 @@ class ApiGNUsocialVersionAction extends ApiPrivateAuthAction switch ($this->format) { case 'xml': $this->initDocument('xml'); - $this->element('version', null, STATUSNET_VERSION); + $this->element('version', null, GNUSOCIAL_VERSION); $this->endDocument('xml'); break; case 'json': $this->initDocument('json'); - print '"'.STATUSNET_VERSION.'"'; + print '"'.GNUSOCIAL_VERSION.'"'; $this->endDocument('json'); break; default: diff --git a/lib/action.php b/lib/action.php index 5974a136be..da73c6cd09 100644 --- a/lib/action.php +++ b/lib/action.php @@ -302,17 +302,17 @@ class Action extends HTMLOutputter // lawsuit if (Event::handle('StartShowUAStyles', array($this))) { $this->comment('[if IE]>comment('[if lte IE '.$ver.']>comment('[if IE]>element( 'generator', array( 'uri' => 'http://status.net', - 'version' => STATUSNET_VERSION + 'version' => GNUSOCIAL_VERSION ), 'StatusNet' ); diff --git a/lib/cache.php b/lib/cache.php index 59110f74d8..e087c2e646 100644 --- a/lib/cache.php +++ b/lib/cache.php @@ -141,7 +141,7 @@ class Cache $build = common_config('site', 'build'); - $prefix = STATUSNET_VERSION.':'.$build.':'.$uniq; + $prefix = GNUSOCIAL_VERSION.':'.$build.':'.$uniq; } return Cache::key($prefix.':'.$extra); diff --git a/lib/framework.php b/lib/framework.php index ab918dd768..3ef76ea4b5 100644 --- a/lib/framework.php +++ b/lib/framework.php @@ -26,7 +26,6 @@ define('GNUSOCIAL_BASE_VERSION', '1.1.1'); define('GNUSOCIAL_LIFECYCLE', 'alpha'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release' define('GNUSOCIAL_VERSION', GNUSOCIAL_BASE_VERSION . '-' . GNUSOCIAL_LIFECYCLE); -define('STATUSNET_VERSION', GNUSOCIAL_VERSION); // compatibility define('GNUSOCIAL_CODENAME', 'Not decided yet'); diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index 578518ea41..9ec7850402 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -377,7 +377,7 @@ class HTMLOutputter extends XMLOutputter if (strpos($src, 'plugins/') === 0 || strpos($src, 'local/') === 0) { - $src = common_path($src, StatusNet::isHTTPS()) . '?version=' . STATUSNET_VERSION; + $src = common_path($src, StatusNet::isHTTPS()) . '?version=' . GNUSOCIAL_VERSION; } else { @@ -428,7 +428,7 @@ class HTMLOutputter extends XMLOutputter $path = '/'.$path; } - $src = $protocol.'://'.$server.$path.$src . '?version=' . STATUSNET_VERSION; + $src = $protocol.'://'.$server.$path.$src . '?version=' . GNUSOCIAL_VERSION; } } @@ -486,7 +486,7 @@ class HTMLOutputter extends XMLOutputter }else{ $src = common_path($src, StatusNet::isHTTPS()); } - $src.= '?version=' . STATUSNET_VERSION; + $src.= '?version=' . GNUSOCIAL_VERSION; } $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', diff --git a/lib/snapshot.php b/lib/snapshot.php index 54cf512743..f41efba7d7 100644 --- a/lib/snapshot.php +++ b/lib/snapshot.php @@ -125,7 +125,7 @@ class Snapshot // Some basic identification stuff - $this->stats['version'] = STATUSNET_VERSION; + $this->stats['version'] = GNUSOCIAL_VERSION; $this->stats['phpversion'] = phpversion(); $this->stats['name'] = common_config('site', 'name'); $this->stats['root'] = common_root_url(); diff --git a/plugins/APC/APCPlugin.php b/plugins/APC/APCPlugin.php index 851a4b4abc..284a658239 100644 --- a/plugins/APC/APCPlugin.php +++ b/plugins/APC/APCPlugin.php @@ -105,7 +105,7 @@ class APCPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'APC', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:APC', 'rawdescription' => diff --git a/plugins/AccountManager/AccountManagerPlugin.php b/plugins/AccountManager/AccountManagerPlugin.php index 3cf4bf440b..3dea569dff 100644 --- a/plugins/AccountManager/AccountManagerPlugin.php +++ b/plugins/AccountManager/AccountManagerPlugin.php @@ -90,7 +90,7 @@ class AccountManagerPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'AccountManager', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:AccountManager', 'rawdescription' => diff --git a/plugins/ActivitySpam/ActivitySpamPlugin.php b/plugins/ActivitySpam/ActivitySpamPlugin.php index 0f84006a65..a18d52c5db 100644 --- a/plugins/ActivitySpam/ActivitySpamPlugin.php +++ b/plugins/ActivitySpam/ActivitySpamPlugin.php @@ -218,7 +218,7 @@ class ActivitySpamPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'ActivitySpam', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:ActivitySpam', 'description' => diff --git a/plugins/Adsense/AdsensePlugin.php b/plugins/Adsense/AdsensePlugin.php index 78637b446e..742e7bf366 100644 --- a/plugins/Adsense/AdsensePlugin.php +++ b/plugins/Adsense/AdsensePlugin.php @@ -188,7 +188,7 @@ class AdsensePlugin extends UAPPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'BlankAdPlugin', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Adsense', 'rawdescription' => diff --git a/plugins/Aim/AimPlugin.php b/plugins/Aim/AimPlugin.php index f244728205..034c40fa84 100644 --- a/plugins/Aim/AimPlugin.php +++ b/plugins/Aim/AimPlugin.php @@ -154,7 +154,7 @@ class AimPlugin extends ImPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'AIM', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:AIM', 'rawdescription' => diff --git a/plugins/ApiLogger/ApiLoggerPlugin.php b/plugins/ApiLogger/ApiLoggerPlugin.php index bea78f78a3..ba09e35f24 100644 --- a/plugins/ApiLogger/ApiLoggerPlugin.php +++ b/plugins/ApiLogger/ApiLoggerPlugin.php @@ -78,7 +78,7 @@ class ApiLoggerPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'ApiLogger', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber', 'homepage' => 'http://status.net/wiki/Plugin:ApiLogger', 'rawdescription' => diff --git a/plugins/AuthCrypt/AuthCryptPlugin.php b/plugins/AuthCrypt/AuthCryptPlugin.php index 560df10559..5e9d983507 100644 --- a/plugins/AuthCrypt/AuthCryptPlugin.php +++ b/plugins/AuthCrypt/AuthCryptPlugin.php @@ -149,7 +149,7 @@ class AuthCryptPlugin extends AuthenticationPlugin public function onPluginVersion(&$versions) { $versions[] = array('name' => 'AuthCrypt', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Mikael Nordfeldth', 'homepage' => 'http://status.net/wiki/Plugin:AuthCrypt', 'rawdescription' => diff --git a/plugins/AutoSandbox/AutoSandboxPlugin.php b/plugins/AutoSandbox/AutoSandboxPlugin.php index ca48020ea3..9e930c0cc4 100644 --- a/plugins/AutoSandbox/AutoSandboxPlugin.php +++ b/plugins/AutoSandbox/AutoSandboxPlugin.php @@ -59,7 +59,7 @@ class AutoSandboxPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'AutoSandbox', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Sean Carmody', 'homepage' => 'http://status.net/wiki/Plugin:AutoSandbox', 'rawdescription' => diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php index c1f61e416e..ff56b60fc4 100644 --- a/plugins/Autocomplete/AutocompletePlugin.php +++ b/plugins/Autocomplete/AutocompletePlugin.php @@ -55,7 +55,7 @@ class AutocompletePlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Autocomplete', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:Autocomplete', 'rawdescription' => diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php index 8b2fc6551f..2286d1da3d 100644 --- a/plugins/BitlyUrl/BitlyUrlPlugin.php +++ b/plugins/BitlyUrl/BitlyUrlPlugin.php @@ -148,7 +148,7 @@ class BitlyUrlPlugin extends UrlShortenerPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => sprintf('BitlyUrl (%s)', $this->shortenerName), - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews, Brion Vibber', 'homepage' => 'http://status.net/wiki/Plugin:BitlyUrl', 'rawdescription' => diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php index 142ec2d056..4e1b030893 100644 --- a/plugins/Blacklist/BlacklistPlugin.php +++ b/plugins/Blacklist/BlacklistPlugin.php @@ -42,7 +42,7 @@ if (!defined('STATUSNET')) { */ class BlacklistPlugin extends Plugin { - const VERSION = STATUSNET_VERSION; + const VERSION = GNUSOCIAL_VERSION; public $nicknames = array(); public $urls = array(); diff --git a/plugins/BlankAd/BlankAdPlugin.php b/plugins/BlankAd/BlankAdPlugin.php index 1205cc0f7e..49f70e68a4 100644 --- a/plugins/BlankAd/BlankAdPlugin.php +++ b/plugins/BlankAd/BlankAdPlugin.php @@ -120,7 +120,7 @@ class BlankAdPlugin extends UAPPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'BlankAd', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:BlankAdPlugin', 'rawdescription' => diff --git a/plugins/Blog/BlogPlugin.php b/plugins/Blog/BlogPlugin.php index 7fa23461d6..2d74b6531e 100644 --- a/plugins/Blog/BlogPlugin.php +++ b/plugins/Blog/BlogPlugin.php @@ -87,7 +87,7 @@ class BlogPlugin extends MicroAppPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Blog', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Blog', 'rawdescription' => diff --git a/plugins/CacheLog/CacheLogPlugin.php b/plugins/CacheLog/CacheLogPlugin.php index 9eb3350784..e722972bfc 100644 --- a/plugins/CacheLog/CacheLogPlugin.php +++ b/plugins/CacheLog/CacheLogPlugin.php @@ -99,7 +99,7 @@ class CacheLogPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'CacheLog', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:CacheLog', 'description' => diff --git a/plugins/CasAuthentication/CasAuthenticationPlugin.php b/plugins/CasAuthentication/CasAuthenticationPlugin.php index 0efbb7519b..2f17492a8e 100644 --- a/plugins/CasAuthentication/CasAuthenticationPlugin.php +++ b/plugins/CasAuthentication/CasAuthenticationPlugin.php @@ -150,7 +150,7 @@ class CasAuthenticationPlugin extends AuthenticationPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'CAS Authentication', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:CasAuthentication', // TRANS: Plugin description. CAS is Central Authentication Service. diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php index ba4f05fc20..0c2c9b76cc 100644 --- a/plugins/ClientSideShorten/ClientSideShortenPlugin.php +++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php @@ -57,7 +57,7 @@ class ClientSideShortenPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Shorten', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:ClientSideShorten', 'rawdescription' => diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php index c8072ac190..70f5ab85fe 100644 --- a/plugins/Comet/CometPlugin.php +++ b/plugins/Comet/CometPlugin.php @@ -107,7 +107,7 @@ class CometPlugin extends RealtimePlugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Comet', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Comet', 'rawdescription' => diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php index a3cc01c935..e061b89e46 100644 --- a/plugins/Directory/DirectoryPlugin.php +++ b/plugins/Directory/DirectoryPlugin.php @@ -220,7 +220,7 @@ class DirectoryPlugin extends Plugin { $versions[] = array( 'name' => 'Directory', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Zach Copley', 'homepage' => 'http://status.net/wiki/Plugin:Directory', // TRANS: Plugin description. diff --git a/plugins/DiskCache/DiskCachePlugin.php b/plugins/DiskCache/DiskCachePlugin.php index d021a6641a..5d23d45f59 100644 --- a/plugins/DiskCache/DiskCachePlugin.php +++ b/plugins/DiskCache/DiskCachePlugin.php @@ -164,7 +164,7 @@ class DiskCachePlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'DiskCache', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:DiskCache', 'rawdescription' => diff --git a/plugins/Disqus/DisqusPlugin.php b/plugins/Disqus/DisqusPlugin.php index d6e29264d9..28e0d80e9b 100644 --- a/plugins/Disqus/DisqusPlugin.php +++ b/plugins/Disqus/DisqusPlugin.php @@ -238,7 +238,7 @@ ENDOFSCRIPT; function onPluginVersion(&$versions) { $versions[] = array('name' => 'Disqus', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Zach Copley', 'homepage' => 'http://status.net/wiki/Plugin:Disqus', 'rawdescription' => diff --git a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php index 732a85f373..0d0f744277 100644 --- a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php +++ b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php @@ -193,7 +193,7 @@ class DomainStatusNetworkPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'DomainStatusNetwork', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:DomainStatusNetwork', 'rawdescription' => diff --git a/plugins/DomainWhitelist/DomainWhitelistPlugin.php b/plugins/DomainWhitelist/DomainWhitelistPlugin.php index 9aa67ab845..20073a07c4 100644 --- a/plugins/DomainWhitelist/DomainWhitelistPlugin.php +++ b/plugins/DomainWhitelist/DomainWhitelistPlugin.php @@ -270,7 +270,7 @@ class DomainWhitelistPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'DomainWhitelist', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou, Zach Copley', 'homepage' => 'http://status.net/wiki/Plugin:DomainWhitelist', 'rawdescription' => diff --git a/plugins/Echo/EchoPlugin.php b/plugins/Echo/EchoPlugin.php index a6f87bc38d..b76ee27875 100644 --- a/plugins/Echo/EchoPlugin.php +++ b/plugins/Echo/EchoPlugin.php @@ -104,7 +104,7 @@ class EchoPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Echo', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Zach Copley', 'homepage' => 'http://status.net/wiki/Plugin:Echo', 'rawdescription' => diff --git a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php index ba131945c1..eb2bebac65 100644 --- a/plugins/EmailAuthentication/EmailAuthenticationPlugin.php +++ b/plugins/EmailAuthentication/EmailAuthenticationPlugin.php @@ -53,7 +53,7 @@ class EmailAuthenticationPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Email Authentication', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:EmailAuthentication', 'rawdescription' => diff --git a/plugins/EmailRegistration/EmailRegistrationPlugin.php b/plugins/EmailRegistration/EmailRegistrationPlugin.php index 14af35ec11..741f24305b 100644 --- a/plugins/EmailRegistration/EmailRegistrationPlugin.php +++ b/plugins/EmailRegistration/EmailRegistrationPlugin.php @@ -175,7 +175,7 @@ class EmailRegistrationPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'EmailRegistration', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:EmailRegistration', 'rawdescription' => diff --git a/plugins/EmailReminder/EmailReminderPlugin.php b/plugins/EmailReminder/EmailReminderPlugin.php index e55f134a94..51950542b2 100644 --- a/plugins/EmailReminder/EmailReminderPlugin.php +++ b/plugins/EmailReminder/EmailReminderPlugin.php @@ -183,7 +183,7 @@ class EmailReminderPlugin extends Plugin { $versions[] = array( 'name' => 'EmailReminder', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Zach Copley', 'homepage' => 'http://status.net/wiki/Plugin:EmailReminder', // TRANS: Plugin description. diff --git a/plugins/EmailSummary/EmailSummaryPlugin.php b/plugins/EmailSummary/EmailSummaryPlugin.php index 0ba80e1e36..d67ddf9fb3 100644 --- a/plugins/EmailSummary/EmailSummaryPlugin.php +++ b/plugins/EmailSummary/EmailSummaryPlugin.php @@ -69,7 +69,7 @@ class EmailSummaryPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'EmailSummary', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:EmailSummary', 'rawdescription' => diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php index 2a8a078c74..07394d30c3 100644 --- a/plugins/Event/EventPlugin.php +++ b/plugins/Event/EventPlugin.php @@ -93,7 +93,7 @@ class EventPlugin extends MicroappPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Event', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Event', 'description' => diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php index 578825aa34..aa456c2f9b 100644 --- a/plugins/ExtendedProfile/ExtendedProfilePlugin.php +++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php @@ -33,7 +33,7 @@ class ExtendedProfilePlugin extends Plugin { $versions[] = array( 'name' => 'ExtendedProfile', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber, Samantha Doherty, Zach Copley', 'homepage' => 'http://status.net/wiki/Plugin:ExtendedProfile', // TRANS: Plugin description. diff --git a/plugins/FacebookBridge/FacebookBridgePlugin.php b/plugins/FacebookBridge/FacebookBridgePlugin.php index 3bace7341b..21b2cd1f2c 100644 --- a/plugins/FacebookBridge/FacebookBridgePlugin.php +++ b/plugins/FacebookBridge/FacebookBridgePlugin.php @@ -617,7 +617,7 @@ ENDOFSCRIPT; { $versions[] = array( 'name' => 'Facebook Bridge', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews, Zach Copley', 'homepage' => 'http://status.net/wiki/Plugin:FacebookBridge', 'rawdescription' => diff --git a/plugins/FirePHP/FirePHPPlugin.php b/plugins/FirePHP/FirePHPPlugin.php index 8c6fae4d5f..b6d3773c20 100644 --- a/plugins/FirePHP/FirePHPPlugin.php +++ b/plugins/FirePHP/FirePHPPlugin.php @@ -61,7 +61,7 @@ class FirePHPPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'FirePHP', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:FirePHP', 'rawdescription' => diff --git a/plugins/FollowEveryone/FollowEveryonePlugin.php b/plugins/FollowEveryone/FollowEveryonePlugin.php index b3f9341e1d..ee38c7a311 100644 --- a/plugins/FollowEveryone/FollowEveryonePlugin.php +++ b/plugins/FollowEveryone/FollowEveryonePlugin.php @@ -168,7 +168,7 @@ class FollowEveryonePlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'FollowEveryone', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:FollowEveryone', 'rawdescription' => diff --git a/plugins/ForceGroup/ForceGroupPlugin.php b/plugins/ForceGroup/ForceGroupPlugin.php index be4fd78070..a79c9d312b 100644 --- a/plugins/ForceGroup/ForceGroupPlugin.php +++ b/plugins/ForceGroup/ForceGroupPlugin.php @@ -110,7 +110,7 @@ class ForceGroupPlugin extends Plugin $url = 'http://status.net/wiki/Plugin:ForceGroup'; $versions[] = array('name' => 'ForceGroup', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber', 'homepage' => $url, 'rawdescription' => diff --git a/plugins/GeoURL/GeoURLPlugin.php b/plugins/GeoURL/GeoURLPlugin.php index 9f2670eb82..d548de925a 100644 --- a/plugins/GeoURL/GeoURLPlugin.php +++ b/plugins/GeoURL/GeoURLPlugin.php @@ -117,7 +117,7 @@ class GeoURLPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'GeoURL', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:GeoURL', 'rawdescription' => diff --git a/plugins/Geonames/GeonamesPlugin.php b/plugins/Geonames/GeonamesPlugin.php index ea9899442c..68d66bc0b1 100644 --- a/plugins/Geonames/GeonamesPlugin.php +++ b/plugins/Geonames/GeonamesPlugin.php @@ -490,7 +490,7 @@ class GeonamesPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Geonames', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Geonames', 'rawdescription' => diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php index 2cb6bd8cac..d716398889 100644 --- a/plugins/Gravatar/GravatarPlugin.php +++ b/plugins/Gravatar/GravatarPlugin.php @@ -62,7 +62,7 @@ class GravatarPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Gravatar', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Eric Helgeson, Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Gravatar', 'rawdescription' => diff --git a/plugins/GroupFavorited/GroupFavoritedPlugin.php b/plugins/GroupFavorited/GroupFavoritedPlugin.php index ee541f2dc0..944a725105 100644 --- a/plugins/GroupFavorited/GroupFavoritedPlugin.php +++ b/plugins/GroupFavorited/GroupFavoritedPlugin.php @@ -70,7 +70,7 @@ class GroupFavoritedPlugin extends Plugin $url = 'http://status.net/wiki/Plugin:GroupFavorited'; $versions[] = array('name' => 'GroupFavorited', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber', 'homepage' => $url, 'rawdescription' => diff --git a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php index 1cbf3c31f1..fd9667cb99 100644 --- a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php +++ b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php @@ -405,7 +405,7 @@ class GroupPrivateMessagePlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'GroupPrivateMessage', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:GroupPrivateMessage', 'rawdescription' => diff --git a/plugins/Imap/ImapPlugin.php b/plugins/Imap/ImapPlugin.php index 1d23e384a7..5711951e26 100644 --- a/plugins/Imap/ImapPlugin.php +++ b/plugins/Imap/ImapPlugin.php @@ -79,7 +79,7 @@ class ImapPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'IMAP', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:IMAP', 'rawdescription' => diff --git a/plugins/InProcessCache/InProcessCachePlugin.php b/plugins/InProcessCache/InProcessCachePlugin.php index 240b4e3188..af3d822dfd 100644 --- a/plugins/InProcessCache/InProcessCachePlugin.php +++ b/plugins/InProcessCache/InProcessCachePlugin.php @@ -175,7 +175,7 @@ class InProcessCachePlugin extends Plugin $url = 'http://status.net/wiki/Plugin:InProcessCache'; $versions[] = array('name' => 'InProcessCache', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => $url, 'description' => diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php index cec1a53524..44c5c5e880 100644 --- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php +++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php @@ -52,7 +52,7 @@ class InfiniteScrollPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'InfiniteScroll', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:InfiniteScroll', 'rawdescription' => diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php index 0610625a13..7fe58e06ac 100644 --- a/plugins/Irc/IrcPlugin.php +++ b/plugins/Irc/IrcPlugin.php @@ -374,7 +374,7 @@ class IrcPlugin extends ImPlugin { */ public function onPluginVersion(&$versions) { $versions[] = array('name' => 'IRC', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Luke Fitzgerald', 'homepage' => 'http://status.net/wiki/Plugin:IRC', 'rawdescription' => diff --git a/plugins/LRDD/LRDDPlugin.php b/plugins/LRDD/LRDDPlugin.php index 23a10322dc..e8bf82ec31 100644 --- a/plugins/LRDD/LRDDPlugin.php +++ b/plugins/LRDD/LRDDPlugin.php @@ -54,7 +54,7 @@ class LRDDPlugin extends Plugin public function onPluginVersion(&$versions) { $versions[] = array('name' => 'LRDD', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Mikael Nordfeldth', 'homepage' => 'http://www.gnu.org/software/social/', // TRANS: Plugin description. diff --git a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php index 8da4ba4d53..df28c5a09f 100644 --- a/plugins/LdapAuthentication/LdapAuthenticationPlugin.php +++ b/plugins/LdapAuthentication/LdapAuthenticationPlugin.php @@ -145,7 +145,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'LDAP Authentication', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:LdapAuthentication', 'rawdescription' => diff --git a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php index 6c8f1253c5..9a666d1551 100644 --- a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php +++ b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php @@ -121,7 +121,7 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'LDAP Authorization', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:LdapAuthorization', 'rawdescription' => diff --git a/plugins/LilUrl/LilUrlPlugin.php b/plugins/LilUrl/LilUrlPlugin.php index 0ca3d3d6be..f871a95630 100644 --- a/plugins/LilUrl/LilUrlPlugin.php +++ b/plugins/LilUrl/LilUrlPlugin.php @@ -60,7 +60,7 @@ class LilUrlPlugin extends UrlShortenerPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => sprintf('LilUrl (%s)', $this->shortenerName), - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:LilUrl', 'rawdescription' => diff --git a/plugins/LinkPreview/LinkPreviewPlugin.php b/plugins/LinkPreview/LinkPreviewPlugin.php index 652afdbdf9..301076ec94 100644 --- a/plugins/LinkPreview/LinkPreviewPlugin.php +++ b/plugins/LinkPreview/LinkPreviewPlugin.php @@ -32,7 +32,7 @@ class LinkPreviewPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'LinkPreview', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber', 'homepage' => 'http://status.net/wiki/Plugin:LinkPreview', 'rawdescription' => diff --git a/plugins/LogFilter/LogFilterPlugin.php b/plugins/LogFilter/LogFilterPlugin.php index 4f3a45dcdc..430e89594e 100644 --- a/plugins/LogFilter/LogFilterPlugin.php +++ b/plugins/LogFilter/LogFilterPlugin.php @@ -42,7 +42,7 @@ class LogFilterPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'LogFilter', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber', 'homepage' => 'http://status.net/wiki/Plugin:LogFilter', 'rawdescription' => diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index 9883650206..0feeaba89e 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -46,7 +46,7 @@ if (!defined('STATUSNET')) { */ class MapstractionPlugin extends Plugin { - const VERSION = STATUSNET_VERSION; + const VERSION = GNUSOCIAL_VERSION; /** provider name, one of: 'cloudmade', 'google', 'microsoft', 'openlayers', 'yahoo' */ diff --git a/plugins/Memcache/MemcachePlugin.php b/plugins/Memcache/MemcachePlugin.php index 8462dfc2c6..8e674e62b8 100644 --- a/plugins/Memcache/MemcachePlugin.php +++ b/plugins/Memcache/MemcachePlugin.php @@ -239,7 +239,7 @@ class MemcachePlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Memcache', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou, Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:Memcache', 'rawdescription' => diff --git a/plugins/Memcached/MemcachedPlugin.php b/plugins/Memcached/MemcachedPlugin.php index 56793d0ff6..55c21cd923 100644 --- a/plugins/Memcached/MemcachedPlugin.php +++ b/plugins/Memcached/MemcachedPlugin.php @@ -210,7 +210,7 @@ class MemcachedPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Memcached', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou, Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:Memcached', 'rawdescription' => diff --git a/plugins/Meteor/MeteorPlugin.php b/plugins/Meteor/MeteorPlugin.php index 1cff453d61..d65fe3f0e5 100644 --- a/plugins/Meteor/MeteorPlugin.php +++ b/plugins/Meteor/MeteorPlugin.php @@ -162,7 +162,7 @@ class MeteorPlugin extends RealtimePlugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Meteor', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Meteor', 'rawdescription' => diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php index 9a1f4110d1..1e13f8d801 100644 --- a/plugins/Minify/MinifyPlugin.php +++ b/plugins/Minify/MinifyPlugin.php @@ -144,7 +144,7 @@ class MinifyPlugin extends Plugin } function minifyUrl($src) { - return common_local_url('minify',null,array('f' => $src ,v => STATUSNET_VERSION)); + return common_local_url('minify',null,array('f' => $src ,v => GNUSOCIAL_VERSION)); } static function minifyJs($code) { @@ -160,7 +160,7 @@ class MinifyPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Minify', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:Minify', 'rawdescription' => diff --git a/plugins/MobileProfile/MobileProfilePlugin.php b/plugins/MobileProfile/MobileProfilePlugin.php index 6e682a4f87..f04e61c698 100644 --- a/plugins/MobileProfile/MobileProfilePlugin.php +++ b/plugins/MobileProfile/MobileProfilePlugin.php @@ -410,7 +410,7 @@ class MobileProfilePlugin extends WAP20Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'MobileProfile', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Sarven Capadisli', 'homepage' => 'http://status.net/wiki/Plugin:MobileProfile', 'rawdescription' => diff --git a/plugins/ModHelper/ModHelperPlugin.php b/plugins/ModHelper/ModHelperPlugin.php index bed0d8d49e..4b4bf8f447 100644 --- a/plugins/ModHelper/ModHelperPlugin.php +++ b/plugins/ModHelper/ModHelperPlugin.php @@ -32,7 +32,7 @@ class ModHelperPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'ModHelper', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber', 'homepage' => 'http://status.net/wiki/Plugin:ModHelper', 'rawdescription' => diff --git a/plugins/ModLog/ModLogPlugin.php b/plugins/ModLog/ModLogPlugin.php index 89f71fe866..f5373aa947 100644 --- a/plugins/ModLog/ModLogPlugin.php +++ b/plugins/ModLog/ModLogPlugin.php @@ -186,7 +186,7 @@ class ModLogPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'ModLog', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:ModLog', 'description' => diff --git a/plugins/ModPlus/ModPlusPlugin.php b/plugins/ModPlus/ModPlusPlugin.php index 8d43f53b9a..5ca2e77142 100644 --- a/plugins/ModPlus/ModPlusPlugin.php +++ b/plugins/ModPlus/ModPlusPlugin.php @@ -32,7 +32,7 @@ class ModPlusPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'ModPlus', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber', 'homepage' => 'http://status.net/wiki/Plugin:ModPlus', 'rawdescription' => diff --git a/plugins/Msn/MsnPlugin.php b/plugins/Msn/MsnPlugin.php index 91c67f5f79..11bade8034 100644 --- a/plugins/Msn/MsnPlugin.php +++ b/plugins/Msn/MsnPlugin.php @@ -197,7 +197,7 @@ class MsnPlugin extends ImPlugin { public function onPluginVersion(&$versions) { $versions[] = array( 'name' => 'MSN', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Luke Fitzgerald', 'homepage' => 'http://status.net/wiki/Plugin:MSN', 'rawdescription' => diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index 217fe7356c..a7aed15067 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -1237,7 +1237,7 @@ class OStatusPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'OStatus', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou, James Walker, Brion Vibber, Zach Copley', 'homepage' => 'http://status.net/wiki/Plugin:OStatus', // TRANS: Plugin description. diff --git a/plugins/OfflineBackup/OfflineBackupPlugin.php b/plugins/OfflineBackup/OfflineBackupPlugin.php index 1dd636930e..a2e3d8c49b 100644 --- a/plugins/OfflineBackup/OfflineBackupPlugin.php +++ b/plugins/OfflineBackup/OfflineBackupPlugin.php @@ -74,7 +74,7 @@ class OfflineBackupPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'OfflineBackup', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:OfflineBackup', 'rawdescription' => diff --git a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php index 0be2503726..d5b9dfa0da 100644 --- a/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php +++ b/plugins/OpenExternalLinkTarget/OpenExternalLinkTargetPlugin.php @@ -52,7 +52,7 @@ class OpenExternalLinkTargetPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'OpenExternalLinkTarget', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Sarven Capadisli', 'homepage' => 'http://status.net/wiki/Plugin:OpenExternalLinkTarget', 'rawdescription' => diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 293eb3155a..b0bdc2885c 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -647,7 +647,7 @@ class OpenIDPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'OpenID', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou, Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:OpenID', 'rawdescription' => diff --git a/plugins/OpenX/OpenXPlugin.php b/plugins/OpenX/OpenXPlugin.php index 7285cf1ca8..6385d82102 100644 --- a/plugins/OpenX/OpenXPlugin.php +++ b/plugins/OpenX/OpenXPlugin.php @@ -202,7 +202,7 @@ ENDOFSCRIPT; function onPluginVersion(&$versions) { $versions[] = array('name' => 'OpenX', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:OpenX', 'rawdescription' => diff --git a/plugins/Orbited/OrbitedPlugin.php b/plugins/Orbited/OrbitedPlugin.php index d3b73a9614..6ae394b61d 100644 --- a/plugins/Orbited/OrbitedPlugin.php +++ b/plugins/Orbited/OrbitedPlugin.php @@ -162,7 +162,7 @@ class OrbitedPlugin extends RealtimePlugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Orbited', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Orbited', 'rawdescription' => diff --git a/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php index 2c85586715..7b8be7900f 100644 --- a/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php +++ b/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php @@ -106,7 +106,7 @@ ENDOFPIWIK; function onPluginVersion(&$versions) { $versions[] = array('name' => 'PiwikAnalytics', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Tobias Diekershoff, Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Piwik', 'rawdescription' => diff --git a/plugins/PostDebug/PostDebugPlugin.php b/plugins/PostDebug/PostDebugPlugin.php index 558db71534..3b4ccd272b 100644 --- a/plugins/PostDebug/PostDebugPlugin.php +++ b/plugins/PostDebug/PostDebugPlugin.php @@ -51,7 +51,7 @@ class PostDebugPlugin extends Plugin public function onPluginVersion(&$versions) { $versions[] = array('name' => 'PostDebug', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber', 'homepage' => 'http://status.net/wiki/Plugin:PostDebug', 'rawdescription' => diff --git a/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php index eff2f7b491..badc24bbd7 100644 --- a/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php +++ b/plugins/PoweredByStatusNet/PoweredByStatusNetPlugin.php @@ -56,7 +56,7 @@ class PoweredByStatusNetPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'PoweredByStatusNet', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Sarven Capadisli', 'homepage' => 'http://status.net/wiki/Plugin:PoweredByStatusNet', 'rawdescription' => diff --git a/plugins/PtitUrl/PtitUrlPlugin.php b/plugins/PtitUrl/PtitUrlPlugin.php index cac5baf8b7..7696333145 100644 --- a/plugins/PtitUrl/PtitUrlPlugin.php +++ b/plugins/PtitUrl/PtitUrlPlugin.php @@ -60,7 +60,7 @@ class PtitUrlPlugin extends UrlShortenerPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => sprintf('PtitUrl (%s)', $this->shortenerName), - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:PtitUrl', 'rawdescription' => diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php index 37cfcb9be3..a4709df462 100644 --- a/plugins/QnA/QnAPlugin.php +++ b/plugins/QnA/QnAPlugin.php @@ -121,7 +121,7 @@ class QnAPlugin extends MicroAppPlugin { $versions[] = array( 'name' => 'QnA', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Zach Copley', 'homepage' => 'http://status.net/wiki/Plugin:QnA', 'description' => diff --git a/plugins/Recaptcha/RecaptchaPlugin.php b/plugins/Recaptcha/RecaptchaPlugin.php index 73a2dcc76a..10bf2a3c04 100644 --- a/plugins/Recaptcha/RecaptchaPlugin.php +++ b/plugins/Recaptcha/RecaptchaPlugin.php @@ -107,7 +107,7 @@ class RecaptchaPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Recaptcha', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Eric Helgeson', 'homepage' => 'http://status.net/wiki/Plugin:Recaptcha', 'rawdescription' => diff --git a/plugins/RegisterThrottle/RegisterThrottlePlugin.php b/plugins/RegisterThrottle/RegisterThrottlePlugin.php index 2cfd98aad7..a049bfc497 100644 --- a/plugins/RegisterThrottle/RegisterThrottlePlugin.php +++ b/plugins/RegisterThrottle/RegisterThrottlePlugin.php @@ -179,7 +179,7 @@ class RegisterThrottlePlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'RegisterThrottle', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:RegisterThrottle', 'description' => diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php index 8ad41fe05d..f7e17f80c8 100644 --- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php +++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php @@ -213,7 +213,7 @@ class RequireValidatedEmailPlugin extends Plugin { $versions[] = array('name' => 'Require Validated Email', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews, '. 'Evan Prodromou, '. 'Brion Vibber', diff --git a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php index 568c1c9584..959648bc89 100644 --- a/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php +++ b/plugins/ReverseUsernameAuthentication/ReverseUsernameAuthenticationPlugin.php @@ -60,7 +60,7 @@ class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Reverse Username Authentication', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:ReverseUsernameAuthentication', 'rawdescription' => diff --git a/plugins/SQLProfile/SQLProfilePlugin.php b/plugins/SQLProfile/SQLProfilePlugin.php index 20dfb88676..a29a7f5bea 100644 --- a/plugins/SQLProfile/SQLProfilePlugin.php +++ b/plugins/SQLProfile/SQLProfilePlugin.php @@ -34,7 +34,7 @@ class SQLProfilePlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'SQLProfile', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber', 'homepage' => 'http://status.net/wiki/Plugin:SQLProfile', 'rawdescription' => diff --git a/plugins/SQLStats/SQLStatsPlugin.php b/plugins/SQLStats/SQLStatsPlugin.php index de6ea23917..b20f72be42 100644 --- a/plugins/SQLStats/SQLStatsPlugin.php +++ b/plugins/SQLStats/SQLStatsPlugin.php @@ -37,7 +37,7 @@ class SQLStatsPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'SQLStats', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:SQLStats', 'rawdescription' => diff --git a/plugins/Sample/SamplePlugin.php b/plugins/Sample/SamplePlugin.php index 9365410613..0a0e50b360 100644 --- a/plugins/Sample/SamplePlugin.php +++ b/plugins/Sample/SamplePlugin.php @@ -225,7 +225,7 @@ class SamplePlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'Sample', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber, Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:Sample', 'rawdescription' => diff --git a/plugins/ShareNotice/ShareNoticePlugin.php b/plugins/ShareNotice/ShareNoticePlugin.php index 86ecfa8837..fa1323d6f1 100644 --- a/plugins/ShareNotice/ShareNoticePlugin.php +++ b/plugins/ShareNotice/ShareNoticePlugin.php @@ -214,7 +214,7 @@ class FacebookShareTarget extends NoticeShareTarget $url = 'http://status.net/wiki/Plugin:ShareNotice'; $versions[] = array('name' => 'ShareNotice', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber', 'homepage' => $url, 'rawdescription' => diff --git a/plugins/SimpleUrl/SimpleUrlPlugin.php b/plugins/SimpleUrl/SimpleUrlPlugin.php index acf0e91e61..574b466df6 100644 --- a/plugins/SimpleUrl/SimpleUrlPlugin.php +++ b/plugins/SimpleUrl/SimpleUrlPlugin.php @@ -50,7 +50,7 @@ class SimpleUrlPlugin extends UrlShortenerPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => sprintf('SimpleUrl (%s)', $this->shortenerName), - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:SimpleUrl', 'rawdescription' => diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index d65aba1222..ca16589316 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -179,7 +179,7 @@ class SitemapPlugin extends Plugin $url = 'http://status.net/wiki/Plugin:Sitemap'; $versions[] = array('name' => 'Sitemap', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => $url, 'rawdescription' => diff --git a/plugins/SlicedFavorites/SlicedFavoritesPlugin.php b/plugins/SlicedFavorites/SlicedFavoritesPlugin.php index 2a87a64745..b3cf058a05 100644 --- a/plugins/SlicedFavorites/SlicedFavoritesPlugin.php +++ b/plugins/SlicedFavorites/SlicedFavoritesPlugin.php @@ -100,7 +100,7 @@ class SlicedFavoritesPlugin extends Plugin $url = 'http://status.net/wiki/Plugin:SlicedFavorites'; $versions[] = array('name' => 'SlicedFavorites', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber', 'homepage' => $url, 'rawdescription' => diff --git a/plugins/SphinxSearch/SphinxSearchPlugin.php b/plugins/SphinxSearch/SphinxSearchPlugin.php index 7abfb04e9d..be7fc95368 100644 --- a/plugins/SphinxSearch/SphinxSearchPlugin.php +++ b/plugins/SphinxSearch/SphinxSearchPlugin.php @@ -110,7 +110,7 @@ class SphinxSearchPlugin extends Plugin $url = 'http://status.net/wiki/Plugin:SphinxSearch'; $versions[] = array('name' => 'SphinxSearch', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber', 'homepage' => $url, 'rawdescription' => diff --git a/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php b/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php index 2c675e90ef..682b10cad2 100644 --- a/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php +++ b/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php @@ -52,7 +52,7 @@ class StrictTransportSecurityPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'StrictTransportSecurity', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:StrictTransportSecurity', 'rawdescription' => diff --git a/plugins/SubMirror/SubMirrorPlugin.php b/plugins/SubMirror/SubMirrorPlugin.php index 7eb30d4d9d..ca797c8531 100644 --- a/plugins/SubMirror/SubMirrorPlugin.php +++ b/plugins/SubMirror/SubMirrorPlugin.php @@ -60,7 +60,7 @@ class SubMirrorPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'SubMirror', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber', 'homepage' => 'http://status.net/wiki/Plugin:SubMirror', 'rawdescription' => diff --git a/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php b/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php index 2bc6d0fa62..b19a03d11c 100644 --- a/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php +++ b/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php @@ -160,7 +160,7 @@ class SubscriptionThrottlePlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'SubscriptionThrottle', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:SubscriptionThrottle', 'rawdescription' => diff --git a/plugins/TabFocus/TabFocusPlugin.php b/plugins/TabFocus/TabFocusPlugin.php index 58f3d06b11..0dd7a902ef 100644 --- a/plugins/TabFocus/TabFocusPlugin.php +++ b/plugins/TabFocus/TabFocusPlugin.php @@ -47,7 +47,7 @@ class TabFocusPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'TabFocus', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews and Paul Irish', 'homepage' => 'http://status.net/wiki/Plugin:TabFocus', 'rawdescription' => diff --git a/plugins/TightUrl/TightUrlPlugin.php b/plugins/TightUrl/TightUrlPlugin.php index 6d96f40bc5..d9414a8e8c 100644 --- a/plugins/TightUrl/TightUrlPlugin.php +++ b/plugins/TightUrl/TightUrlPlugin.php @@ -60,7 +60,7 @@ class TightUrlPlugin extends UrlShortenerPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => sprintf('TightUrl (%s)', $this->shortenerName), - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:TightUrl', 'rawdescription' => diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php index a5e4a481b8..fff3138347 100644 --- a/plugins/TinyMCE/TinyMCEPlugin.php +++ b/plugins/TinyMCE/TinyMCEPlugin.php @@ -79,7 +79,7 @@ class TinyMCEPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'TinyMCE', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:TinyMCE', 'rawdescription' => diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index b8f091e2bb..03d4374547 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -47,7 +47,7 @@ require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php'; */ class TwitterBridgePlugin extends Plugin { - const VERSION = STATUSNET_VERSION; + const VERSION = GNUSOCIAL_VERSION; public $adminImportControl = false; // Should the 'import' checkbox be exposed in the admin panel? /** diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index 22955a2ebc..490a08f4a8 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -232,7 +232,7 @@ class UserFlagPlugin extends Plugin $url = 'http://status.net/wiki/Plugin:UserFlag'; $versions[] = array('name' => 'UserFlag', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => $url, 'rawdescription' => diff --git a/plugins/UserLimit/UserLimitPlugin.php b/plugins/UserLimit/UserLimitPlugin.php index eec008180b..f881e9006a 100644 --- a/plugins/UserLimit/UserLimitPlugin.php +++ b/plugins/UserLimit/UserLimitPlugin.php @@ -84,7 +84,7 @@ class UserLimitPlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'UserLimit', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:UserLimit', 'description' => diff --git a/plugins/WebFinger/WebFingerPlugin.php b/plugins/WebFinger/WebFingerPlugin.php index 7e3453ffb2..f7e428e54c 100644 --- a/plugins/WebFinger/WebFingerPlugin.php +++ b/plugins/WebFinger/WebFingerPlugin.php @@ -140,7 +140,7 @@ class WebFingerPlugin extends Plugin public function onPluginVersion(&$versions) { $versions[] = array('name' => 'WebFinger', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Mikael Nordfeldth', 'homepage' => 'http://www.gnu.org/software/social/', // TRANS: Plugin description. diff --git a/plugins/WikiHowProfile/WikiHowProfilePlugin.php b/plugins/WikiHowProfile/WikiHowProfilePlugin.php index 3532ca5987..6f45da6a70 100644 --- a/plugins/WikiHowProfile/WikiHowProfilePlugin.php +++ b/plugins/WikiHowProfile/WikiHowProfilePlugin.php @@ -52,7 +52,7 @@ class WikiHowProfilePlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'WikiHow avatar fetcher', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Brion Vibber', 'homepage' => 'http://status.net/wiki/Plugin:Sample', 'rawdescription' => diff --git a/plugins/XCache/XCachePlugin.php b/plugins/XCache/XCachePlugin.php index 5b10718eaf..794356f60a 100644 --- a/plugins/XCache/XCachePlugin.php +++ b/plugins/XCache/XCachePlugin.php @@ -109,7 +109,7 @@ class XCachePlugin extends Plugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'XCache', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews', 'homepage' => 'http://status.net/wiki/Plugin:XCache', 'rawdescription' => diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php index 17e8b8d50a..5fab1ad082 100644 --- a/plugins/Xmpp/XmppPlugin.php +++ b/plugins/Xmpp/XmppPlugin.php @@ -465,7 +465,7 @@ class XmppPlugin extends ImPlugin function onPluginVersion(&$versions) { $versions[] = array('name' => 'XMPP', - 'version' => STATUSNET_VERSION, + 'version' => GNUSOCIAL_VERSION, 'author' => 'Craig Andrews, Evan Prodromou', 'homepage' => 'http://status.net/wiki/Plugin:XMPP', 'rawdescription' => diff --git a/scripts/docgen.php b/scripts/docgen.php index ac0a5c83dc..6341b72706 100755 --- a/scripts/docgen.php +++ b/scripts/docgen.php @@ -72,9 +72,9 @@ if ($plugin) { function getVersion() { - // define('STATUSNET_VERSION', '0.9.1'); + // define('GNUSOCIAL_VERSION', '0.9.1'); $source = file_get_contents(INSTALLDIR . '/lib/common.php'); - if (preg_match('/^\s*define\s*\(\s*[\'"]STATUSNET_VERSION[\'"]\s*,\s*[\'"](.*)[\'"]\s*\)\s*;/m', $source, $matches)) { + if (preg_match('/^\s*define\s*\(\s*[\'"]GNUSOCIAL_VERSION[\'"]\s*,\s*[\'"](.*)[\'"]\s*\)\s*;/m', $source, $matches)) { return $matches[1]; } return 'unknown'; diff --git a/scripts/gnusocialversion.php b/scripts/gnusocialversion.php index 024e3330d8..dbe9c54c5b 100644 --- a/scripts/gnusocialversion.php +++ b/scripts/gnusocialversion.php @@ -30,4 +30,4 @@ END_OF_HELP; require_once INSTALLDIR.'/scripts/commandline.inc'; -print STATUSNET_VERSION."\n"; +print GNUSOCIAL_VERSION."\n"; diff --git a/scripts/make-release.php b/scripts/make-release.php index f815428039..157cae067d 100644 --- a/scripts/make-release.php +++ b/scripts/make-release.php @@ -27,7 +27,7 @@ require_once INSTALLDIR.'/scripts/commandline.inc'; $base = INSTALLDIR; $encBase = escapeshellarg($base); -$ver = STATUSNET_VERSION; +$ver = GNUSOCIAL_VERSION; // @fixme hack if (preg_match('/^(\d+)\.(\d+)\.(\d+)/', $ver, $matches)) {