GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Squashed commit of the following: 

Move OMB to a plugin

commit 75d21f00246bcc56d7f854936be1e28395e079a2
Merge: cea0199 d594d07
Author: Zach Copley <zach@status.net>
Date:   Fri Jul 15 11:16:54 2011 -0700

    Merge branch 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone into kill-omb2

    * 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
      Fix paths
      Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
      Some odds and ends
      Remove omb stuff from queuemanager defaults
      Add check to make sure we're not untagging an OMB profile to OMB plugin
      Move some more subscription stuff and peopletag checks to OMB plugin
      Move some OMB-specific unsubscribe stuff to OMB plugin
      Finish removing libomb from core extlibs
      Fix more conflicts
      Fix queuing/queuehandling
      Move some stuff around; fix references
      Fix conflicts
      Move OMB-specific files to OMB plugin
      Move some stuff around; fix references
      Add OMB plugin README and rm references to OMB in mail StatusNet README
      Update paths
      Fix define
      Basic plugin finished
      Move OMB-specific files to OMB plugin
      Remove OMB stuff from router

commit cea019967f343042ebaea14b7bbb0d54289bcc1a
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 14:38:40 2011 -0700

    Fix paths

commit d412aa3c0ea0e21e65a72a16c7b9edd64ff373e1
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 12 18:17:06 2011 -0700

    Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore

commit b459c9f10ac283d6e774ef13f3293fc8a6948143
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:02:08 2011 -0700

    Some odds and ends

commit 895cfbfce58ffb3a05beebf48a90c549e00f1cce
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:01:23 2011 -0700

    Remove omb stuff from queuemanager defaults

commit b41b9e994f291ff83afb2460d9b37aee8ec1ec2b
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:46:44 2011 -0700

    Add check to make sure we're not untagging an OMB profile to OMB plugin

commit 94374d26ddd428dac8e4cd4541fd56db748c248b
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:34:20 2011 -0700

    Move some more subscription stuff and peopletag checks to OMB plugin

commit b91043b7820d5cd8b0ba4e9ee2a9d03c99248f11
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 16:37:25 2011 -0700

    Move some OMB-specific unsubscribe stuff to OMB plugin

commit d9430fe52975d9497b4a0d3d54da35b222e207ad
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 15:26:30 2011 -0700

    Finish removing libomb from core extlibs

commit bb6257eb85cc7ba392e91468c01503f51faeb989
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:47:32 2011 -0700

    Fix more conflicts

commit 3c760d0a4b4a083ae5fca2530d22aad5f4a9fdae
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:49:22 2011 -0700

    Fix queuing/queuehandling

commit ed635fa0c20e150673709c04ecc7f285d12e0ce2
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit cbc553a147941cad16e205a6b66ab4b32a5e3d3d
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:46:05 2011 -0700

    Fix conflicts

commit 5d77c81f75b57f5d5357d6b46d503650a4b3225d
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit 2ed051dbce0ce9b44723b14922026849c39ed603
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit 8809b5e35b1aacb67d70ae3e55a43003b6f591b7
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:28:59 2011 -0700

    Add OMB plugin README and rm references to OMB in mail StatusNet README

commit 35ced4067c1915baca0b3e184f9533a91a951d2d
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:50:09 2011 -0700

    Update paths

commit 0ee5bafbce95fc9b8db98c1e828d33d26d08bc73
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:38:03 2011 -0700

    Fix define

commit e309dd22ffb9087d7fcf9180ede4f531dbd88c3c
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:30:43 2011 -0700

    Basic plugin finished

commit 00f1e930f27e080b04d1e82952f7886c84e01d97
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit 39dcd031a79b49da0b4fe25f1594d2e406b5eb65
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:01 2011 -0700

    Remove OMB stuff from router

commit d594d071be1ec42518dd5465db61e01e7e8ec036
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 14:38:40 2011 -0700

    Fix paths

commit 48c1064b4b50e89cf51d2cab388f708f60601247
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 12 18:17:06 2011 -0700

    Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore

commit 1e1168978f38c31dbf0206b3493b2b6dcbe61589
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:02:08 2011 -0700

    Some odds and ends

commit ac43af2b497d8b9286c49a9469a1dff950e41650
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:01:23 2011 -0700

    Remove omb stuff from queuemanager defaults

commit 2471af2f8800515a3db544b3a186a18f3e8a43af
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:46:44 2011 -0700

    Add check to make sure we're not untagging an OMB profile to OMB plugin

commit df974646459ac6d5d97a40d008f1aab66f998226
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:34:20 2011 -0700

    Move some more subscription stuff and peopletag checks to OMB plugin

commit 8a1427b759e791c14a7a7a22128ba05f0b4b6d12
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 16:37:25 2011 -0700

    Move some OMB-specific unsubscribe stuff to OMB plugin

commit bd24220dbb5170af22ea0dea8a3062e6d1aeb6a2
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 15:26:30 2011 -0700

    Finish removing libomb from core extlibs

commit 4c3c6f1fabb0f2c92635ccc5e8f38db2293f5456
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:47:32 2011 -0700

    Fix more conflicts

commit db44deefd731a412685c5669c4c6fa69833de922
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:49:22 2011 -0700

    Fix queuing/queuehandling

