Brion Vibber
b97400bd6f
clarify output on fixup-shadow.php
2010-03-19 11:17:56 -07:00
Zach Copley
f0c54243ba
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Validate OStatus avatar URL before fetching.
2010-03-19 10:38:54 -07:00
Brion Vibber
d2e6664132
Validate OStatus avatar URL before fetching.
2010-03-19 10:16:12 -07:00
Brion Vibber
9e3e1d3d56
Validate OStatus avatar URL before fetching.
2010-03-19 10:15:00 -07:00
Zach Copley
fb50a2d83c
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Parse RSS items as activities
Remove hkit and do our own hcard parsing
Work around weird bug with HTML normalization via PHP DOM module; if source had xmlns and xml:lang I ended up with double output, breaking the subsequent parsing. Will have to track this down later and report upstream if not already resolved.
2010-03-19 10:08:47 -07:00
Evan Prodromou
ac609e8040
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
...
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
2010-03-18 20:57:38 -05:00
Evan Prodromou
17c50f338c
Remove hkit and do our own hcard parsing
...
Parsing hcards for the data we need wasn't hard enough to justify using
hkit. It was dependent on a number of external systems (something to
run tidy), and only could handle XHTML.
We now parse HTML with the PHP dom libraries used elsewhere, and
scrape out our own hcards. Seems to work nicer and faster and most of
all works with Google Buzz profile URLs.
2010-03-18 20:52:00 -05:00
Brion Vibber
4a6c9e4451
Work around weird bug with HTML normalization via PHP DOM module; if source had xmlns and xml:lang I ended up with double output, breaking the subsequent parsing. Will have to track this down later and report upstream if not already resolved.
2010-03-18 17:57:58 -07:00
Zach Copley
a6c9445f0d
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
OStatus discover fixes:
Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, causing warnings)
Fix notice warning about unused var -- was renamed during refactoring.
2010-03-18 17:11:06 -07:00
Brion Vibber
1301877dfe
OStatus discover fixes:
...
* Subscription::start was sometimes passing users instead of profiles to hooks, which broke OStatus subscription notifications; now normalizing to profiles for processing.
* H-card parsing would trigger a lot of PHP warnings and notices in hKit. Now suppressing warnings and notices for the duration of the call to keep them out of output when display_errors is on.
* H-card parsing would trigger a PHP fatal error if the source page was not well-formed XML and Tidy was not present on the system. Switched normalization to use the PHP DOM module which is always present, as we have no need for Tidy's extra features here.
* Trying to fetch avatars from Google profiles failed and triggered a PHP warning due to the relative URL not being resolved during h-card parsing. Now passing profile page URL into hKit by sneaking a <base> tag in while we normalize the HTML source.
* Profile pages without a "Link" header could trigger PHP notices due to a bad NULL -> array(NULL) conversion in LinkHeader::getLink(). Now checking that there was a return value before converting single return value into array.
2010-03-18 17:08:19 -07:00
Zach Copley
051bee988c
Minor syntax err in TwitterBridge README example
2010-03-18 17:00:37 -07:00
Brion Vibber
c8e3d08a8f
Fix notice warning about unused var -- was renamed during refactoring.
2010-03-18 15:11:25 -07:00
Brion Vibber
cac9d23498
Fix for xmpp/sms notification options appearing to be disabled on new subscriptions.
...
Base problem is that our caching-on-insert interferes with relying on column default values; the cached object is missing those fields, so they appear to be empty (null) when the object is retrieved from cache.
Now explicitly setting them when inserting subscriptions, and cleaned up some code that had alternate code paths.
May also have made auto-subscription work for remote OStatus subscribers, but can't test until magic sigs are working again.
2010-03-18 14:26:32 -07:00
Brion Vibber
f1b3d84b7d
Fix some remote subscription regressions from f21f78364a
...
Ostatus_profile::ensureProfile() has been renamed to Ostatus_profile::ensureProfileURL()
2010-03-18 13:13:57 -07:00
Brion Vibber
1de7badd78
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-18 10:55:20 -07:00
Evan Prodromou
a764603e73
reverse order from delete, insert to insert, delete on ostatus conversion
2010-03-18 08:04:22 -05:00
Evan Prodromou
f1af583e3e
catch exceptions in OStatus updates, log, and continue
2010-03-18 07:55:14 -05:00
Evan Prodromou
4761c07ad8
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-17 09:38:39 -05:00
Evan Prodromou
f21f78364a
Change the workflow to get better discovery
...
Tried to re-structure the workflow of discovery to get more and richer
data and hints.
2010-03-16 11:25:18 -05:00
Brion Vibber
dfac4bfd09
Fix feed discovery: html:link@rel can contain multiple values; saw rel="updates alternate" in the wild at http://tantek.com/ which broke old discovery code.
2010-03-15 20:26:42 +00:00
Brion Vibber
c9232d8f26
Ticket #2242 : fix reading of inline XHTML content in Atom feeds for OStatus input.
...
Lookup of the <div> needed to check for the XHTML namespace.
2010-03-15 20:21:55 +00:00
James Walker
7aa49b5e87
use canonical user url in xrd
2010-03-15 15:17:31 -04:00
James Walker
85cf90cf0f
Performing & allowing host-meta discovery by http url (in addition to webfinger acct)
2010-03-13 18:35:00 -05:00
James Walker
99ca84e68e
changing keypair to text to hold a full 1024bit keypair
2010-03-13 15:46:54 -05:00
James Walker
9111c5c6fe
allow profile_url to be used in ostatus:attention
2010-03-13 14:36:51 -05:00
James Walker
135c0c8a7f
cleaning up key generation
2010-03-12 21:44:18 -05:00
James Walker
4e44cf906b
converting key generation to new crypt library
2010-03-12 20:02:00 -05:00
James Walker
520faaf67d
updating phpseclib to latest cvs - fixes a bunch of key generation issues
2010-03-12 20:01:34 -05:00
James Walker
c5bb41176e
converted toString to new crypt library
2010-03-12 19:42:48 -05:00
James Walker
23d44c7d59
converted sign, verify and fromString to new crypt lib
2010-03-12 19:34:45 -05:00
James Walker
41d2ff662c
Adding Crypt library from http://phpseclib.sourceforge.net/
2010-03-12 19:34:24 -05:00
James Walker
114f046691
removing deprecated PEAR Crypt_RSA
2010-03-12 18:50:00 -05:00
Brion Vibber
9e9ab23e1f
Fixes for updating indices, charset/collation and engine type on plugin-created tables.
...
Under MySQL, new tables will be created as InnoDB with UTF-8 (utf8/utf8_bin) same as core tables.
Existing plugin tables will have table engine and default charset/collation updated, and string columns will have charset updated, at checkschema time.
Switched from 'DESCRIBE' to INFORMATION_SCHEMA for pulling column information in order to get charset. A second hit to INFORMATION_SCHEMA is also needed to get table properties.
Indices were only being created at table creation time, which ain't so hot. Now also adding/dropping indices when they change.
Fixed up some schema defs in OStatus plugin that were a bit flaky, causing extra alter tables to be run.
TODO: Generalize this infrastructure a bit more up to base schema & pg schema classes.
2010-03-12 13:16:32 -08:00
Brion Vibber
4d7479dcbc
OpenID fixes:
...
- avoid notice spew when checking sreg items that weren't provided
- fix keys spec for user_openid, clears up problems with removing openid associations
- fix keys spec for user_openid_trustroot
2010-03-12 10:07:32 -08:00
Sarven Capadisli
ea7c1bab2e
Plugin to open up rel="external" links on a new window or tab
2010-03-12 11:13:05 -05:00
Sarven Capadisli
4c320872d9
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-11 16:39:07 -05:00
James Walker
512e511053
fix invalid separator in magic-public-key XRD and matching parsing.
2010-03-11 14:49:12 -05:00
James Walker
06612e35e4
remove hard-coded me:env check in magicenvelope
2010-03-11 14:49:12 -05:00
James Walker
89582e7226
base64_encode/decode -> base64_url_encode/decode
2010-03-11 14:49:12 -05:00
Brion Vibber
c6f09306b1
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-10 17:04:51 -08:00
Brion Vibber
66518df435
OStatus: reject attempts to create a remote profile for a local user or group.
...
Some stray shadow entries were ending up getting created, which would steal group posts from remote users.
Run plugins/OStatus/scripts/fixup-shadow.php for each site to remove any existing ones.
2010-03-10 17:00:05 -08:00
Brion Vibber
9b75e162c7
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-10 10:07:52 -08:00
Brion Vibber
69b2f19b6f
RequireValidatedEmailPlugin fixes: require email on registration form, tidy up i18n infrastructure.
2010-03-10 10:06:46 -08:00
Craig Andrews
9653cb9f0a
Fix error logging
2010-03-09 21:26:48 -05:00
Brion Vibber
8bf1b54abd
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-09 13:07:52 -08:00
Brion Vibber
32532c7c42
Merge branch 'commands' into testing
2010-03-09 13:05:51 -08:00
Brion Vibber
80a17387bf
Command input processing now has centralized places for looking up notice, user/profile, and group arguments.
...
OStatus plugin overrides these to allow using webfinger (user@example.com ), profile URL (http://example.com/user ) and bare profile URL (example.com/user) as arguments.
2010-03-09 13:03:32 -08:00
Brion Vibber
6c4ade4251
Merge branch 'testing' into 0.9.x
2010-03-09 11:27:53 -08:00
Brion Vibber
58192ad687
OStatus: fix exception thrown on HTTP error during feed discovery
2010-03-09 10:56:33 -08:00
Zach Copley
311da86762
Use canonical URL for notification in RSSCloud plugin
2010-03-09 11:08:07 +00:00
Zach Copley
d644f4148b
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2010-03-09 11:07:42 +00:00
Zach Copley
7afad469c2
Use canonical URL for notification in RSSCloud plugin
2010-03-09 11:07:24 +00:00
James Walker
7214db14fe
wrong param order to strpos()
2010-03-09 01:24:21 -05:00
Craig Andrews
9466546705
On the OpenID settings page, allow users to remove trustroots.
2010-03-08 21:43:34 -05:00
Zach Copley
691c88bce8
Only allow RSSCloud subs to canonical RSS2 profile feeds
2010-03-08 23:12:15 +00:00
Zach Copley
f8c5996758
Only allow RSSCloud subs to canonical RSS2 profile feeds
2010-03-08 23:11:52 +00:00
Craig Andrews
51a245f18c
Added Memcached plugin (using pecl/memcached versus pecl/memcache)
2010-03-08 17:17:37 -05:00
Brion Vibber
42463e160d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-08 13:37:45 -08:00
Jeffery To
3f696ff0ed
ldap_get_connection() to return null when passed a config with bad user/pw.
...
This mainly affects login; before if the user enters a valid username
but invalid password, ldap_get_connection() throws an
LDAP_INVALID_CREDENTIALS error. Now the user sees the regular
"Incorrect username of password" error message.
2010-03-08 13:14:41 -05:00
Brion Vibber
5355c3b7b5
OpenID fix:
...
- avoid notice on insert (missing sequenceKeys())
- avoid cache corruption on delete (user_id was missing from keys list, cache not cleared for user_id lookups)
2010-03-05 15:00:27 -08:00
Brion Vibber
89e313e45b
OStatus fix: send the feed's root element, not the DOM document, down to low-level feed processing as entry context on PuSH input.
2010-03-05 10:55:07 -08:00
root
982edc653f
Another typo
2010-03-04 23:30:36 -05:00
Zach Copley
b8001ea107
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-05 03:56:04 +00:00
Zach Copley
e3c4b0c85d
A better way to safely delete Foreign_links
2010-03-05 03:55:56 +00:00
Zach Copley
6aac7cc6cd
Fix for errant deletion of all Twitter foreign_links
2010-03-05 03:55:39 +00:00
Zach Copley
6a377a4ba4
A better way to safely delete Foreign_links
2010-03-05 03:14:40 +00:00
Zach Copley
029b8c9014
Fix for errant deletion of all Twitter foreign_links
2010-03-05 02:27:01 +00:00
Brion Vibber
2f41e93339
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-04 14:44:38 -08:00
Sarven Capadisli
a4ec64ff45
Slight right alignment for remote button in minilists
2010-03-04 13:43:28 -05:00
Brion Vibber
7bd0b8e17e
Pull latest .po files from 0.9.x to testing
2010-03-04 10:20:10 -08:00
Brion Vibber
f969d6349c
Merge branch 'testing' into 0.9.x
...
Conflicts:
db/08to09.sql
2010-03-04 10:16:59 -08:00
Brion Vibber
a6a056026d
Dropping the earlier PubSubHubbub plugin; OStatus plugin is taking that portion over (with both internal and external hub options for user and group feeds).
...
Todo: add support for other feeds to OStatus PuSH hub implementation.
2010-03-04 17:33:56 +00:00
Brion Vibber
8f1762cb95
OStatus: fix for remote group join via non-logged-in 'join' button.
...
Bad lookup was sending us to the first group instead of the selected group.
2010-03-04 09:24:47 -08:00
James Walker
45f11d9637
adding plugin version to OStatus
2010-03-04 12:02:44 -05:00
Brion Vibber
b218aee94e
Merge commit 'origin/testing' into 0.9.x
...
Conflicts:
lib/action.php
lib/adminpanelaction.php
2010-03-04 06:07:28 -08:00
James Walker
ddc4a7d2ff
Catch a previously uncaught exception and add some additional debug logs for signature verification
2010-03-04 01:46:34 -05:00
James Walker
9cbeac5695
Merge remote branch 'statusnet/testing' into testing
2010-03-04 01:31:19 -05:00
James Walker
849f5783c4
update xrd -> userxrd
2010-03-04 01:30:15 -05:00
Sarven Capadisli
b97ac60209
Changed text for authorizing/confirming remote profile
2010-03-03 23:47:27 -05:00
Sarven Capadisli
f54fa6b10b
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 23:36:05 -05:00
Sarven Capadisli
38503096d9
Puts All groups and Remote sub button in the mini list on the same line
2010-03-03 23:34:48 -05:00
James Walker
1c8399fde1
refactor xrd to allow for ownerxrd - xrd document for the site owner.
...
introduced $config['webfinger']['owner'] for a custom xrd subject
2010-03-03 23:20:30 -05:00
Sarven Capadisli
239750aa00
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 22:58:28 -05:00
Sarven Capadisli
de687d00c0
Updated OStatus subscription error messages to be more user friendly.
...
Hopefully.
2010-03-03 22:56:50 -05:00
Brion Vibber
24835c1164
OStatus: catchable exception instead of fatal when parsing valid XML that isn't a valid XRD doc
2010-03-03 18:31:35 -08:00
Brion Vibber
14065ca350
OStatus: code cleanup on webfinger fallback path
2010-03-03 18:28:39 -08:00
Brion Vibber
a4d9171306
Fix up catching of webfinger setup fails
2010-03-03 18:23:28 -08:00
Sarven Capadisli
6a5a629afa
Updated label and note text for user and group remote subscribe forms
2010-03-03 20:08:55 -05:00
Brion Vibber
9fadf8da11
Put all required field setup into AtomUserNoticeFeed and AtomGroupNoticeFeed, consolidating some code. (RSS feeds pulling title, logo etc from the Atom data structure so we don't dupe it.)
...
OStatus now calling the feed classes directly instead of faking a call into the API, should be less flakey.
2010-03-03 16:33:20 -08:00
Sarven Capadisli
b3969be85a
Updated remote subscribe button style in aside
2010-03-03 17:48:00 -05:00
Brion Vibber
628338265c
OStatus: fix up remote join button on group profiles
2010-03-03 14:06:05 -08:00
Brion Vibber
4bad176088
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 13:41:00 -08:00
Brion Vibber
a42d1116db
Separate the UI paths for ostatussub and ostatusgroup. They'll redirect to each other transparently if they find you've put a remote entity of the other type.
2010-03-03 13:40:26 -08:00
Sarven Capadisli
2a96d1d59d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 16:27:19 -05:00
Sarven Capadisli
219e15ac64
Returning true instead for group remote subscription. If not logged
...
in, it gives the chance to use the logged in join/leave instead.
2010-03-03 16:26:02 -05:00
Zach Copley
339b0b0a4d
Don't expose global Twitter consumer key and secret, because that would be idiotic.
2010-03-03 13:05:11 -08:00
Sarven Capadisli
d3c1888256
Generalized style for remote subscription button
2010-03-03 15:31:16 -05:00
Sarven Capadisli
3c55edde39
Showing the remote subscribe button on the user groups page
2010-03-03 15:30:43 -05:00
Evan Prodromou
ccd0db1e0a
add remote subscribe button for not-logged-in users looking a profile list with local users in it
2010-03-03 14:32:03 -05:00
Sarven Capadisli
e6fd387c94
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 13:38:31 -05:00