From: Mikael Nordfeldth Date: Wed, 2 Oct 2013 12:07:53 +0000 (+0200) Subject: Plugin onAutoload replaces _ with / in lib paths, this renames some classes. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ba5e90164c6af58d63aa2984de8afd4552c9b706;p=quix0rs-gnu-social.git Plugin onAutoload replaces _ with / in lib paths, this renames some classes. --- diff --git a/plugins/Irc/IrcPlugin.php b/plugins/Irc/IrcPlugin.php index 18d1a0afe1..0610625a13 100644 --- a/plugins/Irc/IrcPlugin.php +++ b/plugins/Irc/IrcPlugin.php @@ -356,7 +356,7 @@ class IrcPlugin extends ImPlugin { $this->regcheck = true; } - $this->fake_irc = new Fake_Irc; + $this->fake_irc = new FakeIrc; /* * Commands allowed to return output to a channel diff --git a/plugins/Irc/lib/fake_irc.php b/plugins/Irc/lib/fake_irc.php deleted file mode 100644 index 81b867643e..0000000000 --- a/plugins/Irc/lib/fake_irc.php +++ /dev/null @@ -1,47 +0,0 @@ -. - * - * @category Network - * @package StatusNet - * @author Luke Fitzgerald - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -class Fake_Irc extends Phergie_Driver_Streams { - public $would_be_sent = null; - - /** - * Store the components for sending a command - * - * @param string $command Command - * @param array $args Arguments - * @return void - */ - protected function send($command, $args = '') { - $this->would_be_sent = array('command' => $command, 'args' => $args); - } -} diff --git a/plugins/Irc/lib/fakeirc.php b/plugins/Irc/lib/fakeirc.php new file mode 100644 index 0000000000..ea5e433d75 --- /dev/null +++ b/plugins/Irc/lib/fakeirc.php @@ -0,0 +1,47 @@ +. + * + * @category Network + * @package StatusNet + * @author Luke Fitzgerald + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +class FakeIrc extends Phergie_Driver_Streams { + public $would_be_sent = null; + + /** + * Store the components for sending a command + * + * @param string $command Command + * @param array $args Arguments + * @return void + */ + protected function send($command, $args = '') { + $this->would_be_sent = array('command' => $command, 'args' => $args); + } +} diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php index 61b2998656..51139a6684 100644 --- a/plugins/Xmpp/XmppPlugin.php +++ b/plugins/Xmpp/XmppPlugin.php @@ -390,7 +390,7 @@ class XmppPlugin extends ImPlugin * Build a queue-proxied XMPP interface object. Any outgoing messages * will be run back through us for enqueing rather than sent directly. * - * @return Queued_XMPP + * @return QueuedXMPP * @throws Exception if server settings are invalid. */ function queuedConnection(){ @@ -411,7 +411,7 @@ class XmppPlugin extends ImPlugin 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->server, $this->port, diff --git a/plugins/Xmpp/lib/queued_xmpp.php b/plugins/Xmpp/lib/queued_xmpp.php deleted file mode 100644 index aeb758421f..0000000000 --- a/plugins/Xmpp/lib/queued_xmpp.php +++ /dev/null @@ -1,125 +0,0 @@ -. - * - * @category Network - * @package StatusNet - * @author Brion Vibber - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -class Queued_XMPP extends XMPPHP_XMPP -{ - /** - * Reference to the XmppPlugin object we're hooked up to. - */ - public $plugin; - - /** - * Constructor - * - * @param XmppPlugin $plugin - * @param string $host - * @param integer $port - * @param string $user - * @param string $password - * @param string $resource - * @param string $server - * @param boolean $printlog - * @param string $loglevel - */ - public function __construct($plugin, $host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null) - { - $this->plugin = $plugin; - - parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel); - - // We use $host to connect, but $server to build JIDs if specified. - // This seems to fix an upstream bug where $host was used to build - // $this->basejid, never seen since it isn't actually used in the base - // classes. - if (!$server) { - $server = $this->host; - } - $this->basejid = $this->user . '@' . $server; - - // Normally the fulljid is filled out by the server at resource binding - // time, but we need to do it since we're not talking to a real server. - $this->fulljid = "{$this->basejid}/{$this->resource}"; - } - - /** - * Send a formatted message to the outgoing queue for later forwarding - * to a real XMPP connection. - * - * @param string $msg - */ - public function send($msg, $timeout=NULL) - { - $this->plugin->enqueueOutgoingRaw($msg); - } - - //@{ - /** - * Stream i/o functions disabled; only do output - */ - public function connect($timeout = 30, $persistent = false, $sendinit = true) - { - // No i18n needed. Test message. - throw new Exception('Cannot connect to server from fake XMPP.'); - } - - public function disconnect() - { - // No i18n needed. Test message. - throw new Exception('Cannot connect to server from fake XMPP.'); - } - - public function process() - { - // No i18n needed. Test message. - throw new Exception('Cannot read stream from fake XMPP.'); - } - - public function processUntil($event, $timeout=-1) - { - // No i18n needed. Test message. - throw new Exception('Cannot read stream from fake XMPP.'); - } - - public function read() - { - // No i18n needed. Test message. - throw new Exception('Cannot read stream from fake XMPP.'); - } - - public function readyToProcess() - { - // No i18n needed. Test message. - throw new Exception('Cannot read stream from fake XMPP.'); - } - //@} -} diff --git a/plugins/Xmpp/lib/queuedxmpp.php b/plugins/Xmpp/lib/queuedxmpp.php new file mode 100644 index 0000000000..5a3c464ef4 --- /dev/null +++ b/plugins/Xmpp/lib/queuedxmpp.php @@ -0,0 +1,125 @@ +. + * + * @category Network + * @package StatusNet + * @author Brion Vibber + * @copyright 2010 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET') && !defined('LACONICA')) { + exit(1); +} + +class QueuedXMPP extends XMPPHP_XMPP +{ + /** + * Reference to the XmppPlugin object we're hooked up to. + */ + public $plugin; + + /** + * Constructor + * + * @param XmppPlugin $plugin + * @param string $host + * @param integer $port + * @param string $user + * @param string $password + * @param string $resource + * @param string $server + * @param boolean $printlog + * @param string $loglevel + */ + public function __construct($plugin, $host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null) + { + $this->plugin = $plugin; + + parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel); + + // We use $host to connect, but $server to build JIDs if specified. + // This seems to fix an upstream bug where $host was used to build + // $this->basejid, never seen since it isn't actually used in the base + // classes. + if (!$server) { + $server = $this->host; + } + $this->basejid = $this->user . '@' . $server; + + // Normally the fulljid is filled out by the server at resource binding + // time, but we need to do it since we're not talking to a real server. + $this->fulljid = "{$this->basejid}/{$this->resource}"; + } + + /** + * Send a formatted message to the outgoing queue for later forwarding + * to a real XMPP connection. + * + * @param string $msg + */ + public function send($msg, $timeout=NULL) + { + $this->plugin->enqueueOutgoingRaw($msg); + } + + //@{ + /** + * Stream i/o functions disabled; only do output + */ + public function connect($timeout = 30, $persistent = false, $sendinit = true) + { + // No i18n needed. Test message. + throw new Exception('Cannot connect to server from fake XMPP.'); + } + + public function disconnect() + { + // No i18n needed. Test message. + throw new Exception('Cannot connect to server from fake XMPP.'); + } + + public function process() + { + // No i18n needed. Test message. + throw new Exception('Cannot read stream from fake XMPP.'); + } + + public function processUntil($event, $timeout=-1) + { + // No i18n needed. Test message. + throw new Exception('Cannot read stream from fake XMPP.'); + } + + public function read() + { + // No i18n needed. Test message. + throw new Exception('Cannot read stream from fake XMPP.'); + } + + public function readyToProcess() + { + // No i18n needed. Test message. + throw new Exception('Cannot read stream from fake XMPP.'); + } + //@} +} diff --git a/plugins/Xmpp/lib/sharing_xmpp.php b/plugins/Xmpp/lib/sharing_xmpp.php deleted file mode 100644 index 4b69125da3..0000000000 --- a/plugins/Xmpp/lib/sharing_xmpp.php +++ /dev/null @@ -1,43 +0,0 @@ -. - * - * @category Jabber - * @package StatusNet - * @author Evan Prodromou - * @copyright 2009 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET')) { - // This check helps protect against security problems; - // your code file can't be executed directly from the web. - exit(1); -} - -class Sharing_XMPP extends XMPPHP_XMPP -{ - function getSocket() - { - return $this->socket; - } -} diff --git a/plugins/Xmpp/lib/sharingxmpp.php b/plugins/Xmpp/lib/sharingxmpp.php new file mode 100644 index 0000000000..99e1978a37 --- /dev/null +++ b/plugins/Xmpp/lib/sharingxmpp.php @@ -0,0 +1,43 @@ +. + * + * @category Jabber + * @package StatusNet + * @author Evan Prodromou + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ + +if (!defined('STATUSNET')) { + // This check helps protect against security problems; + // your code file can't be executed directly from the web. + exit(1); +} + +class SharingXMPP extends XMPPHP_XMPP +{ + function getSocket() + { + return $this->socket; + } +} diff --git a/plugins/Xmpp/lib/xmppmanager.php b/plugins/Xmpp/lib/xmppmanager.php index c7d4c15dd6..372824ce54 100644 --- a/plugins/Xmpp/lib/xmppmanager.php +++ b/plugins/Xmpp/lib/xmppmanager.php @@ -131,7 +131,7 @@ class XmppManager extends ImManager { if (!$this->conn || $this->conn->isDisconnected()) { $resource = 'queue' . posix_getpid(); - $this->conn = new Sharing_XMPP($this->plugin->host ? + $this->conn = new SharingXMPP($this->plugin->host ? $this->plugin->host : $this->plugin->server, $this->plugin->port, diff --git a/plugins/YammerImport/README b/plugins/YammerImport/README index db16744dce..47fc07023a 100644 --- a/plugins/YammerImport/README +++ b/plugins/YammerImport/README @@ -146,10 +146,10 @@ Standalone classes ------------------ 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. -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. YammerImporter: encapsulates logic to pull information from the returned API data diff --git a/plugins/YammerImport/lib/sn_yammerclient.php b/plugins/YammerImport/lib/sn_yammerclient.php deleted file mode 100644 index 2827bdc53a..0000000000 --- a/plugins/YammerImport/lib/sn_yammerclient.php +++ /dev/null @@ -1,252 +0,0 @@ -. - */ - -/** - * Basic client class for Yammer's OAuth/JSON API. - * - * @package YammerImportPlugin - * @author Brion Vibber - */ -class SN_YammerClient -{ - protected $apiBase = "https://www.yammer.com"; - protected $consumerKey, $consumerSecret; - protected $token, $tokenSecret, $verifier; - - public function __construct($consumerKey, $consumerSecret, $token=null, $tokenSecret=null) - { - $this->consumerKey = $consumerKey; - $this->consumerSecret = $consumerSecret; - $this->token = $token; - $this->tokenSecret = $tokenSecret; - } - - /** - * Make an HTTP GET request with OAuth headers and return an HTTPResponse - * with the returned body and codes. - * - * @param string $url - * @return HTTPResponse - * - * @throws Exception on low-level network error - */ - protected function httpGet($url) - { - $headers = array('Authorization: ' . $this->authHeader()); - - $client = HTTPClient::start(); - return $client->get($url, $headers); - } - - /** - * Make an HTTP GET request with OAuth headers and return the response body - * on success. - * - * @param string $url - * @return string - * - * @throws Exception on low-level network or HTTP error - */ - public function fetchUrl($url) - { - $response = $this->httpGet($url); - if ($response->isOk()) { - return $response->getBody(); - } else { - // TRANS: Exeption thrown when an external Yammer system gives an error. - // TRANS: %1$s is an HTTP error code, %2$s is the error message body. - throw new Exception(sprintf(_m('Yammer API returned HTTP code %1$s: %2$s'), - $response->getStatus(), - $response->getBody())); - } - } - - /** - * Make an HTTP hit with OAuth headers and return the response body on success. - * - * @param string $path URL chunk for the API method - * @param array $params - * @return string - * - * @throws Exception on low-level network or HTTP error - */ - protected function fetchApi($path, $params=array()) - { - $url = $this->apiBase . '/' . $path; - if ($params) { - $url .= '?' . http_build_query($params, null, '&'); - } - return $this->fetchUrl($url); - } - - /** - * Hit the main Yammer API point and decode returned JSON data. - * - * @param string $method - * @param array $params - * @return array from JSON data - * - * @throws Exception for HTTP error or bad JSON return - */ - public function api($method, $params=array()) - { - $body = $this->fetchApi("api/v1/$method.json", $params); - $data = json_decode($body, true); - if ($data === null) { - common_log(LOG_ERR, "Invalid JSON response from Yammer API: " . $body); - // TRANS: Exeption thrown when an external Yammer system an invalid JSON response. - throw new Exception(_m('Invalid JSON response from Yammer API.')); - } - return $data; - } - - /** - * Build an Authorization header value from the keys we have available. - */ - protected function authHeader() - { - // token - // token_secret - $params = array('realm' => '', - 'oauth_consumer_key' => $this->consumerKey, - 'oauth_signature_method' => 'PLAINTEXT', - 'oauth_timestamp' => time(), - 'oauth_nonce' => time(), - 'oauth_version' => '1.0'); - if ($this->token) { - $params['oauth_token'] = $this->token; - } - if ($this->tokenSecret) { - $params['oauth_signature'] = $this->consumerSecret . '&' . $this->tokenSecret; - } else { - $params['oauth_signature'] = $this->consumerSecret . '&'; - } - if ($this->verifier) { - $params['oauth_verifier'] = $this->verifier; - } - $parts = array_map(array($this, 'authHeaderChunk'), array_keys($params), array_values($params)); - return 'OAuth ' . implode(', ', $parts); - } - - /** - * Encode a key-value pair for use in an authentication header. - * - * @param string $key - * @param string $val - * @return string - */ - protected function authHeaderChunk($key, $val) - { - return urlencode($key) . '="' . urlencode($val) . '"'; - } - - /** - * Ask the Yammer server for a request token, which can be passed on - * to authorizeUrl() for the user to start the authentication process. - * - * @return array of oauth return data; should contain nice things - */ - public function requestToken() - { - if ($this->token || $this->tokenSecret) { - // TRANS: Exeption thrown when a trust relationship has already been established. - throw new Exception(_m('Requesting a token, but already set up with a token.')); - } - $data = $this->fetchApi('oauth/request_token'); - $arr = array(); - parse_str($data, $arr); - return $arr; - } - - /** - * Get a final access token from the verifier/PIN code provided to - * the user from Yammer's auth pages. - * - * @return array of oauth return data; should contain nice things - */ - public function accessToken($verifier) - { - $this->verifier = $verifier; - $data = $this->fetchApi('oauth/access_token'); - $this->verifier = null; - $arr = array(); - parse_str($data, $arr); - return $arr; - } - - /** - * Give the URL to send users to to authorize a new app setup. - * - * @param string $token as returned from accessToken() - * @return string URL - */ - public function authorizeUrl($token) - { - return $this->apiBase . '/oauth/authorize?oauth_token=' . urlencode($token); - } - - /** - * High-level API hit: fetch all messages in the network (up to 20 at a time). - * Return data is the full JSON array returned, including meta and references - * sections. - * - * The matching messages themselves will be in the 'messages' item within. - * - * @param array $options optional set of additional params for the request. - * @return array - * - * @throws Exception on low-level or HTTP error - */ - public function messages($params=array()) - { - return $this->api('messages', $params); - } - - /** - * High-level API hit: fetch all users in the network (up to 50 at a time). - * Return data is the full JSON array returned, listing user items. - * - * The matching messages themselves will be in the 'users' item within. - * - * @param array $options optional set of additional params for the request. - * @return array of JSON-sourced user data arrays - * - * @throws Exception on low-level or HTTP error - */ - public function users($params=array()) - { - return $this->api('users', $params); - } - - /** - * High-level API hit: fetch all groups in the network (up to 20 at a time). - * Return data is the full JSON array returned, listing user items. - * - * The matching messages themselves will be in the 'users' item within. - * - * @param array $options optional set of additional params for the request. - * @return array of JSON-sourced user data arrays - * - * @throws Exception on low-level or HTTP error - */ - public function groups($params=array()) - { - return $this->api('groups', $params); - } -} diff --git a/plugins/YammerImport/lib/snyammerclient.php b/plugins/YammerImport/lib/snyammerclient.php new file mode 100644 index 0000000000..a322157ec5 --- /dev/null +++ b/plugins/YammerImport/lib/snyammerclient.php @@ -0,0 +1,252 @@ +. + */ + +/** + * Basic client class for Yammer's OAuth/JSON API. + * + * @package YammerImportPlugin + * @author Brion Vibber + */ +class SNYammerClient +{ + protected $apiBase = "https://www.yammer.com"; + protected $consumerKey, $consumerSecret; + protected $token, $tokenSecret, $verifier; + + public function __construct($consumerKey, $consumerSecret, $token=null, $tokenSecret=null) + { + $this->consumerKey = $consumerKey; + $this->consumerSecret = $consumerSecret; + $this->token = $token; + $this->tokenSecret = $tokenSecret; + } + + /** + * Make an HTTP GET request with OAuth headers and return an HTTPResponse + * with the returned body and codes. + * + * @param string $url + * @return HTTPResponse + * + * @throws Exception on low-level network error + */ + protected function httpGet($url) + { + $headers = array('Authorization: ' . $this->authHeader()); + + $client = HTTPClient::start(); + return $client->get($url, $headers); + } + + /** + * Make an HTTP GET request with OAuth headers and return the response body + * on success. + * + * @param string $url + * @return string + * + * @throws Exception on low-level network or HTTP error + */ + public function fetchUrl($url) + { + $response = $this->httpGet($url); + if ($response->isOk()) { + return $response->getBody(); + } else { + // TRANS: Exeption thrown when an external Yammer system gives an error. + // TRANS: %1$s is an HTTP error code, %2$s is the error message body. + throw new Exception(sprintf(_m('Yammer API returned HTTP code %1$s: %2$s'), + $response->getStatus(), + $response->getBody())); + } + } + + /** + * Make an HTTP hit with OAuth headers and return the response body on success. + * + * @param string $path URL chunk for the API method + * @param array $params + * @return string + * + * @throws Exception on low-level network or HTTP error + */ + protected function fetchApi($path, $params=array()) + { + $url = $this->apiBase . '/' . $path; + if ($params) { + $url .= '?' . http_build_query($params, null, '&'); + } + return $this->fetchUrl($url); + } + + /** + * Hit the main Yammer API point and decode returned JSON data. + * + * @param string $method + * @param array $params + * @return array from JSON data + * + * @throws Exception for HTTP error or bad JSON return + */ + public function api($method, $params=array()) + { + $body = $this->fetchApi("api/v1/$method.json", $params); + $data = json_decode($body, true); + if ($data === null) { + common_log(LOG_ERR, "Invalid JSON response from Yammer API: " . $body); + // TRANS: Exeption thrown when an external Yammer system an invalid JSON response. + throw new Exception(_m('Invalid JSON response from Yammer API.')); + } + return $data; + } + + /** + * Build an Authorization header value from the keys we have available. + */ + protected function authHeader() + { + // token + // token_secret + $params = array('realm' => '', + 'oauth_consumer_key' => $this->consumerKey, + 'oauth_signature_method' => 'PLAINTEXT', + 'oauth_timestamp' => time(), + 'oauth_nonce' => time(), + 'oauth_version' => '1.0'); + if ($this->token) { + $params['oauth_token'] = $this->token; + } + if ($this->tokenSecret) { + $params['oauth_signature'] = $this->consumerSecret . '&' . $this->tokenSecret; + } else { + $params['oauth_signature'] = $this->consumerSecret . '&'; + } + if ($this->verifier) { + $params['oauth_verifier'] = $this->verifier; + } + $parts = array_map(array($this, 'authHeaderChunk'), array_keys($params), array_values($params)); + return 'OAuth ' . implode(', ', $parts); + } + + /** + * Encode a key-value pair for use in an authentication header. + * + * @param string $key + * @param string $val + * @return string + */ + protected function authHeaderChunk($key, $val) + { + return urlencode($key) . '="' . urlencode($val) . '"'; + } + + /** + * Ask the Yammer server for a request token, which can be passed on + * to authorizeUrl() for the user to start the authentication process. + * + * @return array of oauth return data; should contain nice things + */ + public function requestToken() + { + if ($this->token || $this->tokenSecret) { + // TRANS: Exeption thrown when a trust relationship has already been established. + throw new Exception(_m('Requesting a token, but already set up with a token.')); + } + $data = $this->fetchApi('oauth/request_token'); + $arr = array(); + parse_str($data, $arr); + return $arr; + } + + /** + * Get a final access token from the verifier/PIN code provided to + * the user from Yammer's auth pages. + * + * @return array of oauth return data; should contain nice things + */ + public function accessToken($verifier) + { + $this->verifier = $verifier; + $data = $this->fetchApi('oauth/access_token'); + $this->verifier = null; + $arr = array(); + parse_str($data, $arr); + return $arr; + } + + /** + * Give the URL to send users to to authorize a new app setup. + * + * @param string $token as returned from accessToken() + * @return string URL + */ + public function authorizeUrl($token) + { + return $this->apiBase . '/oauth/authorize?oauth_token=' . urlencode($token); + } + + /** + * High-level API hit: fetch all messages in the network (up to 20 at a time). + * Return data is the full JSON array returned, including meta and references + * sections. + * + * The matching messages themselves will be in the 'messages' item within. + * + * @param array $options optional set of additional params for the request. + * @return array + * + * @throws Exception on low-level or HTTP error + */ + public function messages($params=array()) + { + return $this->api('messages', $params); + } + + /** + * High-level API hit: fetch all users in the network (up to 50 at a time). + * Return data is the full JSON array returned, listing user items. + * + * The matching messages themselves will be in the 'users' item within. + * + * @param array $options optional set of additional params for the request. + * @return array of JSON-sourced user data arrays + * + * @throws Exception on low-level or HTTP error + */ + public function users($params=array()) + { + return $this->api('users', $params); + } + + /** + * High-level API hit: fetch all groups in the network (up to 20 at a time). + * Return data is the full JSON array returned, listing user items. + * + * The matching messages themselves will be in the 'users' item within. + * + * @param array $options optional set of additional params for the request. + * @return array of JSON-sourced user data arrays + * + * @throws Exception on low-level or HTTP error + */ + public function groups($params=array()) + { + return $this->api('groups', $params); + } +} diff --git a/plugins/YammerImport/lib/yammerimporter.php b/plugins/YammerImport/lib/yammerimporter.php index f589753796..1542b5909d 100644 --- a/plugins/YammerImport/lib/yammerimporter.php +++ b/plugins/YammerImport/lib/yammerimporter.php @@ -27,7 +27,7 @@ class YammerImporter { protected $client; - function __construct(SN_YammerClient $client) + function __construct(SNYammerClient $client) { $this->client = $client; } diff --git a/plugins/YammerImport/lib/yammerrunner.php b/plugins/YammerImport/lib/yammerrunner.php index 5907ce0c32..0da2fc9db4 100644 --- a/plugins/YammerImport/lib/yammerrunner.php +++ b/plugins/YammerImport/lib/yammerrunner.php @@ -62,7 +62,7 @@ class YammerRunner { $this->state = $state; - $this->client = new SN_YammerClient( + $this->client = new SNYammerClient( common_config('yammer', 'consumer_key'), common_config('yammer', 'consumer_secret'), $this->state->oauth_token,