commit ea2d84d2f3d518950d3aa1956ddc8f3a25ca55f3
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit 8ac3e010444b41bd9a78766f5e37e49dff023b45
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:46:05 2011 -0700

    Fix conflicts

commit 0aad6e10e3637b3189a87b42c24c1d6de1b346bc
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit d982d7076c5cb28c7b8e4b1dde8d07d7e58e278f
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit 4b9d39c93562ff4c45c37c940013e8b78197dec1
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:28:59 2011 -0700

    Add OMB plugin README and rm references to OMB in mail StatusNet README

commit dab0fb6647a85e6835298496d7127a398b6b9293
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:50:09 2011 -0700

    Update paths

commit 2cb73dac8ad971f1545dcf6ba57746c777e232ef
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:38:03 2011 -0700

    Fix define

commit 6f226b18a059f175b1bdd3abcb8cb95eedc22ee7
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:30:43 2011 -0700

    Basic plugin finished

commit 7be304beaa0f39755c3978e0b852fde768950da4
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit 5b30da01cfa2802d6e7a4a4a4f39b8043c54f472
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:01 2011 -0700

    Remove OMB stuff from router
This commit is contained in:
Zach Copley 2011-07-15 12:13:57 -07:00
parent 8ba6c8ea87
commit 6f0bd73e6c
49 changed files with 606 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README
View File

@ -226,7 +226,6 @@ and the URLs are listed here for your convenience.
- Facebook library. Used for the Facebook application.
- PEAR Validate is used for URL and email validation.
- Console_GetOpt for parsing command-line options.
- libomb. a library for implementing OpenMicroBlogging 0.1, the
predecessor to OStatus.
- HTTP_Request2, a library for making HTTP requests.
- PEAR Net_URL2 is an HTTP_Request2 dependency.
@ -484,7 +483,7 @@ On a default installation, your site can broadcast messages using
XMPP. Users won't be able to post messages using XMPP unless you've
got the XMPP daemon running. See 'Queues and daemons' below for how
to set that up. Also, once you have a sizable number of users, sending
a lot of SMS, OMB, and XMPP messages whenever someone posts a message
a lot of SMS, OStatus, and XMPP messages whenever someone posts a message
can really slow down your site; it may cause posting to timeout.
NOTE: stream_select(), a crucial function for network programming, is
@ -1111,7 +1110,7 @@ public
For configuring the public stream.
localonly: If set to true, only messages posted by users of this
service (rather than other services, filtered through OMB)
service (rather than other services, filtered through OStatus)
are shown in the public stream. Default true.
blacklist: An array of IDs of users to hide from the public stream.
Useful if you have someone making excessive Twitterfeed posts

12
actions/addpeopletag.php
View File

@ -111,18 +111,6 @@ class AddpeopletagAction extends Action
return false;
}
// OMB 0.1 doesn't have a mechanism for local-server-
// originated tag.
$omb01 = Remote_profile::staticGet('id', $tagged_id);
if (!empty($omb01)) {
// TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
$this->clientError(_('You cannot list an OMB 0.1 '.
'remote profile with this action.'));
return false;
}
return true;
}

4
actions/apioauthauthorize.php
View File

@ -22,7 +22,7 @@
* @category API
* @package StatusNet
* @author Zach Copley <zach@status.net>
* @copyright 2010 StatusNet, Inc.
* @copyright 2010-2011 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/
*/
@ -35,7 +35,7 @@ require_once INSTALLDIR . '/lib/apioauth.php';
require_once INSTALLDIR . '/lib/info.php';
/**
* Authorize an Oputh request token
* Authorize an OAuth request token
*
* @category API
* @package StatusNet

2
actions/oauthconnectionssettings.php
View File

@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
}
require_once INSTALLDIR . '/lib/applicationlist.php';
require_once INSTALLDIR . '/lib/apioauthstore.php';
require_once INSTALLDIR . '/lib/statusnetoauthstore.php';
/**
* Show connected OAuth applications

12
actions/removepeopletag.php
View File

@ -112,18 +112,6 @@ class RemovepeopletagAction extends Action
return false;
}
// OMB 0.1 doesn't have a mechanism for local-server-
// originated tag.
$omb01 = Remote_profile::staticGet('id', $tagged_id);
if (!empty($omb01)) {
// TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
$this->clientError(_('You cannot (un)list an OMB 0.1 '.
'remote profile with this action.'));
return false;
}
return true;
}

2
actions/shownotice.php
View File

@ -214,7 +214,7 @@ class ShownoticeAction extends Action
if ($this->boolean('ajax')) {
$this->showAjax();
} else {
if ($this->notice->is_local == Notice::REMOTE_OMB) {
if ($this->notice->is_local == Notice::REMOTE) {
if (!empty($this->notice->url)) {
$target = $this->notice->url;
} else if (!empty($this->notice->uri) && preg_match('/^https?:/', $this->notice->uri)) {

14
actions/subscribe.php
View File

@ -1,7 +1,7 @@
<?php
/**
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008-2010, StatusNet, Inc.
* Copyright (C) 2008-2011, StatusNet, Inc.
*
* Subscription action.
*
@ -111,18 +111,6 @@ class SubscribeAction extends Action
return false;
}
// OMB 0.1 doesn't have a mechanism for local-server-
// originated subscription.
$omb01 = Remote_profile::staticGet('id', $other_id);
if (!empty($omb01)) {
// TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
$this->clientError(_('You cannot subscribe to an OMB 0.1'.
' remote profile with this action.'));
return false;
}
return true;
}

8
classes/Notice.php
View File

@ -1,7 +1,7 @@
<?php
/**
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011 StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -86,7 +86,7 @@ class Notice extends Memcached_DataObject
/* Notice types */
const LOCAL_PUBLIC = 1;
const REMOTE_OMB = 0;
const REMOTE = 0;
const LOCAL_NONPUBLIC = -1;
const GATEWAY = -2;
@ -229,11 +229,11 @@ class Notice extends Memcached_DataObject
* string 'created' timestamp of notice; defaults to now
* int 'is_local' source/gateway ID, one of:
* Notice::LOCAL_PUBLIC - Local, ok to appear in public timeline
* Notice::REMOTE_OMB - Sent from a remote OMB service;
* Notice::REMOTE - Sent from a remote service;
* hide from public timeline but show in
* local "and friends" timelines
* Notice::LOCAL_NONPUBLIC - Local, but hide from public timeline
* Notice::GATEWAY - From another non-OMB service;
* Notice::GATEWAY - From another non-OStatus service;
* will not appear in public views
* float 'lat' decimal latitude for geolocation
* float 'lon' decimal longitude for geolocation

