Commit Graph

10168 Commits

Author SHA1 Message Date
Brion Vibber
e68d2c9015 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-05-25 13:11:36 -07:00
Brion Vibber
95159112b2 Hotpatch for infinite redirection-following loop seen processing URLs to http://clojure.org/ -- if we end up with an unstable redirect target (final item in a redirect chain ends up redirecting us somewhere else when we visit it again), just save the last version we saw instead of trying to start over.
Pretty much everything in File and File_redirection initial processing needs to be rewritten to be non-awful; this code is very hard to follow and very easy to make huge bugs. A fair amount of the complication is probably obsoleted by the redirection following being built into HTTPClient now.
2010-05-25 13:09:21 -07:00
Brion Vibber
3d4ce6f10b Revert "Backing out locale switch change to see if this affects our mystery memory leak."
This reverts commit f98609204f.
2010-05-25 12:31:16 -07:00
Brion Vibber
f98609204f Backing out locale switch change to see if this affects our mystery memory leak.
Revert "Locale switch cleanup: use common_switch_locale() which is safer for updating gettext state. Also moved a few calls to reduce chance of hitting an exception before switching back."

This reverts commit 74a89b1fc3.
2010-05-25 11:36:42 -07:00
Zach Copley
09dab2ce5a Dequeue notice when we hit any Facebook error. 2010-05-25 15:40:38 +00:00
Siebrand Mazeland
db603a39f8 Localisation updates from http://translatewiki.net 2010-05-25 13:41:23 +02:00
Brenda Wallace
f429c1aaa0 the sent column wasn't being populated, needed default 2010-05-25 16:25:35 +12:00
Zach Copley
9cde924bb3 Accidentally used the wrong log level (LOG ERROR instead of LOG_ERR) 2010-05-24 23:27:53 +00:00
Zach Copley
1f3a16bbfb Clear up warnings I introduced by refactoring Facebook posting 2010-05-24 22:41:34 +00:00
Zach Copley
777ca74500 Upgrade Facebook posting:
- Use FQL to check for publish stream permission instead of old REST API
- Better error handling, especially for error code 100
- More logging / better log messages
2010-05-24 21:54:10 +00:00
Zach Copley
8d87514727 Upgrade to latest old REST API library (0.1.0) 2010-05-24 21:44:40 +00:00
Brion Vibber
f7add6f25f Handle funky notice deletion cases more gracefully: if we already have a deleted_notice entry, don't freak out when we try to save it again on the second try. 2010-05-24 07:47:15 -07:00
Brion Vibber
dc22ed8480 Hotpatch for Facebook mirror problems: drop messages when hitting rate limit (err 341) instead of retrying forever. On unknown errors, now throwing an exception so it'll hit the message retry limits. 2010-05-22 17:43:56 -07:00
Brenda Wallace
bfef918482 queue_item in _pg now matches mysql 2010-05-22 20:52:53 +12:00
Brenda Wallace
249c820559 migration of data in queue_item to new table 2010-05-22 20:50:30 +12:00
Brenda Wallace
f4d0f721c8 fixed up comment syntax 2010-05-22 20:09:51 +12:00
Brenda Wallace
d7d49942f7 Merge commit 'mainline/0.9.x' into 0.9.x 2010-05-22 20:06:18 +12:00
Brenda Wallace
fa4a2d3485 added verifier and verified_callback to postgres schema and update script 2010-05-22 20:04:46 +12:00
Brion Vibber
07ac946717 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-05-21 14:09:05 -07:00
Brion Vibber
2062298755 Add $config['queue']['stomp_enqueue_to'] override for which queue server to send to.
Must be set to a value that matches one of the entries in $config['queue']['stomp_server'] array, otherwise ignored.
2010-05-21 14:07:59 -07:00
Evan Prodromou
6d8e01ad13 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-05-21 16:47:57 -04:00
Brion Vibber
6eae5d6a7e Merge branch 'testing' into 0.9.x 2010-05-21 13:15:08 -07:00
Brion Vibber
87b8a89aa7 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-05-21 13:12:25 -07:00
Zach Copley
afd81a540a Add TweetDeck to notice sources 2010-05-21 10:30:32 -07:00
Zach Copley
bbfd6eff0c Add TweetDeck to notice sources 2010-05-21 10:29:43 -07:00
Brion Vibber
cbf2e7cfea Avoid PHP notice about undefined array index when no avatar photo available from Google profile 2010-05-21 10:18:13 -07:00
Brion Vibber
2c12d837c6 Disable SSL peer/hostname verification for HTTPClient unless we've configured a trusted CA bundle like this: $config['http']['ssl_cafile'] = '/usr/lib/ssl/certs/ca-certificates.crt';
The previous state was failing on all HTTPS hits due to HTTP_Request2 library turning on the validation check but not specifying a CA file.
2010-05-21 10:12:39 -07:00
Brenda Wallace
8395925247 added comsumer_secret to consumer table on postgres 2010-05-21 21:09:40 +12:00
Brenda Wallace
069a38e624 add comsumer_secret column to consumer 2010-05-21 21:04:57 +12:00
Brion Vibber
68305d4b68 Added block link to subscription notification emails; block action can now take a profile ID on the URL; added profile details to block page so there's an indication of who you're blocking before you pull the trigger.
Fixed typo in RedirectingAction when no return-to data provided in form submission.
RedirectingAction::returnToArgs() has been renamed to returnToPrevious() to avoid conflict with Action::returnToArgs() which returns arguments to be passed to other actions as return-to arguments. All callers should now be updated.
More profile settings actions will now redirect through a login form if visited as a GET request, as would be expected from a bookmark, link sent in e-mail etc.
2010-05-20 14:24:44 -07:00
Brion Vibber
708d22848e Quick fix for creating OpenID accounts authenticating against a MediaWiki site; trim the 'User:' etc from the final path segment before generating a nickname from it. Avoids ending up with nicks like 'userbrion' on your first OpenID login! 2010-05-19 16:19:06 -07:00
Brion Vibber
ad651c3535 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-05-19 15:46:39 -07:00
Brion Vibber
223795a2e4 Add config option for RequireValidatedEmail plugin to skip the check for folks with a trusted OpenID association.
Also added an event that other plugins or local config can use to override the checks.
2010-05-19 15:45:46 -07:00
Zach Copley
8dd2924674 Hotpatch to add additional debug statements to FacebookPlugin's
facebook posting code.
2010-05-19 21:02:18 +00:00
Brion Vibber
7005ef6661 Merge branch 'testing' into 0.9.x
Conflicts:
	plugins/OpenID/openidlogin.php
