Plugin onAutoload replaces _ with / in lib paths, this renames some classes.
This commit is contained in:
parent
3e15bab965
commit
ba5e90164c
|
@ -356,7 +356,7 @@ class IrcPlugin extends ImPlugin {
|
||||||
$this->regcheck = true;
|
$this->regcheck = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->fake_irc = new Fake_Irc;
|
$this->fake_irc = new FakeIrc;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Commands allowed to return output to a channel
|
* Commands allowed to return output to a channel
|
||||||
|
|
|
@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
class Fake_Irc extends Phergie_Driver_Streams {
|
class FakeIrc extends Phergie_Driver_Streams {
|
||||||
public $would_be_sent = null;
|
public $would_be_sent = null;
|
||||||
|
|
||||||
/**
|
/**
|
|
@ -390,7 +390,7 @@ class XmppPlugin extends ImPlugin
|
||||||
* Build a queue-proxied XMPP interface object. Any outgoing messages
|
* Build a queue-proxied XMPP interface object. Any outgoing messages
|
||||||
* will be run back through us for enqueing rather than sent directly.
|
* will be run back through us for enqueing rather than sent directly.
|
||||||
*
|
*
|
||||||
* @return Queued_XMPP
|
* @return QueuedXMPP
|
||||||
* @throws Exception if server settings are invalid.
|
* @throws Exception if server settings are invalid.
|
||||||
*/
|
*/
|
||||||
function queuedConnection(){
|
function queuedConnection(){
|
||||||
|
@ -411,7 +411,7 @@ class XmppPlugin extends ImPlugin
|
||||||
throw new Exception(_m('You must specify a password in the configuration.'));
|
throw new Exception(_m('You must specify a password in the configuration.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Queued_XMPP($this, $this->host ?
|
return new QueuedXMPP($this, $this->host ?
|
||||||
$this->host :
|
$this->host :
|
||||||
$this->server,
|
$this->server,
|
||||||
$this->port,
|
$this->port,
|
||||||
|
|
|
@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
class Queued_XMPP extends XMPPHP_XMPP
|
class QueuedXMPP extends XMPPHP_XMPP
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Reference to the XmppPlugin object we're hooked up to.
|
* Reference to the XmppPlugin object we're hooked up to.
|
|
@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
class Sharing_XMPP extends XMPPHP_XMPP
|
class SharingXMPP extends XMPPHP_XMPP
|
||||||
{
|
{
|
||||||
function getSocket()
|
function getSocket()
|
||||||
{
|
{
|
|
@ -131,7 +131,7 @@ class XmppManager extends ImManager
|
||||||
{
|
{
|
||||||
if (!$this->conn || $this->conn->isDisconnected()) {
|
if (!$this->conn || $this->conn->isDisconnected()) {
|
||||||
$resource = 'queue' . posix_getpid();
|
$resource = 'queue' . posix_getpid();
|
||||||
$this->conn = new Sharing_XMPP($this->plugin->host ?
|
$this->conn = new SharingXMPP($this->plugin->host ?
|
||||||
$this->plugin->host :
|
$this->plugin->host :
|
||||||
$this->plugin->server,
|
$this->plugin->server,
|
||||||
$this->plugin->port,
|
$this->plugin->port,
|
||||||
|
|
|
@ -146,10 +146,10 @@ Standalone classes
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
YammerRunner: encapsulates the iterative process of retrieving the various users,
|
YammerRunner: encapsulates the iterative process of retrieving the various users,
|
||||||
groups, and messages via SN_YammerClient and saving them locally
|
groups, and messages via SNYammerClient and saving them locally
|
||||||
via YammerImporter.
|
via YammerImporter.
|
||||||
|
|
||||||
SN_YammerClient: encapsulates HTTP+OAuth interface to Yammer API, returns data
|
SNYammerClient: encapsulates HTTP+OAuth interface to Yammer API, returns data
|
||||||
as straight decoded JSON object trees.
|
as straight decoded JSON object trees.
|
||||||
|
|
||||||
YammerImporter: encapsulates logic to pull information from the returned API data
|
YammerImporter: encapsulates logic to pull information from the returned API data
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
* @package YammerImportPlugin
|
* @package YammerImportPlugin
|
||||||
* @author Brion Vibber <brion@status.net>
|
* @author Brion Vibber <brion@status.net>
|
||||||
*/
|
*/
|
||||||
class SN_YammerClient
|
class SNYammerClient
|
||||||
{
|
{
|
||||||
protected $apiBase = "https://www.yammer.com";
|
protected $apiBase = "https://www.yammer.com";
|
||||||
protected $consumerKey, $consumerSecret;
|
protected $consumerKey, $consumerSecret;
|
|
@ -27,7 +27,7 @@ class YammerImporter
|
||||||
{
|
{
|
||||||
protected $client;
|
protected $client;
|
||||||
|
|
||||||
function __construct(SN_YammerClient $client)
|
function __construct(SNYammerClient $client)
|
||||||
{
|
{
|
||||||
$this->client = $client;
|
$this->client = $client;
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,7 +62,7 @@ class YammerRunner
|
||||||
{
|
{
|
||||||
$this->state = $state;
|
$this->state = $state;
|
||||||
|
|
||||||
$this->client = new SN_YammerClient(
|
$this->client = new SNYammerClient(
|
||||||
common_config('yammer', 'consumer_key'),
|
common_config('yammer', 'consumer_key'),
|
||||||
common_config('yammer', 'consumer_secret'),
|
common_config('yammer', 'consumer_secret'),
|
||||||
$this->state->oauth_token,
|
$this->state->oauth_token,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user