14
classes/Profile.php
View File

@ -1,7 +1,7 @@
<?php
/*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -1240,13 +1240,8 @@ class Profile extends Memcached_DataObject
if (!empty($user)) {
$uri = $user->uri;
} else {
// return OMB profile if any
$remote = Remote_profile::staticGet('id', $this->id);
if (!empty($remote)) {
$uri = $remote->uri;
}
}
Event::handle('EndGetProfileUri', array($this, &$uri));
}
@ -1291,11 +1286,6 @@ class Profile extends Memcached_DataObject
$user = User::staticGet('uri', $uri);
if (!empty($user)) {
$profile = $user->getProfile();
} else {
$remote_profile = Remote_profile::staticGet('uri', $uri);
if (!empty($remote_profile)) {
$profile = Profile::staticGet('id', $remote_profile->profile_id);
}
}
Event::handle('EndGetProfileFromURI', array($uri, $profile));
}

23
classes/Subscription.php
View File

@ -198,29 +198,6 @@ class Subscription extends Memcached_DataObject
assert(!empty($sub));
// @todo: move this block to EndSubscribe handler for
// OMB plugin when it exists.
if (!empty($sub->token)) {
$token = new Token();
$token->tok = $sub->token;
if ($token->find(true)) {
$result = $token->delete();
if (!$result) {
common_log_db_error($token, 'DELETE', __FILE__);
// TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
throw new Exception(_('Could not delete subscription OMB token.'));
}
} else {
common_log(LOG_ERR, "Couldn't find credentials with token {$token->tok}");
}
}
$result = $sub->delete();
if (!$result) {

2
lib/apioauth.php
View File

@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
exit(1);
}
require_once INSTALLDIR . '/lib/apiaction.php';
require_once INSTALLDIR . '/lib/apioauthstore.php';
require_once INSTALLDIR . '/lib/statusnetoauthstore.php';
/**
* Base action for API OAuth enpoints. Clean up the

4
lib/microappplugin.php
View File

@ -360,7 +360,7 @@ abstract class MicroAppPlugin extends Plugin
$options = array('uri' => $object->id,
'url' => $object->link,
'is_local' => Notice::REMOTE_OMB,
'is_local' => Notice::REMOTE,
'source' => 'ostatus');
// $actor is an ostatus_profile
@ -418,7 +418,7 @@ abstract class MicroAppPlugin extends Plugin
$options = array('uri' => $object->id,
'url' => $object->link,
'is_local' => Notice::REMOTE_OMB,
'is_local' => Notice::REMOTE,
'source' => 'ostatus');
// $actor is an ostatus_profile

5
lib/profilelist.php
View File

@ -289,11 +289,10 @@ class ProfileListItem extends Widget
$usf = new UnsubscribeForm($this->out, $this->profile);
$usf->show();
} else {
// We can't initiate sub for a remote OMB profile.
$remote = Remote_profile::staticGet('id', $this->profile->id);
if (empty($remote)) {
if (Event::handle('StartShowProfileListSubscribeButton', array($this))) {
$sf = new SubscribeForm($this->out, $this->profile);
$sf->show();
Event::handle('EndShowProfileListSubscribeButton', array($this));
}
}
$this->out->elementEnd('li');

4
lib/queuemanager.php
View File

@ -233,7 +233,6 @@ abstract class QueueManager extends IoManager
if (Event::handle('StartInitializeQueueManager', array($this))) {
$this->connect('distrib', 'DistribQueueHandler');
$this->connect('omb', 'OmbQueueHandler');
$this->connect('ping', 'PingQueueHandler');
if (common_config('sms', 'enabled')) {
$this->connect('sms', 'SmsQueueHandler');
@ -246,9 +245,6 @@ abstract class QueueManager extends IoManager
$this->connect('acctmove', 'AccountMover');
$this->connect('actmove', 'ActivityMover');
// Broadcasting profile updates to OMB remote subscribers
$this->connect('profile', 'ProfileQueueHandler');
// For compat with old plugins not registering their own handlers.
$this->connect('plugin', 'PluginQueueHandler');
}

19
lib/router.php
View File

@ -113,8 +113,6 @@ class Router
{
var $m = null;
static $inst = null;
static $bare = array('requesttoken', 'accesstoken', 'userauthorization',
'postnotice', 'updateprofile', 'finishremotesubscribe');
const REGEX_TAG = '[^\/]+'; // [\pL\pN_\-\.]{1,64} better if we can do unicode regexes
@ -257,15 +255,6 @@ class Router
$m->connect('main/'.$c.'/:code', array('action' => $c));
}
// exceptional
$m->connect('main/remote', array('action' => 'remotesubscribe'));
$m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '[A-Za-z0-9_-]+'));
foreach (Router::$bare as $action) {
$m->connect('index.php?action=' . $action, array('action' => $action));
}
// settings
foreach (array('profile', 'avatar', 'password', 'im', 'oauthconnections',
@ -896,8 +885,8 @@ class Router
$nickname = User::singleUserNickname();
foreach (array('subscriptions', 'subscribers',
'all', 'foaf', 'xrds',
'replies', 'microsummary', 'hcard') as $a) {
'all', 'foaf', 'replies',
'microsummary', 'hcard') as $a) {
$m->connect($a,
array('action' => $a,
'nickname' => $nickname));
@ -964,8 +953,8 @@ class Router
$m->connect('rsd.xml', array('action' => 'rsd'));
foreach (array('subscriptions', 'subscribers',
'nudge', 'all', 'foaf', 'xrds',
'replies', 'inbox', 'outbox', 'microsummary', 'hcard') as $a) {
'nudge', 'all', 'foaf', 'replies',
'inbox', 'outbox', 'microsummary', 'hcard') as $a) {
$m->connect(':nickname/'.$a,
array('action' => $a),
array('nickname' => Nickname::DISPLAY_FMT));

101
lib/apioauthstore.php → lib/statusnetoauthstore.php
View File

@ -1,7 +1,7 @@
<?php
/*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -19,10 +19,12 @@
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
require_once INSTALLDIR . '/lib/oauthstore.php';
require_once 'OAuth.php';
// @todo FIXME: Class documentation missing.
class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
/**
* @fixme class doc
*/
class ApiStatusNetOAuthDataStore extends OAuthDataStore
{
function lookup_consumer($consumerKey)
{
@ -410,4 +412,95 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
return new OAuthToken($t->tok, $t->secret);
}
}
/**
* Authorize specified OAuth token
*
* Authorizes the authorization token specified by $token_key.
* Throws exceptions in case of error.
*
* @param string $token_key The token to be authorized
*
* @access public
**/
public function authorize_token($token_key) {
$rt = new Token();
$rt->tok = $token_key;
$rt->type = 0;
$rt->state = 0;
if (!$rt->find(true)) {
throw new Exception('Tried to authorize unknown token');
}
$orig_rt = clone($rt);
$rt->state = 1; # Authorized but not used
if (!$rt->update($orig_rt)) {
throw new Exception('Failed to authorize token');
}
}
/**
*
* http://oauth.net/core/1.0/#nonce
* "The Consumer SHALL then generate a Nonce value that is unique for
* all requests with that timestamp."
* XXX: It's not clear why the token is here
*
* @param type $consumer
* @param type $token
* @param type $nonce
* @param type $timestamp
* @return type
*/
function lookup_nonce($consumer, $token, $nonce, $timestamp)
{
$n = new Nonce();
$n->consumer_key = $consumer->key;
$n->ts = common_sql_date($timestamp);
$n->nonce = $nonce;
if ($n->find(true)) {
return true;
} else {
$n->created = DB_DataObject_Cast::dateTime();
$n->insert();
return false;
}
}
/**
*
* @param type $consumer
* @param type $token_type
* @param type $token_key
* @return OAuthToken
*/
function lookup_token($consumer, $token_type, $token_key)
{
$t = new Token();
if (!is_null($consumer)) {
$t->consumer_key = $consumer->key;
}
$t->tok = $token_key;
$t->type = ($token_type == 'access') ? 1 : 0;
if ($t->find(true)) {
return new OAuthToken($t->tok, $t->secret);
} else {
return null;
}
}
/**
*
* @param type $token_key
* @return Token
*/
function getTokenByKey($token_key)
{
$t = new Token();
$t->tok = $token_key;
if ($t->find(true)) {
return $t;
} else {
return null;
}
}
}