2010-05-19 12:51:25 -07:00
Brion Vibber
a39a934dd4 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-05-19 10:59:14 -07:00
Brion Vibber
74a89b1fc3 Locale switch cleanup: use common_switch_locale() which is safer for updating gettext state. Also moved a few calls to reduce chance of hitting an exception before switching back.
Should help with problems where xmppdaemon would get stuck in wrong locale.
2010-05-19 10:10:55 -07:00
Zach Copley
114df39822 Need to always emit statusnet:notice_info so it's available in profile feeds 2010-05-18 15:17:05 -07:00
Zach Copley
5ea019c41a Remove errant double HTML entity encoding in API source attribution 2010-05-18 15:16:23 -07:00
Zach Copley
3708341857 Allow OStatusPlugin to set the source attribution title 2010-05-18 15:16:13 -07:00
Zach Copley
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
Zach Copley
0dfef88cac HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them 2010-05-18 15:15:52 -07:00
Zach Copley
68634f0496 Add source link attr to statusnet:notice_info element in Atom output for notices 2010-05-18 15:15:41 -07:00
Zach Copley
c78f67aa73 Refactor and centralize notice source link calculation 2010-05-18 15:15:27 -07:00
Zach Copley
d9fddff539 Add xmlns:statusnet and statusnet:notice_info element to Atom entries for notices 2010-05-18 15:15:14 -07:00
Brion Vibber
14a76926a2 Redirect non-SSL hits to login & register actions to SSL if 'always' or 'sometimes' SSL modes are kicked in.
The forms would already submit to SSL, but people are happier if they start on a secure page!

Note: this really should be done for sensitive/all URLs in index.php, but it seems a bit awkward to reconstruct the SSL version of the link atm. Cleanup todo!
2010-05-18 21:52:17 +00:00
Brion Vibber
813bbc912d typo fix in en_GB localization (also updated @ translatewiki) 2010-05-18 13:44:23 -07:00
Brion Vibber
d0ba34e0f3 Merge branch 'openid-teams' into testing 2010-05-18 13:37:46 -07:00
Brion Vibber
7c828ae5f8 OpenID access control options: trusted provider URL, Launchpad team restrictions. Added an admin panel for setting these and OpenID-only mode, off by default.
To enable the admin panel:
    $config['admin']['panels'][] = 'openid';

Or to set them manually:
    $config['openid']['trusted_provider'] = 'https://login.ubuntu.net/';
    $config['openid']['required_team'] = 'my-project-cabal';
    $config['site']['openidonly'] = true;

OpenID-only mode can still be set from addPlugin() parameters as well for backwards compatibility.
Note: if it's set there, that value will override the setting from the database or config.php.

Note that team restrictions are only really meaningful if a trusted provider is set; otherwise,
any OpenID server could report back that users are members of the given team.

Restrictions are checked only at OpenID authentication time and will not kick off people currently
with a session open; existing remembered logins may also survive these changes.

Using code for Launchpad team support provided by Canonical under AGPLv3, pulled from r27 of
WordPress teams integration plugin:
    https://code.edge.launchpad.net/~canonical-isd-hackers/wordpress-teams-integration/trunk
2010-05-18 13:28:41 -07:00
Brion Vibber
d5b4df4097 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-05-18 13:21:23 -07:00