Merge branch 'hackfest' into nightly

This commit is contained in:
Mikael Nordfeldth 2015-06-06 22:15:39 +02:00
commit 6267e7a930
112 changed files with 120 additions and 143 deletions

View File

@ -49,16 +49,9 @@ class ApiconversationAction extends ApiAuthAction
protected $conversation = null; protected $conversation = null;
protected $notices = null; protected $notices = null;
/** protected function prepare(array $args=array())
* For initializing members of the class.
*
* @param array $argarray misc. arguments
*
* @return boolean true
*/
function prepare($argarray)
{ {
parent::prepare($argarray); parent::prepare($args);
$convId = $this->trimmed('id'); $convId = $this->trimmed('id');

View File

@ -97,7 +97,7 @@ class ConversationAction extends ManagedAction
Event::handle('EndShowConversation', array($this, $this->conv, $this->scoped)); Event::handle('EndShowConversation', array($this, $this->conv, $this->scoped));
} }
function isReadOnly() function isReadOnly($args)
{ {
return true; return true;
} }

View File

@ -125,11 +125,10 @@ class Action extends HTMLOutputter // lawsuit
} else { } else {
common_debug('Prepare failed for Action.'); common_debug('Prepare failed for Action.');
} }
$this->flush();
Event::handle('EndActionExecute', array($this));
} }
$this->flush();
Event::handle('EndActionExecute', array($this));
} }
/** /**

View File

@ -54,25 +54,10 @@ class ApiOAuthAction extends ApiAction
return false; return false;
} }
function prepare($args) protected function prepare(array $args=array())
{ {
parent::prepare($args);
return true;
}
/**
* Handle input, produce output
*
* Switches on request method; either shows the form or handles its input.
*
* @param array $args $_REQUEST data
*
* @return void
*/
function handle($args)
{
parent::handle($args);
self::cleanRequest(); self::cleanRequest();
return parent::prepare($args);
} }
/* /*

View File

@ -72,9 +72,9 @@ class ClientErrorAction extends ErrorAction
// XXX: Should these error actions even be invokable via URI? // XXX: Should these error actions even be invokable via URI?
function handle($args) protected function handle()
{ {
parent::handle($args); parent::handle();
$this->code = $this->trimmed('code'); $this->code = $this->trimmed('code');

View File

@ -48,7 +48,7 @@ if (!defined('STATUSNET')) {
class FullThreadedNoticeList extends ThreadedNoticeList class FullThreadedNoticeList extends ThreadedNoticeList
{ {
function newListItem($notice) function newListItem(Notice $notice)
{ {
return new FullThreadedNoticeListItem($notice, $this->out, $this->userProfile); return new FullThreadedNoticeListItem($notice, $this->out, $this->userProfile);
} }

View File

@ -181,7 +181,7 @@ class Plugin
. ' (' . get_class($this) . ' v' . $this->version() . ')'; . ' (' . get_class($this) . ' v' . $this->version() . ')';
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$name = $this->name(); $name = $this->name();

View File

@ -78,9 +78,9 @@ class ServerErrorAction extends ErrorAction
// XXX: Should these error actions even be invokable via URI? // XXX: Should these error actions even be invokable via URI?
function handle($args) protected function handle()
{ {
parent::handle($args); parent::handle();
$this->code = $this->trimmed('code'); $this->code = $this->trimmed('code');

View File

@ -87,7 +87,7 @@ class AccountManagerPlugin extends Plugin
} }
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'AccountManager', $versions[] = array('name' => 'AccountManager',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -339,7 +339,7 @@ class ActivityPlugin extends Plugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Activity', $versions[] = array('name' => 'Activity',
'version' => self::VERSION, 'version' => self::VERSION,

View File

@ -215,7 +215,7 @@ class ActivitySpamPlugin extends Plugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'ActivitySpam', $versions[] = array('name' => 'ActivitySpam',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -44,7 +44,7 @@ class ActivityVerbPlugin extends Plugin
'verb' => '[a-z]+')); 'verb' => '[a-z]+'));
} }
public function onPluginVersion(&$versions) public function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Activity Verb', $versions[] = array('name' => 'Activity Verb',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -271,7 +271,7 @@ class AnonymousFavePlugin extends Plugin
* *
* @return boolean hook value * @return boolean hook value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$url = 'http://status.net/wiki/Plugin:AnonymousFave'; $url = 'http://status.net/wiki/Plugin:AnonymousFave';

View File

@ -68,7 +68,7 @@ class AntiBrutePlugin extends Plugin {
return true; return true;
} }
public function onPluginVersion(&$versions) public function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'AntiBrute', $versions[] = array('name' => 'AntiBrute',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -75,7 +75,7 @@ class ApiLoggerPlugin extends Plugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'ApiLogger', $versions[] = array('name' => 'ApiLogger',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -150,7 +150,7 @@ class AuthCryptPlugin extends AuthenticationPlugin
return true; return true;
} }
public function onPluginVersion(&$versions) public function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'AuthCrypt', $versions[] = array('name' => 'AuthCrypt',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -56,7 +56,7 @@ class AutoSandboxPlugin extends Plugin
} }
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'AutoSandbox', $versions[] = array('name' => 'AutoSandbox',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -52,7 +52,7 @@ class AutocompletePlugin extends Plugin
$m->connect('main/autocomplete/suggest', array('action'=>'autocomplete')); $m->connect('main/autocomplete/suggest', array('action'=>'autocomplete'));
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Autocomplete', $versions[] = array('name' => 'Autocomplete',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -44,7 +44,7 @@ class AwesomenessPlugin extends Plugin
{ {
const VERSION = '0.0.42'; const VERSION = '0.0.42';
public function onPluginVersion(&$versions) public function onPluginVersion(array &$versions)
{ {
$versions[] = array( $versions[] = array(
'name' => 'Awesomeness', 'name' => 'Awesomeness',

View File

@ -145,7 +145,7 @@ class BitlyUrlPlugin extends UrlShortenerPlugin
return null; return null;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => sprintf('BitlyUrl (%s)', $this->shortenerName), $versions[] = array('name' => sprintf('BitlyUrl (%s)', $this->shortenerName),
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -291,7 +291,7 @@ class BlacklistPlugin extends Plugin
* *
* @return boolean hook value * @return boolean hook value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Blacklist', $versions[] = array('name' => 'Blacklist',
'version' => self::VERSION, 'version' => self::VERSION,

View File

@ -117,7 +117,7 @@ class BlankAdPlugin extends UAPPlugin
''); '');
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'BlankAd', $versions[] = array('name' => 'BlankAd',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -148,7 +148,7 @@ class BlogspamNetPlugin extends Plugin
return BLOGSPAMNETPLUGIN_VERSION; return BLOGSPAMNETPLUGIN_VERSION;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'BlogspamNet', $versions[] = array('name' => 'BlogspamNet',
'version' => BLOGSPAMNETPLUGIN_VERSION, 'version' => BLOGSPAMNETPLUGIN_VERSION,

View File

@ -181,7 +181,7 @@ class BookmarkPlugin extends MicroAppPlugin
* *
* @return value * @return value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Bookmark', $versions[] = array('name' => 'Bookmark',
'version' => self::VERSION, 'version' => self::VERSION,

View File

@ -96,7 +96,7 @@ class CacheLogPlugin extends Plugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'CacheLog', $versions[] = array('name' => 'CacheLog',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -147,7 +147,7 @@ class CasAuthenticationPlugin extends AuthenticationPlugin
$casSettings['takeOverLogin']=$this->takeOverLogin; $casSettings['takeOverLogin']=$this->takeOverLogin;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'CAS Authentication', $versions[] = array('name' => 'CAS Authentication',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -54,7 +54,7 @@ class ClientSideShortenPlugin extends Plugin
} }
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Shorten', $versions[] = array('name' => 'Shorten',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -104,7 +104,7 @@ class CometPlugin extends RealtimePlugin
return '/' . implode('/', $path); return '/' . implode('/', $path);
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Comet', $versions[] = array('name' => 'Comet',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -45,7 +45,7 @@ class CronishPlugin extends Plugin {
return true; return true;
} }
public function onPluginVersion(&$versions) public function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Cronish', $versions[] = array('name' => 'Cronish',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -43,7 +43,7 @@ class DefaultLayoutPlugin extends Plugin
return true; return true;
} }
public function onPluginVersion(&$versions) public function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Default Layout', $versions[] = array('name' => 'Default Layout',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -244,7 +244,7 @@ class DirectionDetectorPlugin extends Plugin {
/** /**
* plugin details * plugin details
*/ */
function onPluginVersion(&$versions){ function onPluginVersion(array &$versions){
$url = 'http://status.net/wiki/Plugin:DirectionDetector'; $url = 'http://status.net/wiki/Plugin:DirectionDetector';
$versions[] = array( $versions[] = array(

View File

@ -251,7 +251,7 @@ class DirectoryPlugin extends Plugin
/* /*
* Version info * Version info
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array( $versions[] = array(
'name' => 'Directory', 'name' => 'Directory',

View File

@ -161,7 +161,7 @@ class DiskCachePlugin extends Plugin
return false; return false;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'DiskCache', $versions[] = array('name' => 'DiskCache',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -190,7 +190,7 @@ class DomainStatusNetworkPlugin extends Plugin
return null; return null;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'DomainStatusNetwork', $versions[] = array('name' => 'DomainStatusNetwork',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -267,7 +267,7 @@ class DomainWhitelistPlugin extends Plugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'DomainWhitelist', $versions[] = array('name' => 'DomainWhitelist',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -49,7 +49,7 @@ class EmailAuthenticationPlugin extends Plugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Email Authentication', $versions[] = array('name' => 'Email Authentication',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -172,7 +172,7 @@ class EmailRegistrationPlugin extends Plugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'EmailRegistration', $versions[] = array('name' => 'EmailRegistration',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -179,7 +179,7 @@ class EmailReminderPlugin extends Plugin
* @param type $versions * @param type $versions
* @return type * @return type
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array( $versions[] = array(
'name' => 'EmailReminder', 'name' => 'EmailReminder',

View File

@ -66,7 +66,7 @@ class EmailSummaryPlugin extends Plugin
* *
* @return boolean hook value; true means continue processing, false means stop. * @return boolean hook value; true means continue processing, false means stop.
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'EmailSummary', $versions[] = array('name' => 'EmailSummary',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -90,7 +90,7 @@ class EventPlugin extends MicroAppPlugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Event', $versions[] = array('name' => 'Event',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -29,7 +29,7 @@ if (!defined('STATUSNET')) {
*/ */
class ExtendedProfilePlugin extends Plugin class ExtendedProfilePlugin extends Plugin
{ {
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array( $versions[] = array(
'name' => 'ExtendedProfile', 'name' => 'ExtendedProfile',

View File

@ -612,7 +612,7 @@ ENDOFSCRIPT;
* *
* @param array &$versions plugin version descriptions * @param array &$versions plugin version descriptions
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array( $versions[] = array(
'name' => 'Facebook Bridge', 'name' => 'Facebook Bridge',

View File

@ -47,7 +47,7 @@ class FeedPollerPlugin extends Plugin {
return true; return true;
} }
public function onPluginVersion(&$versions) public function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'FeedPoller', $versions[] = array('name' => 'FeedPoller',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -58,7 +58,7 @@ class FirePHPPlugin extends Plugin
$this->firephp->fb($msg, $fp_priority); $this->firephp->fb($msg, $fp_priority);
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'FirePHP', $versions[] = array('name' => 'FirePHP',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -165,7 +165,7 @@ class FollowEveryonePlugin extends Plugin
* @return boolean hook value * @return boolean hook value
* *
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'FollowEveryone', $versions[] = array('name' => 'FollowEveryone',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -105,7 +105,7 @@ class ForceGroupPlugin extends Plugin
* *
* @return boolean hook value * @return boolean hook value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$url = 'http://status.net/wiki/Plugin:ForceGroup'; $url = 'http://status.net/wiki/Plugin:ForceGroup';

View File

@ -114,7 +114,7 @@ class GeoURLPlugin extends Plugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'GeoURL', $versions[] = array('name' => 'GeoURL',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -487,7 +487,7 @@ class GeonamesPlugin extends Plugin
return $document->geoname; return $document->geoname;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Geonames', $versions[] = array('name' => 'Geonames',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -105,7 +105,7 @@ ENDOFSCRIPT2;
$action->inlineScript($js); $action->inlineScript($js);
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'GoogleAnalytics', $versions[] = array('name' => 'GoogleAnalytics',
'version' => self::VERSION, 'version' => self::VERSION,

View File

@ -59,7 +59,7 @@ class GravatarPlugin extends Plugin
return $url; return $url;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Gravatar', $versions[] = array('name' => 'Gravatar',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -405,7 +405,7 @@ class GroupPrivateMessagePlugin extends Plugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'GroupPrivateMessage', $versions[] = array('name' => 'GroupPrivateMessage',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -132,7 +132,7 @@ class ImageMagickPlugin extends Plugin
return getimagesize($outpath); // Verify that we wrote an understandable image. return getimagesize($outpath); // Verify that we wrote an understandable image.
} }
public function onPluginVersion(&$versions) public function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'ImageMagick', $versions[] = array('name' => 'ImageMagick',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -76,7 +76,7 @@ class ImapPlugin extends Plugin
$classes[] = new ImapManager($this); $classes[] = new ImapManager($this);
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'IMAP', $versions[] = array('name' => 'IMAP',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -170,7 +170,7 @@ class InProcessCachePlugin extends Plugin
* *
* @return boolean true * @return boolean true
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$url = 'http://status.net/wiki/Plugin:InProcessCache'; $url = 'http://status.net/wiki/Plugin:InProcessCache';

View File

@ -51,7 +51,7 @@ class LRDDPlugin extends Plugin
$disco->registerMethod('LRDDMethod_LinkHTML'); $disco->registerMethod('LRDDMethod_LinkHTML');
} }
public function onPluginVersion(&$versions) public function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'LRDD', $versions[] = array('name' => 'LRDD',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -142,7 +142,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
return common_nicknamize($nickname); return common_nicknamize($nickname);
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'LDAP Authentication', $versions[] = array('name' => 'LDAP Authentication',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -118,7 +118,7 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
return false; return false;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'LDAP Authorization', $versions[] = array('name' => 'LDAP Authorization',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -57,7 +57,7 @@ class LilUrlPlugin extends UrlShortenerPlugin
} }
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => sprintf('LilUrl (%s)', $this->shortenerName), $versions[] = array('name' => sprintf('LilUrl (%s)', $this->shortenerName),
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -29,7 +29,7 @@ if (!defined('STATUSNET')) {
*/ */
class LinkPreviewPlugin extends Plugin class LinkPreviewPlugin extends Plugin
{ {
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'LinkPreview', $versions[] = array('name' => 'LinkPreview',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -232,7 +232,7 @@ class LinkbackPlugin extends Plugin
return LINKBACKPLUGIN_VERSION; return LINKBACKPLUGIN_VERSION;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Linkback', $versions[] = array('name' => 'Linkback',
'version' => LINKBACKPLUGIN_VERSION, 'version' => LINKBACKPLUGIN_VERSION,

View File

@ -39,7 +39,7 @@ class LogFilterPlugin extends Plugin
public $priority = array(); // override by priority: array(LOG_ERR => true, LOG_DEBUG => false) 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) public $regex = array(); // override by regex match of message: array('/twitter/i' => false)
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'LogFilter', $versions[] = array('name' => 'LogFilter',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -169,7 +169,7 @@ class MapstractionPlugin extends Plugin
$action->elementEnd('div'); $action->elementEnd('div');
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Mapstraction', $versions[] = array('name' => 'Mapstraction',
'version' => self::VERSION, 'version' => self::VERSION,

View File

@ -236,7 +236,7 @@ class MemcachePlugin extends Plugin
return $out; return $out;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Memcache', $versions[] = array('name' => 'Memcache',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -207,7 +207,7 @@ class MemcachedPlugin extends Plugin
return $flag; return $flag;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Memcached', $versions[] = array('name' => 'Memcached',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -160,7 +160,7 @@ class MeteorPlugin extends RealtimePlugin
return implode('-', $path); return implode('-', $path);
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Meteor', $versions[] = array('name' => 'Meteor',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -157,7 +157,7 @@ class MinifyPlugin extends Plugin
return Minify_CSS::minify($code,$options); return Minify_CSS::minify($code,$options);
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Minify', $versions[] = array('name' => 'Minify',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -43,7 +43,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
class WAP20Plugin extends Plugin class WAP20Plugin extends Plugin
{ {
function onStartShowHTML($action) function onStartShowHTML(Action $action)
{ {
} }

View File

@ -368,7 +368,7 @@ class MobileProfilePlugin extends WAP20Plugin
return $proto.'://'.$serverpart.'/'.$pathpart.$relative; return $proto.'://'.$serverpart.'/'.$pathpart.$relative;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'MobileProfile', $versions[] = array('name' => 'MobileProfile',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -29,7 +29,7 @@ class ModHelperPlugin extends Plugin
{ {
static $rights = array(Right::SILENCEUSER, Right::TRAINSPAM, Right::REVIEWSPAM); static $rights = array(Right::SILENCEUSER, Right::TRAINSPAM, Right::REVIEWSPAM);
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'ModHelper', $versions[] = array('name' => 'ModHelper',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -183,7 +183,7 @@ class ModLogPlugin extends Plugin
} }
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'ModLog', $versions[] = array('name' => 'ModLog',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -27,7 +27,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
*/ */
class ModPlusPlugin extends Plugin class ModPlusPlugin extends Plugin
{ {
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'ModPlus', $versions[] = array('name' => 'ModPlus',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -84,7 +84,7 @@ class NoticeTitlePlugin extends Plugin
* *
* @return boolean hook value * @return boolean hook value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$url = 'http://status.net/wiki/Plugin:NoticeTitle'; $url = 'http://status.net/wiki/Plugin:NoticeTitle';

View File

@ -1166,7 +1166,7 @@ class OStatusPlugin extends Plugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'OStatus', $versions[] = array('name' => 'OStatus',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -71,7 +71,7 @@ class OfflineBackupPlugin extends Plugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'OfflineBackup', $versions[] = array('name' => 'OfflineBackup',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -49,7 +49,7 @@ class OpenExternalLinkTargetPlugin extends Plugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'OpenExternalLinkTarget', $versions[] = array('name' => 'OpenExternalLinkTarget',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -615,7 +615,7 @@ class OpenIDPlugin extends Plugin
* *
* @return boolean hook value * @return boolean hook value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'OpenID', $versions[] = array('name' => 'OpenID',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -199,7 +199,7 @@ ENDOFSCRIPT;
* *
* @return boolean hook value * @return boolean hook value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'OpenX', $versions[] = array('name' => 'OpenX',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -32,7 +32,7 @@ class OpportunisticQMPlugin extends Plugin {
return true; return true;
} }
public function onPluginVersion(&$versions) public function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'OpportunisticQM', $versions[] = array('name' => 'OpportunisticQM',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -159,7 +159,7 @@ class OrbitedPlugin extends RealtimePlugin
* *
* @return boolean hook value * @return boolean hook value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Orbited', $versions[] = array('name' => 'Orbited',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -103,7 +103,7 @@ ENDOFPIWIK;
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'PiwikAnalytics', $versions[] = array('name' => 'PiwikAnalytics',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -120,7 +120,7 @@ class PollPlugin extends MicroAppPlugin
* *
* @return value * @return value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Poll', $versions[] = array('name' => 'Poll',
'version' => self::VERSION, 'version' => self::VERSION,

View File

@ -48,7 +48,7 @@ class PostDebugPlugin extends Plugin
} }
} }
public function onPluginVersion(&$versions) public function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'PostDebug', $versions[] = array('name' => 'PostDebug',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -57,7 +57,7 @@ class PtitUrlPlugin extends UrlShortenerPlugin
} }
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => sprintf('PtitUrl (%s)', $this->shortenerName), $versions[] = array('name' => sprintf('PtitUrl (%s)', $this->shortenerName),
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -124,7 +124,7 @@ class QnAPlugin extends MicroAppPlugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array( $versions[] = array(
'name' => 'QnA', 'name' => 'QnA',
@ -260,7 +260,7 @@ class QnAPlugin extends MicroAppPlugin
* @return boolean hook value * @return boolean hook value
*/ */
function onStartOpenNoticeListItemElement($nli) function onStartOpenNoticeListItemElement(NoticeListItem $nli)
{ {
$type = $nli->notice->object_type; $type = $nli->notice->object_type;
@ -325,7 +325,7 @@ class QnAPlugin extends MicroAppPlugin
* *
* @todo FIXME: WARNING WARNING WARNING this closes a 'div' that is implicitly opened in BookmarkPlugin's showNotice implementation * @todo FIXME: WARNING WARNING WARNING this closes a 'div' that is implicitly opened in BookmarkPlugin's showNotice implementation
*/ */
function onStartShowNoticeItem($nli) function onStartShowNoticeItem(NoticeListItem $nli)
{ {
if (!$this->isMyNotice($nli->notice)) { if (!$this->isMyNotice($nli->notice)) {
return true; return true;

View File

@ -198,7 +198,7 @@ class RSSCloudPlugin extends Plugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'RSSCloud', $versions[] = array('name' => 'RSSCloud',
'version' => RSSCLOUDPLUGIN_VERSION, 'version' => RSSCLOUDPLUGIN_VERSION,

View File

@ -104,7 +104,7 @@ class RecaptchaPlugin extends Plugin
} }
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Recaptcha', $versions[] = array('name' => 'Recaptcha',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -175,7 +175,7 @@ class RegisterThrottlePlugin extends Plugin
* *
* @return boolean hook value * @return boolean hook value
*/ */
public function onPluginVersion(&$versions) public function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'RegisterThrottle', $versions[] = array('name' => 'RegisterThrottle',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -209,7 +209,7 @@ class RequireValidatedEmailPlugin extends Plugin
* *
* @return boolean hook value * @return boolean hook value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = $versions[] =
array('name' => 'Require Validated Email', array('name' => 'Require Validated Email',

View File

@ -57,7 +57,7 @@ class ReverseUsernameAuthenticationPlugin extends AuthenticationPlugin
return User::register($registration_data); return User::register($registration_data);
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Reverse Username Authentication', $versions[] = array('name' => 'Reverse Username Authentication',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -31,7 +31,7 @@ class SQLProfilePlugin extends Plugin
{ {
private $recursionGuard = false; private $recursionGuard = false;
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'SQLProfile', $versions[] = array('name' => 'SQLProfile',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -34,7 +34,7 @@ class SQLStatsPlugin extends Plugin
protected $queryTimes = array(); protected $queryTimes = array();
protected $queries = array(); protected $queries = array();
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'SQLStats', $versions[] = array('name' => 'SQLStats',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -222,7 +222,7 @@ class SamplePlugin extends Plugin
return true; return true;
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'Sample', $versions[] = array('name' => 'Sample',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -88,7 +88,7 @@ class SearchSubPlugin extends Plugin
* *
* @return value * @return value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'SearchSub', $versions[] = array('name' => 'SearchSub',
'version' => self::VERSION, 'version' => self::VERSION,

View File

@ -209,7 +209,7 @@ class FacebookShareTarget extends NoticeShareTarget
* *
* @return boolean hook value * @return boolean hook value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$url = 'http://status.net/wiki/Plugin:ShareNotice'; $url = 'http://status.net/wiki/Plugin:ShareNotice';

View File

@ -47,7 +47,7 @@ class SimpleUrlPlugin extends UrlShortenerPlugin
return $this->http_get(sprintf($this->serviceUrl,urlencode($url))); return $this->http_get(sprintf($this->serviceUrl,urlencode($url)));
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => sprintf('SimpleUrl (%s)', $this->shortenerName), $versions[] = array('name' => sprintf('SimpleUrl (%s)', $this->shortenerName),
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -174,7 +174,7 @@ class SitemapPlugin extends Plugin
* *
* @return boolean hook value * @return boolean hook value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$url = 'http://status.net/wiki/Plugin:Sitemap'; $url = 'http://status.net/wiki/Plugin:Sitemap';

View File

@ -95,7 +95,7 @@ class SlicedFavoritesPlugin extends Plugin
* *
* @return boolean hook value * @return boolean hook value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$url = 'http://status.net/wiki/Plugin:SlicedFavorites'; $url = 'http://status.net/wiki/Plugin:SlicedFavorites';

View File

@ -105,7 +105,7 @@ class SphinxSearchPlugin extends Plugin
* *
* @return boolean hook value * @return boolean hook value
*/ */
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$url = 'http://status.net/wiki/Plugin:SphinxSearch'; $url = 'http://status.net/wiki/Plugin:SphinxSearch';

View File

@ -50,7 +50,7 @@ class StrictTransportSecurityPlugin extends Plugin
} }
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'StrictTransportSecurity', $versions[] = array('name' => 'StrictTransportSecurity',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

View File

@ -57,7 +57,7 @@ class SubMirrorPlugin extends Plugin
} }
} }
function onPluginVersion(&$versions) function onPluginVersion(array &$versions)
{ {
$versions[] = array('name' => 'SubMirror', $versions[] = array('name' => 'SubMirror',
'version' => GNUSOCIAL_VERSION, 'version' => GNUSOCIAL_VERSION,

Some files were not shown because too many files have changed in this diff Show More