26
lib/util.php
View File

@ -1,7 +1,7 @@
<?php
/*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -1501,7 +1501,7 @@ function common_enqueue_notice($notice)
}
/**
* Broadcast profile updates to OMB and other remote subscribers.
* Broadcast profile updates to remote subscribers.
*
* Since this may be slow with a lot of subscribers or bad remote sites,
* this is run through the background queues if possible.
@ -2008,20 +2008,20 @@ function common_user_property($property)
function common_profile_uri($profile)
{
if (!$profile) {
return null;
}
$user = User::staticGet($profile->id);
if ($user) {
return $user->uri;
$uri = null;
if (!empty($profile)) {
if (Event::handle('StartCommonProfileURI', array($profile, &$uri))) {
$user = User::staticGet($profile->id);
if (!empty($user)) {
$uri = $user->uri;
}
Event::handle('EndCommonProfileURI', array($profile, &$uri));
}
}
$remote = Remote_profile::staticGet($profile->id);
if ($remote) {
return $remote->uri;
}
// XXX: this is a very bad profile!
return null;
return $uri;
}
function common_canonical_sms($sms)

2
plugins/Bookmark/BookmarkPlugin.php
View File

@ -322,7 +322,7 @@ class BookmarkPlugin extends MicroAppPlugin
$options = array('uri' => $bookmark->id,
'url' => $bookmark->link,
'is_local' => Notice::REMOTE_OMB,
'is_local' => Notice::REMOTE,
'source' => 'ostatus');
return self::_postBookmark($author->localProfile(), $activity, $options);

393
plugins/OMB/OMBPlugin.php Normal file
View File

@ -0,0 +1,393 @@
<?php
/**
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2011, StatusNet, Inc.
*
* OpenMicroBlogging plugin - add OpenMicroBloggin 0.1 support to
* StatusNet.
*
* Note: the OpenMicroBlogging protocol has been deprecated in favor of OStatus.
* This plugin is provided for backwards compatibility and experimentation.
*
* Please see the README and the OStatus plugin.
*
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category Sample
* @package StatusNet
* @author Zach Copley
* @copyright 2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/');
if (!defined('STATUSNET')) {
// This check helps protect against security problems;
// your code file can't be executed directly from the web.
exit(1);
}
/**
* OMB plugin main class
*
* @category Integration
* @package StatusNet
* @author Zach Copley <zach@status.net>
* @copyright 2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class OMBPlugin extends Plugin
{
/**
* Load related modules when needed
*
* @param string $cls Name of the class to be loaded
*
* @return boolean hook value; true means continue processing, false means stop.
*/
function onAutoload($cls)
{
$dir = dirname(__FILE__);
switch ($cls)
{
case 'Requesttokenaction':
case 'Accesstokenaction':
case 'Userauthorizationaction':
case 'Postnoticeaction':
case 'Updateprofileaction':
case 'Finishremotesubscribeaction':
case 'Remotesubscribeaction':
case 'XrdsAction':
include_once $dir . '/action/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
return false;
break;
case 'OmbQueueHandler':
case 'ProfileQueueHandler':
include_once $dir . '/lib/' . strtolower($cls) . '.php';
return false;
case 'OMBOAuthDataStore':
include_once $dir . '/lib/omboauthstore.php';
default:
return true;
}
}
/**
* Map URLs to actions
*
* @param Net_URL_Mapper $m path-to-action mapper
*
* @return boolean hook value; true means continue processing, false means stop.
*/
function onRouterInitialized($m)
{
$bare = array(
'requesttoken',
'accesstoken',
'userauthorization',
'postnotice',
'updateprofile',
'finishremotesubscribe'
);
foreach ($bare as $action) {
$m->connect(
'index.php?action=' . $action, array('action' => $action)
);
}
// exceptional
$m->connect('main/remote', array('action' => 'remotesubscribe'));
$m->connect(
'main/remote?nickname=:nickname',
array('action' => 'remotesubscribe'),
array('nickname' => '[A-Za-z0-9_-]+')
);
$m->connect(
'xrds',
array('action' => 'xrds', 'nickname' => $nickname)
);
return true;
}
/**
* Put saved notices into the queue for OMB distribution
*
* @param Notice $notice the notice to broadcast
* @param array $transports queuehandler's list of transports
* @return boolean true if queing was successful
*/
function onStartEnqueueNotice($notice, &$transports)
{
if ($notice->isLocal()) {
if ($notice->inScope(null)) {
array_unshift($transports, 'omb');
common_log(
LOG_INFO, "Notice {$notice->id} queued for OMB processing"
);
} else {
// Note: We don't do privacy-controlled OMB updates.
common_log(
LOG_NOTICE,
"Not queueing notice {$notice->id} for OMB because of "
. "privacy; scope = {$notice->scope}",
__FILE__
);
}
} else {
common_log(
LOG_NOTICE,
"Not queueing notice {$notice->id} for OMB because it's not "
. "local.",
__FILE__
);
}
return true;
}
/**
* Set up queue handlers for outgoing OMB pushes
*
* @param QueueManager $qm
* @return boolean hook return
*/
function onEndInitializeQueueManager(QueueManager $qm)
{
// Prepare outgoing distributions after notice save.
$qm->connect('omb', 'OmbQueueHandler');
$qm->connect('profile', 'ProfileQueueHandler');
return true;
}
/**
* Return OMB remote profile, if any
*
* @param Profile $profile
* @param string $uri
* @return boolen false if there's a remote profile
*/
function onStartGetProfileUri($profile, &$uri)
{
$remote = Remote_profile::staticGet('id', $this->id);
if (!empty($remote)) {
$uri = $remote->uri;
return false;
}
return true;
}
/**
* We can't initiate subscriptions for a remote OMB profile; don't show
* subscribe button
*
* @param type $action
*/
function onStartShowProfileListSubscribeButton($action)
{
$remote = Remote_profile::staticGet('id', $action->profile->id);
if (empty($remote)) {
false;
}
return true;
}
/**
* Check for illegal subscription attempts
*
* @param User $user subscriber
* @param Profile $other subscribee
* @return hook return value
*/
function onStartSubscribe($profile, $other)
{
// OMB 0.1 doesn't have a mechanism for local-server-
// originated subscription.
$omb01 = Remote_profile::staticGet('id', $other_id);
if (!empty($omb01)) {
// TRANS: Client error displayed trying to subscribe to an OMB 0.1 remote profile.
throw new ClientException(
_m(
'You cannot subscribe to an OMB 0.1 '
. 'remote profile with this action.'
)
);
return false;
}
}
/**
* Throw an error if someone tries to tag a remote profile
*
* @param Profile $tagger_profile profile of the tagger
* @param Profile $tagged_profile profile of the taggee
* @param string $tag
*
* @return true
*/
function onStartTagProfile($tagger_profile, $tagged_profile, $tag)
{
// OMB 0.1 doesn't have a mechanism for local-server-
// originated tag.
$omb01 = Remote_profile::staticGet('id', $tagged_profile->id);
if (!empty($omb01)) {
// TRANS: Client error displayed when trying to add an OMB 0.1 remote profile to a list.
$this->clientError(
_m(
'You cannot list an OMB 0.1 '
.'remote profile with this action.')
);
}
return false;
}
/**
* Check to make sure we're not tryng to untag an OMB profile
*
* // XXX: Should this ever happen?
*
* @param Profile_tag $ptag the profile tag
*/
function onUntagProfile($ptag)
{
// OMB 0.1 doesn't have a mechanism for local-server-
// originated tag.
$omb01 = Remote_profile::staticGet('id', $ptag->tagged);
if (!empty($omb01)) {
// TRANS: Client error displayed when trying to (un)list an OMB 0.1 remote profile.
$this->clientError(
_m(
'You cannot (un)list an OMB 0.1 '
. 'remote profile with this action.')
);
return false;
}
}
/**
* Remove old OMB subscription tokens
*
* @param User $user subscriber
* @param Profile $other subscribee
* @return hook return value
*/
function onEndUnsubscribe($profile, $other)
{
$sub = Subscription::pkeyGet(
array('subscriber' => $subscriber->id, 'subscribed' => $other->id)
);
if (!empty($sub->token)) {
$token = new Token();
$token->tok = $sub->token;
if ($token->find(true)) {
$result = $token->delete();
if (!$result) {
common_log_db_error($token, 'DELETE', __FILE__);
// TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
throw new Exception(
_m('Could not delete subscription OMB token.')
);
}
} else {
common_log(
LOG_ERR,
"Couldn't find credentials with token {$token->tok}",
__FILE__
);
}
}
return true;
}
/**
* Search for an OMB remote profile by URI
*
* @param string $uri remote profile URI
* @param Profile $profile the profile to set
* @return boolean hook value
*/
function onStartGetProfileFromURI($uri, &$profile)
{
$remote_profile = Remote_profile::staticGet('uri', $uri);
if (!empty($remote_profile)) {
$profile = Profile::staticGet('id', $remote_profile->profile_id);
return false;
}
return true;
}
/**
* Return OMB remote profiles as well as regular profiles
* in helper
*
* @param type $profile
* @param type $uri
*/
function onStartCommonProfileURI($profile, &$uri)
{
$remote = Remote_profile::staticGet($profile->id);
if ($remote) {
$uri = $remote->uri;
return false;
}
return true;
}
/**
* Plugin version info
*
* @param array $versions
* @return boolean hook value
*/
function onPluginVersion(&$versions)
{
$versions[] = array(
'name' => 'OpenMicroBlogging',
'version' => STATUSNET_VERSION,
'author' => 'Zach Copley',
'homepage' => 'http://status.net/wiki/Plugin:Sample',
'rawdescription' =>
// TRANS: Plugin description.
_m('A sample plugin to show basics of development for new hackers.')
);
return true;
}
}

