51d1535f15
Added doc comments on Salmon magicsig-related stuff to help in figuring out what's going on
2011-01-05 14:05:59 -08:00
32eb4c5e2d
Merge remote branch 'gitorious/0.9.x' into 1.0.x
...
Conflicts:
lib/common.php
2010-12-30 15:52:08 -08:00
d3b10959f4
Merge branch '0.9.x' into noactor
2010-12-29 15:29:29 -08:00
b54ea6767a
New event for Salmon including target
2010-12-27 10:51:59 -08:00
ab92496ddc
Stop using <activity:subject> for atom feeds
2010-12-27 10:03:34 -08:00
67bde86f7c
accept bookmarks over PuSH
2010-12-23 09:42:42 -08:00
26baad63f2
Merge branch '0.9.x' into 1.0.x
2010-12-22 15:25:38 -08:00
9a6ceb3303
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:22:51 -08:00
f82dd4e14f
Merge branch '0.9.x' into 1.0.x
2010-12-20 14:28:43 -08:00
b83e7005ed
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OStatus/classes/FeedSub.php
2010-12-20 14:23:15 -08:00
46123e3754
*cough* don't commit the code that breaks your code that you used to test the debug code :D
2010-12-20 13:06:58 -08:00
a4e2f38356
Slightly fancier debug code for PuSH hmac mismatches -- save the post to a temp file if feedsub/debug is on in config.
2010-12-20 13:05:17 -08:00
e36399974e
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
...
Conflicts:
lib/action.php
plugins/OStatus/actions/ostatusinit.php
2010-12-20 15:19:33 -05:00
dd48bdb1c4
Logging helper for bogus hmacs on PuSH in -- record the url & hub with the err msg to help tell what broke
2010-12-20 10:48:02 -08:00
c71d701a3f
Logging helper for bogus hmacs on PuSH in -- record the url & hub with the err msg to help tell what broke
2010-12-20 10:46:23 -08:00
16fc5314fb
move code to get an author object for a feed to a library from Ostatus_profile
2010-12-17 13:09:37 -05:00
e79034e163
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-12-16 15:56:19 -08:00
cf824621b9
Localisation updates from http://translatewiki.net .
2010-12-16 16:30:30 +01:00
0330bad688
Cleaner code to avoid a couple PHP notices from accessing uninitialized variables in ostatus profile discovery (these cases hit checking diaspora accounts)
2010-12-15 12:14:25 -08:00
9df856e667
Merge branch '0.9.x' into merge
...
Conflicts:
README
actions/hostmeta.php
classes/File_redirection.php
lib/common.php
lib/designsettings.php
lib/router.php
lib/util.php
lib/xmppmanager.php
plugins/OStatus/OStatusPlugin.php
2010-12-07 10:50:05 -08:00
6bdce2b1e5
Localisation updates from http://translatewiki.net .
2010-11-30 21:35:25 +01:00
ee67a0673d
Localisation updates from http://translatewiki.net .
2010-11-30 18:53:04 +01:00
adb98ce5d1
updated
2010-11-29 16:02:17 -05:00
675d902cab
updated
2010-11-29 16:01:19 -05:00
3277523448
updated
2010-11-29 16:00:54 -05:00
4da41d95ee
updated
2010-11-29 16:00:17 -05:00
f4dd6c2916
updated
2010-11-29 15:58:41 -05:00
67db18d30b
updated
2010-11-29 15:57:28 -05:00
432237178f
updated
2010-11-29 15:55:58 -05:00
ed0e91c7a1
Localisation updates from http://translatewiki.net .
2010-11-29 20:28:28 +01:00
005a14272d
Make OStatusPlugin define push feed rel
2010-11-26 22:10:18 -05:00
fcc0825b14
Make userxrd part of the default hostmeta
2010-11-26 21:46:51 -05:00
0a4911552e
Move user xrd action to core and use hooks to extend
...
Moved the Webfinger user XRD action from the OStatus plugin to core.
Added hooks to add OStatus-specific stuff, but kept general stuff in
the core.
2010-11-26 21:38:38 -05:00
3f3b38766f
move xrd and hostmeta out of the OStatus plugin and into core
...
add event for setting up hostmeta, and use them in the OStatus plugin
2010-11-26 21:12:14 -05:00
b716d01a41
Merge branch '0.9.x' into 1.0.x
2010-11-03 16:09:49 -07:00
ec79572964
Localisation updates from http://translatewiki.net .
2010-11-03 00:04:26 +01:00
973a48bded
i18n/L10n fixes and translator documentation addded/updated.
2010-11-02 23:48:36 +01:00
0229c22d23
Merge branch '1.0.x' into schema-x
2010-11-02 15:02:55 -07:00
04ca706601
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/othersettings.php
2010-11-02 15:02:10 -07:00
5a9bb0adc4
Tossing in a basic i18n message export to script code. Plugins can hook StartScriptMessage/EndScriptMessage, or directly add needed mappings in Action::getScriptMessages(). Exported entries are accessible as SN.msg(key) at runtime.
...
StatusNet core code now sets the tooltip text on .attachment.more links when they receive their attachment-expansion magic; this will override the hardcoded tooltip text saved from OStatus plugin when displaying timelines in the web UI.
2010-11-02 13:05:16 -07:00
e7c7fd39fc
Merge branch '1.0.x' into schema-x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-10-28 16:27:53 -07:00
b26eccf33c
Merge branch '0.9.x' into 1.0.x
2010-10-28 16:26:34 -07:00
7a564276a9
Localisation updates from http://translatewiki.net .
2010-10-28 01:58:43 +02:00
b483a0549f
Merge branch '1.0.x' into schema-x
...
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-10-25 13:14:33 -07:00
ca489631db
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
2010-10-25 13:08:57 -07:00
1545c1228b
Localisation updates from http://translatewiki.net .
2010-10-23 20:50:55 +02:00
3b6f738ab7
Convert SamplePlugin to new-style table defs, tweak some stuff to test basic checkschema
2010-10-19 17:25:56 -07:00
a67160e01e
Merge branch '1.0.x' into schema-x
...
Conflicts:
lib/common.php
2010-10-19 15:19:46 -07:00
3593f3f132
Merge branch '0.9.x' into 1.0.x
2010-10-19 15:18:07 -07:00
f1bfbece06
Merge branch '1.0.x' into schema-x
2010-10-18 15:26:20 -07:00
3c10602561
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-10-18 22:11:33 +02:00
e6df1b19df
Localisation updates from http://translatewiki.net
2010-10-18 22:03:29 +02:00
140308bb03
Merge branch '0.9.x' into 1.0.x
2010-10-18 12:49:20 -07:00
aa80d8fee3
Clean up edge cases in OStatus FeedDiscoveryTest
2010-10-18 12:45:55 -07:00
7765ddae81
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
README
lib/default.php
2010-10-18 12:17:11 -07:00
e04a6ef93e
Make HTTP timeout configurable on OStatus's remote-tests.php (needs to be pumped up a fair amount when doing Salmon pings with queues off on the test boxes, especially without the fast math library)
2010-10-18 11:27:22 -07:00
4c3aebd396
Merge branch '1.0.x' into schema-x
2010-10-15 11:40:40 -07:00
0721d8d3e2
Merge remote branch 'statusnet/0.9.x' into 1.0.x
2010-10-14 15:27:17 -04:00
ecb582e419
accept profile URL as a LRDD identifier
2010-10-14 11:07:37 -04:00
23ac961624
Show Webfinger, URI and profile page as subject and aliases
2010-10-14 11:06:57 -04:00
4101de7dd7
Merge branch '1.0.x' into schema-x
2010-10-13 15:46:45 -07:00
bca215563f
Clean up remote avatar temporary files if we fail before saving them into avatars directory (OMB core, OStatus, WikiHowProfile, YammerImport)
2010-10-13 11:10:04 -07:00
5f81f6119b
Merge branch '0.9.x' into 1.0.x
2010-10-12 16:33:36 -07:00
5215423ea9
Localisation updates from http://translatewiki.net .
2010-10-09 16:15:48 +02:00
aa02f6020e
Merge branch '0.9.x' into 1.0.x
2010-10-08 11:47:50 -07:00
67dc78b621
Merge branch 'fatals' into 0.9.x
2010-10-08 11:28:51 -07:00
69b13cb279
Normalize execution guards on OStatus php files; mostly helps cut down on annoying 'class not found' errors when something spiders the dirs. :P
2010-10-08 10:42:59 -07:00
6c959c83ce
Merge branch '0.9.x' into 1.0.x
2010-10-07 13:32:26 -07:00
fd0768be29
Merge branch 'master' into 0.9.x
2010-10-07 13:30:34 -07:00
458f93bddd
OStatus fixup-shadow.php: add check for user_group entries with 'uri' entry shadowing an actual local_group -- this can cause trouble now that we sometimes actually use the uri field for lookups, and leaving the entries around would break updating the table to fill out formerly missing uris, since the unique index entry would already be taken by the bad entry.
2010-10-07 11:26:07 -07:00
a9654beb5d
Fix regression in OStatus remote group delivery: local group check was bogus in updated Ostatus_profile::localGroupFromUrl()
2010-10-07 10:56:10 -07:00
99194e03fa
Merge branch '1.0.x' into schema-x
...
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
2010-10-06 17:16:13 -07:00
8ff45823ba
Merge branch '0.9.x' into 1.0.x
2010-10-05 11:40:49 -07:00
007866d340
Localisation updates from http://translatewiki.net
2010-10-05 00:59:47 +02:00
f58008ebaf
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-04 15:22:02 -07:00
d6b3d7fb1a
Fix unescaped dollar signs in double-quoted strings due to localization updates (%1$s etc)
2010-10-04 14:24:04 -07:00
2295bbec9e
Extra debug helper line in push callback
2010-10-04 14:22:32 -07:00
5c4723919f
Merge branch '0.9.x' into 1.0.x
2010-10-04 13:06:40 -07:00
59119482ca
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
2010-10-04 12:54:36 -07:00
5b49366f49
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/AnonymousFave/AnonymousFavePlugin.php
2010-10-04 11:42:16 -07:00
5dee862b2c
Fix broken code in OStatus feed maint/test scripts (using field name from older dev code, would load up wrong record)
2010-10-04 10:27:03 -07:00
458512aafd
Localisation updates from http://translatewiki.net
2010-10-03 22:46:38 +02:00
08054e85fe
Localisation updates from http://translatewiki.net .
2010-10-01 22:34:59 +02:00
1acc7d66c6
Always specify UTF-8 targt charset for html_entity_decode(); default is 8-bit ISO-8859-1 which causes things to break when we later pass them through things that expect to work with UTF-8. For instance, running through preg_replace() with the /u option results in NULL, leading to problems with OStatus and SubMirror generating their plaintext versions and doing length-cropping.
2010-09-30 11:29:31 -07:00
ec7ab3af4d
Localisation updates from http://translatewiki.net
...
* first export of L10n for languages other than English. Could use some testing/QA.
2010-09-28 01:09:29 +02:00
430d1da976
Update POT files.
2010-09-28 00:03:06 +02:00
7c4fcefd31
Enhanced OStatus fixup-shadow.php cleanup script to check for direct matches against user.uri and user_group.uri (for local groups). This should catch cases that were missed before because we were only doing pattern-matching checks, and the pattern didn't match because the site has been renamed and the old URI no longer matches the current domain / path structure.
...
Could use some more thorough testing in practice!
2010-09-27 14:23:10 -07:00
80e0e60c37
Add a comment in UserxrdAction warning future maintainers not to break domain migrations if adding domain checking to the webfinger lookup in future.
2010-09-27 11:38:26 -07:00
617b6f4f7d
User user_group.uri to look up local groups for OStatus addressing checks when available. Will still fall back to the URL-scheme-checking code if there's no matching user_group record.
...
Should help with keeping remote groups working when renaming sites -- as long as user_group.uri has been filled out on the site changing its domain and other issues with POST handling are resolved.
2010-09-27 11:29:54 -07:00
870be512d2
Update POT files for plugins.
2010-09-23 00:37:16 +02:00
b5cfcba471
Merge branch '0.9.x' into activityexport
...
Conflicts:
plugins/OStatus/OStatusPlugin.php
2010-09-22 10:45:34 -04:00
f7ec40fa42
make some static functions public for OStatus_profile
2010-09-21 06:13:19 -04:00
f9e04993dd
Bump up HTTP timeout for OStatus remote-tests.php to 60 seconds; when running without queues and with only bcmath, salmon key generation is absurdly slow.
2010-09-20 16:26:50 -07:00
c932c0fdc1
Update pot files for plugins.
2010-09-19 17:44:29 +02:00
5a6f616206
* i18n/L10n update
...
* translator comments added
* remove superfluous whitespace
2010-09-19 15:17:36 +02:00
8135f7d960
Update pot files for plugins.
2010-09-19 00:24:48 +02:00
097d0bd2fa
Ticket #2731 : Fix for regression in posting to remote groups (regression in 2d4e0693c8)
...
Changes in 2d4e0693c8
2010-09-16 14:43:27 -07:00
670ad53215
Merge branch '0.9.x' into activityexport
2010-09-15 23:31:20 -04:00
db1d348135
Update/add pot files for plugins.
2010-09-15 01:16:45 +02:00
a881ce23e7
note on why we don't use Group_member::asActivity() in OStatusPlugin
2010-09-14 11:02:54 -04:00
d9b959fc64
move code for making activities from OStatus plugin to Subscription and Fave classes
2010-09-13 11:44:20 -04:00
a9fad9a7ac
Add translator hint.
2010-09-12 17:08:49 +02:00
4419e43f7f
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
plugins/TwitterBridge/twitterbasicauthclient.php
2010-09-09 15:01:03 -04:00
f2574fdd01
Fix for #2663 : fix for original/96px-size avatars getting saved with bad permissions, causing failure to see images if background queues are different user from web server.
...
The original-size file is now forced to 0644 (all-readable), which should help. Not sure this is 100% ideal, but it's better than 0600!
(The other sizes were being created in other code and had sane read perms already.)
Watch out for similar issues in Twitter bridge etc; avatar import code should get cleaned up and consolidated.
2010-09-07 16:52:02 -07:00
8d54809c35
move xrd and hostmeta out of the OStatus plugin and into core
...
add event for setting up hostmeta, and use them in the OStatus plugin
2010-09-07 13:45:52 -04:00
6fe2429c41
Fix syntax error
2010-09-05 17:31:46 -04:00
4aac47de03
syntax error in exception string in discovery.php
2010-09-03 01:41:01 -04:00
1bfbe9badf
* i18n/L10n updates and FIXMEs added
...
* whitespace fixes
2010-09-03 01:35:04 +02:00
82b1d6daef
Merge branch 'swat0' into 0.9.x
2010-09-02 16:58:55 -04:00
ebcd8644a5
Revert "debugging replyToID"
...
This reverts commit bb9353f6e0
2010-09-01 18:22:54 -04:00
bb9353f6e0
debugging replyToID
2010-09-01 17:59:49 -04:00
27626c3abf
Correctly check for user's id in replies in user salmon post
2010-09-01 17:10:29 -04:00
ab88123373
correctly return oprofile from Ostatus_profile::ensureProfileURI()
2010-09-01 17:05:11 -04:00
2d4e0693c8
save URIs of remote profiles marked for attention
2010-09-01 16:17:18 -04:00
3baff9aa98
Handle profile-from-uri hook to return ostatus profile if there's a match
2010-09-01 16:16:38 -04:00
c82b1cda82
send a salmon slap to mentioned person when we reply to a notice
2010-09-01 14:35:43 -04:00
468a15db00
Merge branch 'master' into 0.9.x
2010-09-01 14:21:36 -04:00
8ebb858964
remove noop function from OStatusPlugin
2010-09-01 14:21:24 -04:00
a507f04bc4
fix incorrect function name in updateostatus.php script
2010-08-25 12:32:10 -04:00
aff54d8efb
Managed_DataObject initial sketches (pulling Drupal-style schema def into the data that DB_DataObject and Memcached_DataObject use; not yet functional. Converted OStatus_profile for demo.)
2010-08-16 14:02:31 -07:00
b77c029aa8
Merge branch 'testing'
...
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
2010-08-16 10:06:52 -07:00
5110275a38
fix use of activity rather than act in salmonaction subclasses, too
2010-08-16 10:03:44 -07:00
54b93aede6
typo mixing up and in salmonaction
2010-08-16 10:03:38 -07:00
926c77246b
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
2010-08-13 14:35:49 -07:00
029aa0c61c
fix use of activity rather than act in salmonaction subclasses, too
2010-08-13 14:18:54 -07:00
8dec16aeeb
add hooks to allow plugins to handle different kinds of activities
2010-08-13 13:14:47 -07:00
4217277d14
typo mixing up and in salmonaction
2010-08-13 13:07:25 -07:00
16f75b95c6
Fixes for RSS subscriptions: accept posts with no ActivityStreams object-type set; be more liberal about accepting posts from feeds where the author info doesn't match (we'll post under the feed's profile and just not try to update the profile info).
2010-08-13 12:23:42 -07:00
f7b2bb09e6
Suppress whinging during HTML parsing in profile page discovery for things that turn out to be XML feeds with funny namespaces.
2010-08-13 12:23:28 -07:00
185f18024a
Fixes for RSS subscriptions: accept posts with no ActivityStreams object-type set; be more liberal about accepting posts from feeds where the author info doesn't match (we'll post under the feed's profile and just not try to update the profile info).
2010-08-13 11:41:44 -07:00
115231f917
Suppress whinging during HTML parsing in profile page discovery for things that turn out to be XML feeds with funny namespaces.
2010-08-13 10:51:00 -07:00
08fc6053ec
Fix for regression with OStatus mention processing (duplicated new and old style lead to trying to save a reply entry twice).
2010-08-10 13:49:11 -07:00
4fdfc6b1ce
Fix for FeedDiscovery test cases: note that some test cases with relative URLs fail that include a schema but not a host. Not 100% sure those are legit, need to check.
2010-08-10 13:19:27 -07:00
9a53be4669
Initial support for third-party fallback hub such as Superfeedr for feed subscriptions.
...
If set up, this hub will be used to subscribe to feeds that don't specify a hub of their own.
Assumes that the fallback hub will, in fact, handle polling and updates for any feed we throw at it!
Authentication may be specified for the fallback hub.
Example:
$config['feedsub']['fallback_hub'] = 'https://superfeedr.com/hubbub ';
$config['feedsub']['hub_user'] = 'abcd';
$config['feedsub']['hub_pass'] = 'ckcmdkmckdmkcdk';
Also:
* Fix for WordPress-RSS-via-Superfeedr-Atom; if we have <author> info but no ID from a native ActivityStreams actor, don't freak out in the low-level processing code that checks for identity matches.
* enhanced messages for low-level FeedSub exceptions if they make it to outside display
2010-08-10 12:57:40 -07:00
c8a706081e
strip whitespace from me:data and me:sig (per spec)
2010-08-07 09:48:21 -04:00
7e55fc0044
OStatus/FeedSub: tweaked PuSH feed garbage collection so other plugins can declare usage of a low-level feed or an OStatus profile besides profile subscriptions & group memberships.
...
SubMirror: redid add-mirror frontend to accept a feed URL, then pass that on to OStatus, instead of pulling from your subscriptions.
Profile: tweaked subscriberCount() so it doesn't subtract 1 for foreign profiles who aren't subscribed to themselves; instead excludes the self-subscription in the count query.
Memcached_DataObject: tweak to avoid extra error spew in the DB error raising
Work in progress: tweaking feedsub garbage collection so we can count other uses
2010-08-06 11:49:52 -07:00
2ba36fc242
Merge branch 'activityhooks' into 0.9.x
...
Conflicts:
classes/Notice.php
2010-08-03 16:01:18 -07:00
f83171824f
correctly show <source> for atom feeds
2010-08-03 15:50:21 -07:00
8120842780
Fix for #2429 - move OStatus XML writing to XMLStringer
2010-08-02 16:42:28 -04:00
56294016a7
fix #2478 - ensure all XRD documents get proper content-type headers
2010-08-02 14:47:13 -04:00
517c7483d1
move to rel="salmon" (per latest spec)
2010-08-02 13:24:38 -04:00
1339f1f908
Commit hubprepqueuehandler.php -- fix for OStatus bulk output.
2010-07-12 14:24:43 -07:00
d645b342ac
Commit hubprepqueuehandler.php -- fix for OStatus bulk output.
2010-07-12 14:22:36 -07:00
21f253c584
Fix regression in OStatus remote group subscribe -- a bug was previously masked silently (call to nonexistent getProfileUrl() method on User_group -- now replaced with homeUrl() which does the thing we wanted here)
2010-06-29 10:31:30 -04:00
d88b208edc
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OpenID/openid.php
2010-06-07 10:19:40 -07:00
41e9dba729
OStatus plugin: Rolling batch queueing for PuSH output to >50 subscribing sites. Keeps latency down for other things enqueued while we work...
2010-06-07 10:03:43 -07:00
8b9436e8ae
Option to divert PuSH items directly to the target site's queue when local
2010-06-03 18:06:55 -07:00
5f4c6ec626
Skip enqueueing to outgoing bridges on incoming remote messages. Twitter, Facebook, RSSCloud, and OStatus checks were enqueued on these when they'd never do anything but churn the queue servers.
...
Notice::isLocal() can replace a number of manual checks for $notice->is_local being LOCAL_PUBLIC or LOCAL_NONPUBLIC.
2010-06-03 16:58:45 -07:00
6eae5d6a7e
Merge branch 'testing' into 0.9.x
2010-05-21 13:15:08 -07:00
cbf2e7cfea
Avoid PHP notice about undefined array index when no avatar photo available from Google profile
2010-05-21 10:18:13 -07:00
7005ef6661
Merge branch 'testing' into 0.9.x
...
Conflicts:
plugins/OpenID/openidlogin.php
2010-05-19 12:51:25 -07:00
6187266205
- OStatusPlugin should return true if it doesn't need to handle source
...
attribution
- Remove stray break statement from NoticeList
2010-05-18 15:16:03 -07:00
1999b836c0
accept either salmon endpoint (until they're unified in the spec)
2010-05-14 16:43:41 -04:00
275002d88a
allow hyphens in subdomains for webfinger addresses
2010-05-14 16:43:41 -04:00
ce177400f8
- OStatusPlugin should return true if it doesn't need to handle source
...
attribution
- Remove stray break statement from NoticeList
2010-05-06 21:48:12 +00:00
e05415f621
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
locale/ca/LC_MESSAGES/statusnet.po
locale/de/LC_MESSAGES/statusnet.po
locale/statusnet.pot
2010-05-05 17:07:50 -07:00
5f5d9518bd
Avoid spewing giant debug backtrace into exception in certain OStatus subscription failure cases.
...
The code pattern 'new XXXException($e)' to chain exceptions doesn't actually work as intended, as exceptions are actually expecting a string message here.
This caused an implicit string conversion from HTTP_Request2_Exception, which is a PEAR_Exception, which defines an absurdly detailed __toString() method including a giant HTML table with a backtrace if you happen to be on a web request.
Simply passing $e->getMessage() instead clears this up, as we'll get the nice short message like 'Couldn't connect to tcp://blahblah:80'
2010-05-04 17:11:43 -07:00
67eeaa9cf4
Pull localization updates from 0.9.x branch
2010-05-03 12:27:44 -07:00
d811f14bed
Remove .po source files. Using pot files.
2010-04-30 01:57:22 +02:00
5ad2d0c30c
Update gettext localisation files.
2010-04-30 01:45:54 +02:00
ae2986527c
Pull localization updates from 0.9.x
2010-04-29 15:52:10 -07:00
2260d6ec7c
Merge branch 'testing' into 0.9.x
...
Conflicts:
index.php
2010-04-29 15:14:51 -07:00
9c8052e755
Rerun feed discovery and update the feed, salmon, and hub for the given OStatus remote profile. Restarts subscription fresh as well.
...
update-profile.php -sexample.com http://example.com/path/to/profile/url
2010-04-23 12:54:31 -07:00
fd9d520aeb
OStatus: CLI script to force a renewal on the given PuSH subscription. May help when we get out of sync with the hub.
...
php plugins/OStatus/scripts/resub-feed.php -smysite http://example.com/some/atom/feed
2010-04-22 06:14:40 +02:00
a129c455a2
Fix exceptions with bad gravatar URLs
2010-04-21 18:19:16 -07:00
056cce4b5e
Merge branch 'testing' into 0.9.x
2010-04-19 19:46:46 +02:00
acea534044
Disable the send-notice form at the top of the page OStatus subscription confirmation page to work around bugs in Cloudy theme.
...
This is really just a hack for the broken CSS in the Cloudy theme, I think; copying from other non-notice-navigation pages that do this as well. There will be plenty of others also broken.
2010-04-19 19:45:01 +02:00
76cce8a3c5
Merge branch 'master' into 0.9.x
2010-04-07 10:46:23 -04:00
d352e5f5c4
Handle attempt to subscribe a local user via their remote webfinger reference more gracefully.
...
The ensure* family of functions will now return an OStatusShadowException in this case, which gives us a pleasant error message instead of a giant exception backtrace when you do 'sub somebody@this.local.server'.
Can be extended later to allow actually using the local profile, since we could figure it out.
2010-04-06 16:35:24 -07:00
5dc169260d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-04-06 15:22:23 -07:00
3ac3bc32fc
Some localization cleanup and doc to aid in customization:
...
* added locale/en/LC_MESSAGES/statusnet.po to make it easier to start customizing English texts
* added notes to locale/README about customizing and how to disable languages you haven't customized
* renamed PO templates from *.po to *.pot to match general conventions and reduce confusion for people trying to find which file they're supposed to edit
2010-04-05 13:19:16 -07:00
dbaa93d1aa
Clean up and clarify output on fix-shadow.php
2010-04-05 11:21:17 -07:00
df9eb4164a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-31 12:48:24 -07:00
6046a6cc6a
Include meta charset header in saved HTML file for long OStatus messages; without, DOMDocument::loadHTML assumed Latin-1 instead of UTF-8.
2010-03-29 16:29:57 -07:00
990bbea07e
Include meta charset header in saved HTML file for long OStatus messages; without, DOMDocument::loadHTML assumed Latin-1 instead of UTF-8.
2010-03-29 16:27:50 -07:00
f0d905112e
Merge branch 'master' into 0.9.x
...
Conflicts:
lib/attachmentlist.php
2010-03-28 15:25:02 -04:00
3227122ac3
move base64_url_(encode|decode) to static functions in Magicsig
2010-03-26 10:43:41 -07:00
75b2bf2a4e
Do ostatus queue first
...
We do the OStatus queue first, so if we're sending a notice to the
same server twice (e.g., with OMB), our richer and more featureful
notice comes in first.
2010-03-26 08:45:23 -04:00
e91bf2b8a9
Tweak to OStatus long message cropping: use original source notice URL for the link in the text version, don't shorten the link for the HTML so we can append params to it in JS.
...
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
2010-03-25 16:08:09 -07:00
013647f0ba
Add doc comments on saveHTMLFile; drop the extra <div> wrapping the contents to make it easier to extract without getting extra markup.
2010-03-25 23:11:06 +01:00
8336e24179
Using … (hellip) instead of "more" for link text
2010-03-25 22:18:21 +01:00
c11064a539
Updated 'more' anchor for attachments to do an XHR GET
...
Conflicts:
lib/attachmentlist.php
plugins/OStatus/classes/Ostatus_profile.php
Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
2010-03-25 14:15:54 -07:00
ecb009bcf5
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-24 13:57:20 -07:00
9e0b9857f4
Make sure we're requiring the library
2010-03-24 15:26:03 -04:00
cfca789b34
Updated Math_Biginteger from upstream - removing safe* workarounds
2010-03-24 15:18:41 -04:00
c4273f0ef3
Check for 0.9.0 bad keys from old Crypt_RSA library
2010-03-24 15:15:20 -04:00
10410907a0
A bit safer checking in the keypair parsing
2010-03-24 14:27:35 -04:00
7b1b6045e6
Look for the first object in the Activity
2010-03-24 00:00:55 -07:00
fcf86b4fdf
Improve legibility of OStatus remote tests output
2010-03-23 18:56:40 -07:00
9380eed794
add a general PuSHed post and an @-reply back to a subscribee by name to OStatus remote test cases
2010-03-23 18:44:54 -07:00
2ae61307bb
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-23 14:20:14 -07:00
df8c9090c0
Add basic subscribe/unsubscribe test to OStatus test cases
2010-03-23 14:19:12 -07:00
5f32cf32cd
Don't spew XML parse warnings to output when checking a remote XRD page
2010-03-23 14:18:45 -07:00
a5c78a6f1a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-23 08:21:32 -07:00
5b0b6097e0
Fix reference. Look at the first ActivityObject in the list.
2010-03-22 21:48:21 -07:00
b8e97ac709
Some initial media parsing
...
- Activity now returns a list of activity objects
- Processing of photo objects
2010-03-22 18:55:17 -07:00
68a5fba248
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-22 17:08:05 -07:00
3678e7b89b
OStatus remote sending test cases. Doesn't actually run within PHPUnit right now, must be run from command line -- specify base URLs to two StatusNet sites that will be able to communicate with each other.
...
Current test run includes:
* register accounts (via web form)
* local post
* @-mention using path (@domain/path/to/user)
Subscriptions, webfinger mentions, various paths to subscription and unsubscription, etc to come.
2010-03-22 17:01:50 -07:00
26f49de0dd
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
lib/attachmentlist.php
2010-03-22 12:37:45 -07:00
27bfd1211d
Math_BigInteger doesn't correctly handle serialization/deserialization for a value of 0, which can end up spewing notices to output and otherwise intefering with Salmon signature setup and verification when using memcached.
...
Worked around this with a subclass that fixes the wakeup, used for the stored 0 value in the subclassed Crypt_RSA.
2010-03-22 12:17:45 -07:00
3bb639699c
Confirm there's actually user and domain portions of acct string before assigning things from output of explode(); avoids notice message when invalid input passed to main/xrd
2010-03-22 11:27:39 -07:00
a20880ee1e
Fixing HTTP Header LRDD parsing (sites in subdirectories need this)
2010-03-22 13:45:13 -04:00
edee1fc09e
ignore unrecognized object types
2010-03-22 08:17:14 -04:00
be7efe7504
Merge branch 'testing' into 0.9.x
2010-03-21 16:28:56 -07:00
fcb614d0eb
Pull <atom:author> info as well as <activity:actor> when we have an old-style ActivityStreams feed. This fixes subscription setup for Cliqset feeds, which currently have a bogus activity:actor/atom:id but a good atom:author/atom:uri
2010-03-21 16:25:12 -07:00
b228da628d
Accept 'tag' and other non-http id URIs in Ostatus_profile::getActivityObjectProfileURI().
...
(If there's not a valid ID we fall back to the link, which we do still validate as http/s.)
2010-03-21 15:46:28 -07:00
5d3bce49b8
OStatus profile setup cleanup
...
* drop OStatusPlugin::localProfileFromUrl(), we can just look up on user.uri
* clean up a few edge cases that returned null through Ostatus_profile::ensure* code paths, now throws clear exception when we can't find a feed from the given profile url
* add some doc comments on the ensure* methods
2010-03-21 15:18:37 -07:00
0f1f7ab79b
only use Posterous author data if it matches the profile URL
2010-03-21 07:37:58 -05:00
c2afdfbbf5
use Posterous element if available for RssChannel discovery
2010-03-20 17:18:55 -05:00
e458e9fe63
Merge branch 'testing' into 0.9.x
...
Conflicts:
lib/activity.php
2010-03-20 16:11:42 -05:00
fb2b45c68a
use feedEl for discovery
2010-03-20 09:46:22 -05:00
515acb8513
fall back to summary or title if content not available
2010-03-20 09:30:57 -05:00
25cb917523
Allow PuSH posts without author information
...
Superfeedr (sp.?) posts entries without author information. We can
assume that this is intended to be by the original author.
Re-structured the checks for entries that come in by PuSH so they can
either have no author or an empty author, but not a different author.
2010-03-20 08:25:56 -05:00
f558508784
handle RSS as well as Atom in Ostatus push hits
2010-03-20 07:23:13 -05:00
c0f6572001
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-20 06:44:55 -05:00
51283a1b34
try to make a nickname from the user profile url before using the URI
2010-03-20 06:44:38 -05:00
db0cf50f65
Avoid notices for accessing undefined array indices in hcard processing
2010-03-19 15:54:54 -07:00
a02e5b302b
Avoid notices for accessing undefined array indices in hcard processing
2010-03-19 15:54:16 -07:00
7e2af3dcae
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
2010-03-19 15:51:22 -07:00
c84c4c6839
OStatus: be a little laxer about attempts to start/stop PuSH subscriptions that were left in an inconsistent state.
...
Instead of aborting, we'll try to reconfirm the sub/unsub, which once confirmed will replace whatever the previous state was on the server side.
2010-03-19 15:47:43 -07:00
79ec565104
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-19 15:29:00 -07:00
db9e57f761
ensure from an RSS channel
2010-03-19 15:50:06 -05:00
5092f98c0d
return empty hints if no hcard in the html
2010-03-19 15:28:06 -05:00
1e03968d91
define a 'root' attribute for the channel or feed
2010-03-19 15:23:30 -05:00
b97400bd6f
clarify output on fixup-shadow.php
2010-03-19 11:17:56 -07:00
3d1c99c258
Merge branch 'ostatus-crop' of git@gitorious.org:~brion/statusnet/brion-fixes into 0.9.x
2010-03-19 10:27:03 -07:00
d2e6664132
Validate OStatus avatar URL before fetching.
2010-03-19 10:16:12 -07:00
9e3e1d3d56
Validate OStatus avatar URL before fetching.
2010-03-19 10:15:00 -07:00
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
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
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
08faff2278
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:55:21 -07:00
3e2e88b0df
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-18 17:19:28 -07:00
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
c8e3d08a8f
Fix notice warning about unused var -- was renamed during refactoring.
2010-03-18 15:11:25 -07:00
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
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
1de7badd78
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-18 10:55:20 -07:00
052466ceab
Using … (hellip) instead of "more" for link text
2010-03-18 14:26:30 +01:00
a764603e73
reverse order from delete, insert to insert, delete on ostatus conversion
2010-03-18 08:04:22 -05:00
f1af583e3e
catch exceptions in OStatus updates, log, and continue
2010-03-18 07:55:14 -05:00
d8a533274f
Updated 'more' anchor for attachments to do an XHR GET
2010-03-18 00:19:32 +01:00
dc71833ce6
Add doc comments on saveHTMLFile; drop the extra <div> wrapping the contents to make it easier to extract without getting extra markup.
2010-03-17 15:49:10 -07:00
a9c731798e
Tweak to OStatus long message cropping: use original source notice URL for the link in the text version, don't shorten the link for the HTML so we can append params to it in JS.
2010-03-17 14:16:43 -07:00
3a72c70b7e
When too-long messages come in via OStatus, mark the attachment link up as a "more" link in the HTML output, marked with class="attachment more" so JS code can fold it out smartly. Text output will still include the raw link.
2010-03-17 12:34:35 -07:00
67f2f01c5e
Merge branch 'testing' into 0.9.x
2010-03-17 12:15:40 -07:00
4761c07ad8
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-17 09:38:39 -05:00
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
2b684f6954
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-15 14:39:14 -07:00
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
Evan Prodromou
Ian Denhardt
Siebrand Mazeland
Matt Lee
Craig Andrews
Brion Vibber
James Walker
Zach Copley
Siebrand Mazeland
Sarven Capadisli