Merge branch 'testing' into 0.9.x
This commit is contained in:
commit
6eae5d6a7e
|
@ -87,13 +87,15 @@ class BlockAction extends ProfileFormAction
|
|||
{
|
||||
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||
if ($this->arg('no')) {
|
||||
$this->returnToArgs();
|
||||
$this->returnToPrevious();
|
||||
} elseif ($this->arg('yes')) {
|
||||
$this->handlePost();
|
||||
$this->returnToArgs();
|
||||
$this->returnToPrevious();
|
||||
} else {
|
||||
$this->showPage();
|
||||
}
|
||||
} else {
|
||||
$this->showPage();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -118,6 +120,12 @@ class BlockAction extends ProfileFormAction
|
|||
*/
|
||||
function areYouSureForm()
|
||||
{
|
||||
// @fixme if we ajaxify the confirmation form, skip the preview on ajax hits
|
||||
$profile = new ArrayWrapper(array($this->profile));
|
||||
$preview = new ProfileList($profile, $this);
|
||||
$preview->show();
|
||||
|
||||
|
||||
$id = $this->profile->id;
|
||||
$this->elementStart('form', array('id' => 'block-' . $id,
|
||||
'method' => 'post',
|
||||
|
@ -187,4 +195,38 @@ class BlockAction extends ProfileFormAction
|
|||
$this->autofocus('form_action-yes');
|
||||
}
|
||||
|
||||
/**
|
||||
* Override for form session token checks; on our first hit we're just
|
||||
* requesting confirmation, which doesn't need a token. We need to be
|
||||
* able to take regular GET requests from email!
|
||||
*
|
||||
* @throws ClientException if token is bad on POST request or if we have
|
||||
* confirmation parameters which could trigger something.
|
||||
*/
|
||||
function checkSessionToken()
|
||||
{
|
||||
if ($_SERVER['REQUEST_METHOD'] == 'POST' ||
|
||||
$this->arg('yes') ||
|
||||
$this->arg('no')) {
|
||||
|
||||
return parent::checkSessionToken();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* If we reached this form without returnto arguments, return to the
|
||||
* current user's subscription list.
|
||||
*
|
||||
* @return string URL
|
||||
*/
|
||||
function defaultReturnTo()
|
||||
{
|
||||
$user = common_current_user();
|
||||
if ($user) {
|
||||
return common_local_url('subscribers',
|
||||
array('nickname' => $user->nickname));
|
||||
} else {
|
||||
return common_local_url('public');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -92,10 +92,10 @@ class DeleteuserAction extends ProfileFormAction
|
|||
{
|
||||
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||
if ($this->arg('no')) {
|
||||
$this->returnToArgs();
|
||||
$this->returnToPrevious();
|
||||
} elseif ($this->arg('yes')) {
|
||||
$this->handlePost();
|
||||
$this->returnToArgs();
|
||||
$this->returnToPrevious();
|
||||
} else {
|
||||
$this->showPage();
|
||||
}
|
||||
|
|
|
@ -117,7 +117,7 @@ class GroupblockAction extends RedirectingAction
|
|||
parent::handle($args);
|
||||
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||
if ($this->arg('no')) {
|
||||
$this->returnToArgs();
|
||||
$this->returnToPrevious();
|
||||
} elseif ($this->arg('yes')) {
|
||||
$this->blockProfile();
|
||||
} elseif ($this->arg('blockto')) {
|
||||
|
@ -207,7 +207,7 @@ class GroupblockAction extends RedirectingAction
|
|||
return false;
|
||||
}
|
||||
|
||||
$this->returnToArgs();
|
||||
$this->returnToPrevious();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -304,4 +304,7 @@ $default =
|
|||
array('subscribers' => true,
|
||||
'members' => true,
|
||||
'peopletag' => true),
|
||||
'http' => // HTTP client settings when contacting other sites
|
||||
array('ssl_cafile' => false // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt')
|
||||
),
|
||||
);
|
||||
|
|
|
@ -133,6 +133,18 @@ class HTTPClient extends HTTP_Request2
|
|||
// it gracefully in that case as well.
|
||||
$this->config['protocol_version'] = '1.0';
|
||||
|
||||
// Default state of OpenSSL seems to have no trusted
|
||||
// SSL certificate authorities, which breaks hostname
|
||||
// verification and means we have a hard time communicating
|
||||
// with other sites' HTTPS interfaces.
|
||||
//
|
||||
// Turn off verification unless we've configured a CA bundle.
|
||||
if (common_config('http', 'ssl_cafile')) {
|
||||
$this->config['ssl_cafile'] = common_config('http', 'ssl_cafile');
|
||||
} else {
|
||||
$this->config['ssl_verify_peer'] = false;
|
||||
}
|
||||
|
||||
parent::__construct($url, $method, $config);
|
||||
$this->setHeader('User-Agent', $this->userAgent());
|
||||
}
|
||||
|
|
10
lib/mail.php
10
lib/mail.php
|
@ -245,6 +245,11 @@ function mail_subscribe_notify_profile($listenee, $other)
|
|||
$other->getBestName(),
|
||||
common_config('site', 'name'));
|
||||
|
||||
$blocklink = sprintf(_("If you believe this account is being used abusively, " .
|
||||
"you can block them from your subscribers list and " .
|
||||
"report as spam to site administrators at %s"),
|
||||
common_local_url('block', array('profileid' => $other->id)));
|
||||
|
||||
// TRANS: Main body of new-subscriber notification e-mail
|
||||
$body = sprintf(_('%1$s is now listening to your notices on %2$s.'."\n\n".
|
||||
"\t".'%3$s'."\n\n".
|
||||
|
@ -264,9 +269,10 @@ function mail_subscribe_notify_profile($listenee, $other)
|
|||
($other->homepage) ?
|
||||
// TRANS: Profile info line in new-subscriber notification e-mail
|
||||
sprintf(_("Homepage: %s"), $other->homepage) . "\n" : '',
|
||||
($other->bio) ?
|
||||
(($other->bio) ?
|
||||
// TRANS: Profile info line in new-subscriber notification e-mail
|
||||
sprintf(_("Bio: %s"), $other->bio) . "\n\n" : '',
|
||||
sprintf(_("Bio: %s"), $other->bio) . "\n" : '') .
|
||||
"\n\n" . $blocklink . "\n",
|
||||
common_config('site', 'name'),
|
||||
common_local_url('emailsettings'));
|
||||
|
||||
|
|
|
@ -60,7 +60,16 @@ class ProfileFormAction extends RedirectingAction
|
|||
$this->checkSessionToken();
|
||||
|
||||
if (!common_logged_in()) {
|
||||
$this->clientError(_('Not logged in.'));
|
||||
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||
$this->clientError(_('Not logged in.'));
|
||||
} else {
|
||||
// Redirect to login.
|
||||
common_set_returnto($this->selfUrl());
|
||||
$user = common_current_user();
|
||||
if (Event::handle('RedirectToLogin', array($this, $user))) {
|
||||
common_redirect(common_local_url('login'), 303);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -97,7 +106,7 @@ class ProfileFormAction extends RedirectingAction
|
|||
|
||||
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||
$this->handlePost();
|
||||
$this->returnToArgs();
|
||||
$this->returnToPrevious();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -53,12 +53,13 @@ class RedirectingAction extends Action
|
|||
*
|
||||
* To be called only after successful processing.
|
||||
*
|
||||
* @fixme rename this -- it obscures Action::returnToArgs() which
|
||||
* returns a list of arguments, and is a bit confusing.
|
||||
* Note: this was named returnToArgs() up through 0.9.2, which
|
||||
* caused problems because there's an Action::returnToArgs()
|
||||
* already which does something different.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
function returnToArgs()
|
||||
function returnToPrevious()
|
||||
{
|
||||
// Now, gotta figure where we go back to
|
||||
$action = false;
|
||||
|
@ -77,7 +78,7 @@ class RedirectingAction extends Action
|
|||
if ($action) {
|
||||
common_redirect(common_local_url($action, $args, $params), 303);
|
||||
} else {
|
||||
$url = $this->defaultReturnToUrl();
|
||||
$url = $this->defaultReturnTo();
|
||||
}
|
||||
common_redirect($url, 303);
|
||||
}
|
||||
|
|
|
@ -136,6 +136,11 @@ class Router
|
|||
$m->connect('main/'.$a, array('action' => $a));
|
||||
}
|
||||
|
||||
// Also need a block variant accepting ID on URL for mail links
|
||||
$m->connect('main/block/:profileid',
|
||||
array('action' => 'block'),
|
||||
array('profileid' => '[0-9]+'));
|
||||
|
||||
$m->connect('main/sup/:seconds', array('action' => 'sup'),
|
||||
array('seconds' => '[0-9]+'));
|
||||
|
||||
|
|
|
@ -1939,6 +1939,15 @@ function common_url_to_nickname($url)
|
|||
$path = preg_replace('@/$@', '', $parts['path']);
|
||||
$path = preg_replace('@^/@', '', $path);
|
||||
$path = basename($path);
|
||||
|
||||
// Hack for MediaWiki user pages, in the form:
|
||||
// http://example.com/wiki/User:Myname
|
||||
// ('User' may be localized.)
|
||||
if (strpos($path, ':')) {
|
||||
$parts = array_filter(explode(':', $path));
|
||||
$path = $parts[count($parts) - 1];
|
||||
}
|
||||
|
||||
if ($path) {
|
||||
return common_nicknamize($path);
|
||||
}
|
||||
|
|
|
@ -104,9 +104,13 @@ function facebookBroadcastNotice($notice)
|
|||
|
||||
$status = "$prefix $notice->content";
|
||||
|
||||
common_debug("FacebookPlugin - checking for publish_stream permission for user $user->id");
|
||||
|
||||
$can_publish = $facebook->api_client->users_hasAppPermission('publish_stream',
|
||||
$fbuid);
|
||||
|
||||
common_debug("FacebookPlugin - checking for status_update permission for user $user->id");
|
||||
|
||||
$can_update = $facebook->api_client->users_hasAppPermission('status_update',
|
||||
$fbuid);
|
||||
if (!empty($attachments) && $can_publish == 1) {
|
||||
|
@ -114,15 +118,15 @@ function facebookBroadcastNotice($notice)
|
|||
$facebook->api_client->stream_publish($status, $fbattachment,
|
||||
null, null, $fbuid);
|
||||
common_log(LOG_INFO,
|
||||
"Posted notice $notice->id w/attachment " .
|
||||
"FacebookPlugin - Posted notice $notice->id w/attachment " .
|
||||
"to Facebook user's stream (fbuid = $fbuid).");
|
||||
} elseif ($can_update == 1 || $can_publish == 1) {
|
||||
$facebook->api_client->users_setStatus($status, $fbuid, false, true);
|
||||
common_log(LOG_INFO,
|
||||
"Posted notice $notice->id to Facebook " .
|
||||
"FacebookPlugin - Posted notice $notice->id to Facebook " .
|
||||
"as a status update (fbuid = $fbuid).");
|
||||
} else {
|
||||
$msg = "Not sending notice $notice->id to Facebook " .
|
||||
$msg = "FacebookPlugin - Not sending notice $notice->id to Facebook " .
|
||||
"because user $user->nickname hasn't given the " .
|
||||
'Facebook app \'status_update\' or \'publish_stream\' permission.';
|
||||
common_log(LOG_WARNING, $msg);
|
||||
|
@ -138,7 +142,7 @@ function facebookBroadcastNotice($notice)
|
|||
|
||||
$code = $e->getCode();
|
||||
|
||||
$msg = "Facebook returned error code $code: " .
|
||||
$msg = "FacebookPlugin - Facebook returned error code $code: " .
|
||||
$e->getMessage() . ' - ' .
|
||||
"Unable to update Facebook status (notice $notice->id) " .
|
||||
"for $user->nickname (user id: $user->id)!";
|
||||
|
|
|
@ -84,7 +84,7 @@ class DiscoveryHints {
|
|||
$hints['fullname'] = implode(' ', $hcard['n']);
|
||||
}
|
||||
|
||||
if (array_key_exists('photo', $hcard)) {
|
||||
if (array_key_exists('photo', $hcard) && count($hcard['photo'])) {
|
||||
$hints['avatar'] = $hcard['photo'][0];
|
||||
}
|
||||
|
||||
|
|
|
@ -12,6 +12,20 @@ registered prior to that timestamp.
|
|||
addPlugin('RequireValidatedEmail',
|
||||
array('grandfatherCutoff' => 'Dec 7, 2009');
|
||||
|
||||
You can also exclude the validation checks from OpenID accounts
|
||||
connected to a trusted provider, by providing a list of regular
|
||||
expressions to match their provider URLs.
|
||||
|
||||
For example, to trust WikiHow and Wikipedia users:
|
||||
|
||||
addPlugin('RequireValidatedEmailPlugin', array(
|
||||
'trustedOpenIDs' => array(
|
||||
'!^http://\w+\.wikihow\.com/!',
|
||||
'!^http://\w+\.wikipedia\.org/!',
|
||||
),
|
||||
));
|
||||
|
||||
|
||||
|
||||
Todo:
|
||||
* add a more visible indicator that validation is still outstanding
|
||||
|
|
|
@ -37,6 +37,20 @@ class RequireValidatedEmailPlugin extends Plugin
|
|||
// without the validation requirement.
|
||||
public $grandfatherCutoff=null;
|
||||
|
||||
// If OpenID plugin is installed, users with a verified OpenID
|
||||
// association whose provider URL matches one of these regexes
|
||||
// will be considered to be sufficiently valid for our needs.
|
||||
//
|
||||
// For example, to trust WikiHow and Wikipedia OpenID users:
|
||||
//
|
||||
// addPlugin('RequireValidatedEmailPlugin', array(
|
||||
// 'trustedOpenIDs' => array(
|
||||
// '!^http://\w+\.wikihow\.com/!',
|
||||
// '!^http://\w+\.wikipedia\.org/!',
|
||||
// ),
|
||||
// ));
|
||||
public $trustedOpenIDs=array();
|
||||
|
||||
function __construct()
|
||||
{
|
||||
parent::__construct();
|
||||
|
@ -90,13 +104,17 @@ class RequireValidatedEmailPlugin extends Plugin
|
|||
*/
|
||||
protected function validated($user)
|
||||
{
|
||||
if ($this->grandfathered($user)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// The email field is only stored after validation...
|
||||
// Until then you'll find them in confirm_address.
|
||||
return !empty($user->email);
|
||||
$knownGood = !empty($user->email) ||
|
||||
$this->grandfathered($user) ||
|
||||
$this->hasTrustedOpenID($user);
|
||||
|
||||
// Give other plugins a chance to override, if they can validate
|
||||
// that somebody's ok despite a non-validated email.
|
||||
Event::handle('RequireValidatedEmailPlugin_Override', array($user, &$knownGood));
|
||||
|
||||
return $knownGood;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -118,6 +136,28 @@ class RequireValidatedEmailPlugin extends Plugin
|
|||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Override for RequireValidatedEmail plugin. If we have a user who's
|
||||
* not validated an e-mail, but did come from a trusted provider,
|
||||
* we'll consider them ok.
|
||||
*/
|
||||
function hasTrustedOpenID($user)
|
||||
{
|
||||
if ($this->trustedOpenIDs && class_exists('User_openid')) {
|
||||
foreach ($this->trustedOpenIDs as $regex) {
|
||||
$oid = new User_openid();
|
||||
$oid->user_id = $user->id;
|
||||
$oid->find();
|
||||
while ($oid->fetch()) {
|
||||
if (preg_match($regex, $oid->canonical)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function onPluginVersion(&$versions)
|
||||
{
|
||||
$versions[] = array('name' => 'Require Validated Email',
|
||||
|
|
|
@ -81,7 +81,7 @@ class ClearflagAction extends ProfileFormAction
|
|||
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||
$this->handlePost();
|
||||
if (!$this->boolean('ajax')) {
|
||||
$this->returnToArgs();
|
||||
$this->returnToPrevious();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -87,7 +87,7 @@ class FlagprofileAction extends ProfileFormAction
|
|||
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||
$this->handlePost();
|
||||
if (!$this->boolean('ajax')) {
|
||||
$this->returnToArgs();
|
||||
$this->returnToPrevious();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user