31
plugins/OMB/README Normal file
View File

@ -0,0 +1,31 @@
OMB (OpenMicroBlogging) plugin
==============================
This plugin encapsulates OpenMicroBlogging 0.1 functionality. OMB was the
original federation protocol for StatusNet, but has been deprecated
in favor of OStatus (see the OStatus plugin). This plugin is provided for
backward-compatibility with older sites, and for posterity.
External libraries
------------------
This is provided with the plugin, but you may wish to use a newer version of
the library, if and when it becomes available.
- libomb. a library for implementing OpenMicroBlogging 0.1
http://gitorious.org/libomb
Installation
------------
[TODO]
Offline Processing
------------------
Note: once you have a sizable number of users, sending OMB messages whenever
someone posts a message can really slow down your site; it may cause posting
to timeout. You may wish to enable queuing and handle OMB communication
offline. See the "queues and daemons" section of the main StatusNet README.

6
actions/accesstoken.php → plugins/OMB/actions/accesstoken.php
View File

@ -12,7 +12,7 @@
* @link http://status.net/
*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -32,8 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
require_once INSTALLDIR.'/lib/omb.php';
require_once dirname(__FILE__) . '/../extlib/libomb/service_provider.php';
require_once dirname(__FILE__) . '/../lib/omb.php';
/**
* Access token class

6
actions/finishremotesubscribe.php → plugins/OMB/actions/finishremotesubscribe.php
View File

@ -12,7 +12,7 @@
* @link http://status.net/
*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -30,8 +30,8 @@
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
require_once INSTALLDIR.'/extlib/libomb/service_consumer.php';
require_once INSTALLDIR.'/lib/omb.php';
require_once dirname(__FILE__) . '/../extlib/libomb/service_consumer.php';
require_once dirname(__FILE__) . '/../lib/omb.php';
/**
* Handler for remote subscription finish callback

6
actions/postnotice.php → plugins/OMB/actions/postnotice.php
View File

@ -12,7 +12,7 @@
* @link http://status.net/
*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -30,8 +30,8 @@
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
require_once INSTALLDIR.'/lib/omb.php';
require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
require_once dirname(__FILE__) . '/../lib/omb.php';
require_once dirname(__FILE__) . '/../extlib/libomb/service_provider.php';
/**
* Handler for postnotice action

8
actions/remotesubscribe.php → plugins/OMB/actions/remotesubscribe.php
View File

@ -12,7 +12,7 @@
* @link http://status.net/
*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011 StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -30,9 +30,9 @@
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
require_once INSTALLDIR.'/lib/omb.php';
require_once INSTALLDIR.'/extlib/libomb/service_consumer.php';
require_once INSTALLDIR.'/extlib/libomb/profile.php';
require_once dirname(__FILE__) . '/../lib/omb.php';
require_once dirname(__FILE__) . '/../extlib/libomb/service_consumer.php';
require_once dirname(__FILE__) . '/../extlib/libomb/profile.php';
/**
* Handler for remote subscription

6
actions/requesttoken.php → plugins/OMB/actions/requesttoken.php
View File

@ -12,7 +12,7 @@
* @link http://status.net/
*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -32,8 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
require_once INSTALLDIR.'/lib/omb.php';
require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
require_once dirname(__FILE__) . '/../lib/omb.php';
require_once dirname(__FILE__) . '/../extlib/libomb/service_provider.php';
/**
* Request token action class.

6
actions/updateprofile.php → plugins/OMB/actions/updateprofile.php
View File

@ -12,7 +12,7 @@
* @link http://status.net/
*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -30,8 +30,8 @@
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
require_once INSTALLDIR.'/lib/omb.php';
require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
require_once dirname(__FILE__) . '/../lib/omb.php';
require_once dirname(__FILE__) . '/../extlib/libomb/service_provider.php';
/**
* Handle an updateprofile action

8
actions/userauthorization.php → plugins/OMB/actions/userauthorization.php
View File

@ -12,7 +12,7 @@
* @link http://status.net/
*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -30,9 +30,9 @@
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
require_once INSTALLDIR.'/lib/omb.php';
require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
require_once INSTALLDIR.'/extlib/libomb/profile.php';
require_once dirname(__FILE__) . '/../lib/omb.php';
require_once dirname(__FILE__) . '/../extlib/libomb/service_provider.php';
require_once dirname(__FILE__) . '/../extlib/libomb/profile.php';
define('TIMESTAMP_THRESHOLD', 300);
// @todo FIXME: Missing documentation.

10
actions/xrds.php → plugins/OMB/actions/xrds.php
View File

@ -12,7 +12,7 @@
* @link http://status.net/
*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -32,10 +32,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
require_once INSTALLDIR.'/lib/omb.php';
require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
require_once INSTALLDIR.'/extlib/libomb/xrds_mapper.php';
require_once INSTALLDIR.'/lib/xrdsoutputter.php';
require_once dirname(__FILE__) . '/../lib/omb.php';
require_once dirname(__FILE__) . '/../extlib/libomb/service_provider.php';
require_once dirname(__FILE__) . '/../extlib/libomb/xrds_mapper.php';
require_once dirname(__FILE__) . '/../lib/xrdsoutputter.php';
/**
* XRDS for OpenMicroBlogging

0
extlib/libomb/base_url_xrds_mapper.php → plugins/OMB/extlib/libomb/base_url_xrds_mapper.php
View File

0
extlib/libomb/constants.php → plugins/OMB/extlib/libomb/constants.php
View File

0
extlib/libomb/datastore.php → plugins/OMB/extlib/libomb/datastore.php
View File

0
extlib/libomb/helper.php → plugins/OMB/extlib/libomb/helper.php
View File

0
extlib/libomb/invalidparameterexception.php → plugins/OMB/extlib/libomb/invalidparameterexception.php
View File

0
extlib/libomb/invalidyadisexception.php → plugins/OMB/extlib/libomb/invalidyadisexception.php
View File

0
extlib/libomb/notice.php → plugins/OMB/extlib/libomb/notice.php
View File

0
extlib/libomb/omb_yadis_xrds.php → plugins/OMB/extlib/libomb/omb_yadis_xrds.php
View File

0
extlib/libomb/plain_xrds_writer.php → plugins/OMB/extlib/libomb/plain_xrds_writer.php
View File

0
extlib/libomb/profile.php → plugins/OMB/extlib/libomb/profile.php
View File

0
extlib/libomb/remoteserviceexception.php → plugins/OMB/extlib/libomb/remoteserviceexception.php
View File

0
extlib/libomb/service_consumer.php → plugins/OMB/extlib/libomb/service_consumer.php
View File

0
extlib/libomb/service_provider.php → plugins/OMB/extlib/libomb/service_provider.php
View File

0
extlib/libomb/unsupportedserviceexception.php → plugins/OMB/extlib/libomb/unsupportedserviceexception.php
View File

0
extlib/libomb/xrds_mapper.php → plugins/OMB/extlib/libomb/xrds_mapper.php
View File

0
extlib/libomb/xrds_writer.php → plugins/OMB/extlib/libomb/xrds_writer.php
View File

22
lib/omb.php → plugins/OMB/lib/omb.php
View File

@ -1,7 +1,7 @@
<?php
/*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -19,13 +19,14 @@
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
require_once INSTALLDIR.'/lib/oauthstore.php';
require_once 'OAuth.php';
require_once 'libomb/constants.php';
require_once 'libomb/service_consumer.php';
require_once 'libomb/notice.php';
require_once 'libomb/profile.php';
require_once 'Auth/Yadis/Yadis.php';
$dir = dirname(__FILE__);
require_once $dir . '/omboauthstore.php';
require_once $dir . '/../extlib/libomb/constants.php';
require_once $dir . '/../extlib/libomb/service_consumer.php';
require_once $dir . '/../extlib/libomb/notice.php';
require_once $dir . '/../extlib/libomb/profile.php';
require_once INSTALLDIR . '/extlib/Auth/Yadis/Yadis.php';
function omb_oauth_consumer()
{
@ -48,7 +49,7 @@ function omb_oauth_datastore()
{
static $store = null;
if (is_null($store)) {
$store = new StatusNetOAuthDataStore();
$store = new OMBOAuthDataStore();
}
return $store;
}
@ -64,7 +65,6 @@ function omb_hmac_sha1()
function omb_broadcast_notice($notice)
{
try {
$omb_notice = notice_to_omb_notice($notice);
} catch (Exception $e) {
@ -233,4 +233,4 @@ function notice_to_omb_notice($notice)
return $omb_notice;
}
?>

21
lib/oauthstore.php → plugins/OMB/lib/omboauthstore.php
View File

@ -1,7 +1,7 @@
<?php
/*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011 StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -19,10 +19,10 @@
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
require_once 'libomb/datastore.php';
require_once dirname(__FILE__) . '/../extlib/libomb/datastore.php';
// @todo FIXME: Class documentation missing.
class StatusNetOAuthDataStore extends OAuthDataStore
class OMBOAuthDataStore extends OAuthDataStore
{
// We keep a record of who's contacted us
function lookup_consumer($consumer_key)
@ -55,17 +55,6 @@ class StatusNetOAuthDataStore extends OAuthDataStore
}
}
function getTokenByKey($token_key)
{
$t = new Token();
$t->tok = $token_key;
if ($t->find(true)) {
return $t;
} else {
return null;
}
}
// http://oauth.net/core/1.0/#nonce
// "The Consumer SHALL then generate a Nonce value that is unique for
// all requests with that timestamp."
@ -234,7 +223,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
$profile = Profile::staticGet('id', $remote->id);
if (!$profile) throw new Exception('No profile for remote user');
require_once INSTALLDIR.'/lib/omb.php';
require_once dirname(__FILE__) . '/omb.php';
return profile_to_omb_profile($identifier_uri, $profile);
}
@ -376,7 +365,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
$notice = Notice::saveNew($author->id,
$omb_notice->getContent(),
'omb',
array('is_local' => Notice::REMOTE_OMB,
array('is_local' => Notice::REMOTE,
'uri' => $omb_notice->getIdentifierURI()));
}

4
lib/ombqueuehandler.php → plugins/OMB/lib/ombqueuehandler.php
View File

@ -1,7 +1,7 @@
<?php
/*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2008, 2009, StatusNet, Inc.
* Copyright (C) 2008-2011, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -42,7 +42,7 @@ class OmbQueueHandler extends QueueHandler
common_log(LOG_DEBUG, 'Ignoring remote notice ' . $notice->id);
return true;
} else {
require_once(INSTALLDIR.'/lib/omb.php');
require_once(dirname(__FILE__) . '/omb.php');
omb_broadcast_notice($notice);
return true;
}

4
lib/profilequeuehandler.php → plugins/OMB/lib/profilequeuehandler.php
View File

@ -1,7 +1,7 @@
<?php
/*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2010, StatusNet, Inc.
* Copyright (C) 2010-2011, StatusNet, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@ -38,7 +38,7 @@ class ProfileQueueHandler extends QueueHandler
}
if (Event::handle('StartBroadcastProfile', array($profile))) {
require_once(INSTALLDIR.'/lib/omb.php');
require_once(dirname(__FILE__) . '/omb.php');
try {
omb_broadcast_profile($profile);
} catch (Exception $e) {

2
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -591,7 +591,7 @@ class Ostatus_profile extends Managed_DataObject
}
}
$options = array('is_local' => Notice::REMOTE_OMB,
$options = array('is_local' => Notice::REMOTE,
'url' => $sourceUrl,
'uri' => $sourceUri,
'rendered' => $rendered,