git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 6267e7a9 authored by mmn's avatar mmn

Merge branch 'hackfest' into nightly

parents 814696c2 d76d3734
......@@ -49,16 +49,9 @@ class ApiconversationAction extends ApiAuthAction
protected $conversation = null;
protected $notices = null;
/**
* For initializing members of the class.
*
* @param array $argarray misc. arguments
*
* @return boolean true
*/
function prepare($argarray)
protected function prepare(array $args=array())
{
parent::prepare($argarray);
parent::prepare($args);
$convId = $this->trimmed('id');
......
......@@ -97,7 +97,7 @@ class ConversationAction extends ManagedAction
Event::handle('EndShowConversation', array($this, $this->conv, $this->scoped));
}
function isReadOnly()
function isReadOnly($args)
{
return true;
}
......
......@@ -125,11 +125,10 @@ class Action extends HTMLOutputter // lawsuit
} else {
common_debug('Prepare failed for Action.');
}
}
$this->flush();
Event::handle('EndActionExecute', array($this));
$this->flush();
Event::handle('EndActionExecute', array($this));
}
}
/**
......
......@@ -54,25 +54,10 @@ class ApiOAuthAction extends ApiAction
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();
return parent::prepare($args);
}
/*
......
......@@ -72,9 +72,9 @@ class ClientErrorAction extends ErrorAction
// 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');
......
......@@ -48,7 +48,7 @@ if (!defined('STATUSNET')) {
class FullThreadedNoticeList extends ThreadedNoticeList
{
function newListItem($notice)
function newListItem(Notice $notice)
{
return new FullThreadedNoticeListItem($notice, $this->out, $this->userProfile);
}
......
......@@ -181,7 +181,7 @@ class Plugin
. ' (' . get_class($this) . ' v' . $this->version() . ')';
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$name = $this->name();
......
......@@ -78,9 +78,9 @@ class ServerErrorAction extends ErrorAction
// 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');
......
......@@ -87,7 +87,7 @@ class AccountManagerPlugin extends Plugin
}
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'AccountManager',
'version' => GNUSOCIAL_VERSION,
......
......@@ -339,7 +339,7 @@ class ActivityPlugin extends Plugin
return true;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Activity',
'version' => self::VERSION,
......
......@@ -215,7 +215,7 @@ class ActivitySpamPlugin extends Plugin
return true;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'ActivitySpam',
'version' => GNUSOCIAL_VERSION,
......
......@@ -44,7 +44,7 @@ class ActivityVerbPlugin extends Plugin
'verb' => '[a-z]+'));
}
public function onPluginVersion(&$versions)
public function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Activity Verb',
'version' => GNUSOCIAL_VERSION,
......
......@@ -271,7 +271,7 @@ class AnonymousFavePlugin extends Plugin
*
* @return boolean hook value
*/
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$url = 'http://status.net/wiki/Plugin:AnonymousFave';
......
......@@ -68,7 +68,7 @@ class AntiBrutePlugin extends Plugin {
return true;
}
public function onPluginVersion(&$versions)
public function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'AntiBrute',
'version' => GNUSOCIAL_VERSION,
......
......@@ -75,7 +75,7 @@ class ApiLoggerPlugin extends Plugin
return true;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'ApiLogger',
'version' => GNUSOCIAL_VERSION,
......
......@@ -150,7 +150,7 @@ class AuthCryptPlugin extends AuthenticationPlugin
return true;
}
public function onPluginVersion(&$versions)
public function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'AuthCrypt',
'version' => GNUSOCIAL_VERSION,
......
......@@ -56,7 +56,7 @@ class AutoSandboxPlugin extends Plugin
}
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'AutoSandbox',
'version' => GNUSOCIAL_VERSION,
......
......@@ -52,7 +52,7 @@ class AutocompletePlugin extends Plugin
$m->connect('main/autocomplete/suggest', array('action'=>'autocomplete'));
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Autocomplete',
'version' => GNUSOCIAL_VERSION,
......
......@@ -44,7 +44,7 @@ class AwesomenessPlugin extends Plugin
{
const VERSION = '0.0.42';
public function onPluginVersion(&$versions)
public function onPluginVersion(array &$versions)
{
$versions[] = array(
'name' => 'Awesomeness',
......
......@@ -145,7 +145,7 @@ class BitlyUrlPlugin extends UrlShortenerPlugin
return null;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => sprintf('BitlyUrl (%s)', $this->shortenerName),
'version' => GNUSOCIAL_VERSION,
......
......@@ -291,7 +291,7 @@ class BlacklistPlugin extends Plugin
*
* @return boolean hook value
*/
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Blacklist',
'version' => self::VERSION,
......
......@@ -117,7 +117,7 @@ class BlankAdPlugin extends UAPPlugin
'');
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'BlankAd',
'version' => GNUSOCIAL_VERSION,
......
......@@ -148,7 +148,7 @@ class BlogspamNetPlugin extends Plugin
return BLOGSPAMNETPLUGIN_VERSION;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'BlogspamNet',
'version' => BLOGSPAMNETPLUGIN_VERSION,
......
......@@ -181,7 +181,7 @@ class BookmarkPlugin extends MicroAppPlugin
*
* @return value
*/
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Bookmark',
'version' => self::VERSION,
......
......@@ -96,7 +96,7 @@ class CacheLogPlugin extends Plugin
return true;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'CacheLog',
'version' => GNUSOCIAL_VERSION,
......
......@@ -147,7 +147,7 @@ class CasAuthenticationPlugin extends AuthenticationPlugin
$casSettings['takeOverLogin']=$this->takeOverLogin;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'CAS Authentication',
'version' => GNUSOCIAL_VERSION,
......
......@@ -54,7 +54,7 @@ class ClientSideShortenPlugin extends Plugin
}
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Shorten',
'version' => GNUSOCIAL_VERSION,
......
......@@ -104,7 +104,7 @@ class CometPlugin extends RealtimePlugin
return '/' . implode('/', $path);
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Comet',
'version' => GNUSOCIAL_VERSION,
......
......@@ -45,7 +45,7 @@ class CronishPlugin extends Plugin {
return true;
}
public function onPluginVersion(&$versions)
public function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Cronish',
'version' => GNUSOCIAL_VERSION,
......
......@@ -43,7 +43,7 @@ class DefaultLayoutPlugin extends Plugin
return true;
}
public function onPluginVersion(&$versions)
public function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Default Layout',
'version' => GNUSOCIAL_VERSION,
......
......@@ -244,7 +244,7 @@ class DirectionDetectorPlugin extends Plugin {
/**
* plugin details
*/
function onPluginVersion(&$versions){
function onPluginVersion(array &$versions){
$url = 'http://status.net/wiki/Plugin:DirectionDetector';
$versions[] = array(
......
......@@ -251,7 +251,7 @@ class DirectoryPlugin extends Plugin
/*
* Version info
*/
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array(
'name' => 'Directory',
......
......@@ -161,7 +161,7 @@ class DiskCachePlugin extends Plugin
return false;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'DiskCache',
'version' => GNUSOCIAL_VERSION,
......
......@@ -190,7 +190,7 @@ class DomainStatusNetworkPlugin extends Plugin
return null;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'DomainStatusNetwork',
'version' => GNUSOCIAL_VERSION,
......
......@@ -267,7 +267,7 @@ class DomainWhitelistPlugin extends Plugin
return true;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'DomainWhitelist',
'version' => GNUSOCIAL_VERSION,
......
......@@ -49,7 +49,7 @@ class EmailAuthenticationPlugin extends Plugin
return true;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Email Authentication',
'version' => GNUSOCIAL_VERSION,
......
......@@ -172,7 +172,7 @@ class EmailRegistrationPlugin extends Plugin
return true;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'EmailRegistration',
'version' => GNUSOCIAL_VERSION,
......
......@@ -179,7 +179,7 @@ class EmailReminderPlugin extends Plugin
* @param type $versions
* @return type
*/
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array(
'name' => 'EmailReminder',
......
......@@ -66,7 +66,7 @@ class EmailSummaryPlugin extends Plugin
*
* @return boolean hook value; true means continue processing, false means stop.
*/
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'EmailSummary',
'version' => GNUSOCIAL_VERSION,
......
......@@ -90,7 +90,7 @@ class EventPlugin extends MicroAppPlugin
return true;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Event',
'version' => GNUSOCIAL_VERSION,
......
......@@ -29,7 +29,7 @@ if (!defined('STATUSNET')) {
*/
class ExtendedProfilePlugin extends Plugin
{
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array(
'name' => 'ExtendedProfile',
......
......@@ -612,7 +612,7 @@ ENDOFSCRIPT;
*
* @param array &$versions plugin version descriptions
*/
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array(
'name' => 'Facebook Bridge',
......
......@@ -47,7 +47,7 @@ class FeedPollerPlugin extends Plugin {
return true;
}
public function onPluginVersion(&$versions)
public function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'FeedPoller',
'version' => GNUSOCIAL_VERSION,
......
......@@ -58,7 +58,7 @@ class FirePHPPlugin extends Plugin
$this->firephp->fb($msg, $fp_priority);
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'FirePHP',
'version' => GNUSOCIAL_VERSION,
......
......@@ -165,7 +165,7 @@ class FollowEveryonePlugin extends Plugin
* @return boolean hook value
*
*/
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'FollowEveryone',
'version' => GNUSOCIAL_VERSION,
......
......@@ -105,7 +105,7 @@ class ForceGroupPlugin extends Plugin
*
* @return boolean hook value
*/
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$url = 'http://status.net/wiki/Plugin:ForceGroup';
......
......@@ -114,7 +114,7 @@ class GeoURLPlugin extends Plugin
return true;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'GeoURL',
'version' => GNUSOCIAL_VERSION,
......
......@@ -487,7 +487,7 @@ class GeonamesPlugin extends Plugin
return $document->geoname;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Geonames',
'version' => GNUSOCIAL_VERSION,
......
......@@ -105,7 +105,7 @@ ENDOFSCRIPT2;
$action->inlineScript($js);
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'GoogleAnalytics',
'version' => self::VERSION,
......
......@@ -59,7 +59,7 @@ class GravatarPlugin extends Plugin
return $url;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Gravatar',
'version' => GNUSOCIAL_VERSION,
......
......@@ -405,7 +405,7 @@ class GroupPrivateMessagePlugin extends Plugin
return true;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'GroupPrivateMessage',
'version' => GNUSOCIAL_VERSION,
......
......@@ -132,7 +132,7 @@ class ImageMagickPlugin extends Plugin
return getimagesize($outpath); // Verify that we wrote an understandable image.
}
public function onPluginVersion(&$versions)
public function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'ImageMagick',
'version' => GNUSOCIAL_VERSION,
......
......@@ -76,7 +76,7 @@ class ImapPlugin extends Plugin
$classes[] = new ImapManager($this);
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'IMAP',
'version' => GNUSOCIAL_VERSION,
......
......@@ -170,7 +170,7 @@ class InProcessCachePlugin extends Plugin
*
* @return boolean true
*/
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$url = 'http://status.net/wiki/Plugin:InProcessCache';
......
......@@ -51,7 +51,7 @@ class LRDDPlugin extends Plugin
$disco->registerMethod('LRDDMethod_LinkHTML');
}
public function onPluginVersion(&$versions)
public function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'LRDD',
'version' => GNUSOCIAL_VERSION,
......
......@@ -142,7 +142,7 @@ class LdapAuthenticationPlugin extends AuthenticationPlugin
return common_nicknamize($nickname);
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'LDAP Authentication',
'version' => GNUSOCIAL_VERSION,
......
......@@ -118,7 +118,7 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
return false;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'LDAP Authorization',
'version' => GNUSOCIAL_VERSION,
......
......@@ -57,7 +57,7 @@ class LilUrlPlugin extends UrlShortenerPlugin
}
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => sprintf('LilUrl (%s)', $this->shortenerName),
'version' => GNUSOCIAL_VERSION,
......
......@@ -29,7 +29,7 @@ if (!defined('STATUSNET')) {
*/
class LinkPreviewPlugin extends Plugin
{
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'LinkPreview',
'version' => GNUSOCIAL_VERSION,
......
......@@ -232,7 +232,7 @@ class LinkbackPlugin extends Plugin
return LINKBACKPLUGIN_VERSION;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Linkback',
'version' => LINKBACKPLUGIN_VERSION,
......
......@@ -39,7 +39,7 @@ class LogFilterPlugin extends Plugin
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)
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'LogFilter',
'version' => GNUSOCIAL_VERSION,
......
......@@ -169,7 +169,7 @@ class MapstractionPlugin extends Plugin
$action->elementEnd('div');
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Mapstraction',
'version' => self::VERSION,
......
......@@ -236,7 +236,7 @@ class MemcachePlugin extends Plugin
return $out;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Memcache',
'version' => GNUSOCIAL_VERSION,
......
......@@ -207,7 +207,7 @@ class MemcachedPlugin extends Plugin
return $flag;
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Memcached',
'version' => GNUSOCIAL_VERSION,
......
......@@ -160,7 +160,7 @@ class MeteorPlugin extends RealtimePlugin
return implode('-', $path);
}
function onPluginVersion(&$versions)
function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Meteor',
'version' => GNUSOCIAL_VERSION,
......
......@@ -157,7 +157,7 @@ class MinifyPlugin extends Plugin