We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 1543af74 authored by Zach Copley's avatar Zach Copley

Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

* 'testing' of gitorious.org:statusnet/mainline: (63 commits)
  Add a scary 'experimental feture' warning & are-you-sure prompt on moveuser.php
  fix wrong datatypes (saving string instead of array) in AtomPub notice processing
  Account moving is a background activity
  return a 409 Conflict when subscription already exists
  OStatusPlugin does discovery in Profile::fromURI()
  considerably more logging and error checking in AccountMover
  add a log method to AccountMover
  normalize accounts and check for return in HTTP for moving
  move account-moving classes to their own libraries
  execution protection on discovery.php
  PHPCS discovery.php
  Move discovery library from OStatus plugin to core
  Revert "Revert "0.9.7alpha1""
  first example of moving a user
  Parse properties of links in XRD files
  Add the Atom username to the XRD output
  preserve activities in object
  let callers pass in an XMLOutputter to output to
  execution protection on discovery.php
  PHPCS linkheader.php
  ...
parents e475bdfe 4026e208
...@@ -427,11 +427,11 @@ class ApiTimelineUserAction extends ApiBareAuthAction ...@@ -427,11 +427,11 @@ class ApiTimelineUserAction extends ApiBareAuthAction
$profile = Profile::fromURI($uri); $profile = Profile::fromURI($uri);
if (!empty($profile)) { if (!empty($profile)) {
$options['replies'] = $uri; $options['replies'][] = $uri;
} else { } else {
$group = User_group::staticGet('uri', $uri); $group = User_group::staticGet('uri', $uri);
if (!empty($group)) { if (!empty($group)) {
$options['groups'] = $uri; $options['groups'][] = $uri;
} else { } else {
// @fixme: hook for discovery here // @fixme: hook for discovery here
common_log(LOG_WARNING, sprintf(_('AtomPub post with unknown attention URI %s'), $uri)); common_log(LOG_WARNING, sprintf(_('AtomPub post with unknown attention URI %s'), $uri));
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2010, StatusNet, Inc. * Copyright (C) 2010, StatusNet, Inc.
* *
* Single subscription * Single subscription
* *
* PHP version 5 * PHP version 5
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
...@@ -46,21 +46,19 @@ require_once INSTALLDIR . '/lib/apiauth.php'; ...@@ -46,21 +46,19 @@ require_once INSTALLDIR . '/lib/apiauth.php';
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class AtompubshowsubscriptionAction extends ApiAuthAction class AtompubshowsubscriptionAction extends ApiAuthAction
{ {
private $_subscriber = null; private $_subscriber = null;
private $_subscribed = null; private $_subscribed = null;
private $_subscription = null; private $_subscription = null;
/** /**
* For initializing members of the class. * For initializing members of the class.
* *
* @param array $argarray misc. arguments * @param array $argarray misc. arguments
* *
* @return boolean true * @return boolean true
*/ */
function prepare($argarray) function prepare($argarray)
{ {
parent::prepare($argarray); parent::prepare($argarray);
...@@ -69,6 +67,8 @@ class AtompubshowsubscriptionAction extends ApiAuthAction ...@@ -69,6 +67,8 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
$this->_subscriber = Profile::staticGet('id', $subscriberId); $this->_subscriber = Profile::staticGet('id', $subscriberId);
if (empty($this->_subscriber)) { if (empty($this->_subscriber)) {
// TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
// TRANS: %d is the non-existing profile ID number.
throw new ClientException(sprintf(_('No such profile id: %d'), throw new ClientException(sprintf(_('No such profile id: %d'),
$subscriberId), 404); $subscriberId), 404);
} }
...@@ -78,16 +78,20 @@ class AtompubshowsubscriptionAction extends ApiAuthAction ...@@ -78,16 +78,20 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
$this->_subscribed = Profile::staticGet('id', $subscribedId); $this->_subscribed = Profile::staticGet('id', $subscribedId);
if (empty($this->_subscribed)) { if (empty($this->_subscribed)) {
// TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
// TRANS: %d is the non-existing profile ID number.
throw new ClientException(sprintf(_('No such profile id: %d'), throw new ClientException(sprintf(_('No such profile id: %d'),
$subscribedId), 404); $subscribedId), 404);
} }
$this->_subscription = $this->_subscription =
Subscription::pkeyGet(array('subscriber' => $subscriberId, Subscription::pkeyGet(array('subscriber' => $subscriberId,
'subscribed' => $subscribedId)); 'subscribed' => $subscribedId));
if (empty($this->_subscription)) { if (empty($this->_subscription)) {
$msg = sprintf(_('Profile %d not subscribed to profile %d'), // TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
// TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
$msg = sprintf(_('Profile %1$d not subscribed to profile %2$d'),
$subscriberId, $subscribedId); $subscriberId, $subscribedId);
throw new ClientException($msg, 404); throw new ClientException($msg, 404);
} }
...@@ -102,7 +106,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction ...@@ -102,7 +106,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
* *
* @return void * @return void
*/ */
function handle($argarray=null) function handle($argarray=null)
{ {
parent::handle($argarray); parent::handle($argarray);
...@@ -115,6 +118,7 @@ class AtompubshowsubscriptionAction extends ApiAuthAction ...@@ -115,6 +118,7 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
$this->deleteSubscription(); $this->deleteSubscription();
break; break;
default: default:
// TRANS: Client error shown when using a non-supported HTTP method.
$this->clientError(_('HTTP method not supported.'), 405); $this->clientError(_('HTTP method not supported.'), 405);
return; return;
} }
...@@ -127,7 +131,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction ...@@ -127,7 +131,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
* *
* @return void * @return void
*/ */
function showSubscription() function showSubscription()
{ {
$activity = $this->_subscription->asActivity(); $activity = $this->_subscription->asActivity();
...@@ -146,13 +149,13 @@ class AtompubshowsubscriptionAction extends ApiAuthAction ...@@ -146,13 +149,13 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
* *
* @return void * @return void
*/ */
function deleteSubscription() function deleteSubscription()
{ {
if (empty($this->auth_user) || if (empty($this->auth_user) ||
$this->auth_user->id != $this->_subscriber->id) { $this->auth_user->id != $this->_subscriber->id) {
throw new ClientException(_("Can't delete someone else's". // TRANS: Client exception thrown when trying to delete a subscription of another user.
" subscription"), 403); throw new ClientException(_("Cannot delete someone else's ".
"subscription"), 403);
} }
Subscription::cancel($this->_subscriber, Subscription::cancel($this->_subscriber,
...@@ -168,7 +171,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction ...@@ -168,7 +171,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
* *
* @return boolean true * @return boolean true
*/ */
function isReadOnly($args) function isReadOnly($args)
{ {
if ($_SERVER['REQUEST_METHOD'] == 'DELETE') { if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {
...@@ -183,7 +185,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction ...@@ -183,7 +185,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
* *
* @return string last modified http header * @return string last modified http header
*/ */
function lastModified() function lastModified()
{ {
return max(strtotime($this->_subscriber->modified), return max(strtotime($this->_subscriber->modified),
...@@ -196,7 +197,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction ...@@ -196,7 +197,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
* *
* @return string etag http header * @return string etag http header
*/ */
function etag() function etag()
{ {
$mtime = strtotime($this->_subscription->modified); $mtime = strtotime($this->_subscription->modified);
...@@ -212,7 +212,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction ...@@ -212,7 +212,6 @@ class AtompubshowsubscriptionAction extends ApiAuthAction
* *
* @return boolean true if delete, else false * @return boolean true if delete, else false
*/ */
function requiresAuth() function requiresAuth()
{ {
if ($_SERVER['REQUEST_METHOD'] == 'DELETE') { if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {
......
...@@ -263,6 +263,14 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction ...@@ -263,6 +263,14 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
return; return;
} }
if (Subscription::exists($this->_profile, $profile)) {
// 409 Conflict
$this->clientError(sprintf(_('Already subscribed to %s'),
$person->id),
409);
return;
}
if (Subscription::start($this->_profile, $profile)) { if (Subscription::start($this->_profile, $profile)) {
$sub = Subscription::pkeyGet(array('subscriber' => $this->_profile->id, $sub = Subscription::pkeyGet(array('subscriber' => $this->_profile->id,
'subscribed' => $profile->id)); 'subscribed' => $profile->id));
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Copyright (C) 2010, StatusNet, Inc. * Copyright (C) 2010, StatusNet, Inc.
* *
* Delete your own account * Delete your own account
* *
* PHP version 5 * PHP version 5
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
...@@ -36,7 +36,7 @@ if (!defined('STATUSNET')) { ...@@ -36,7 +36,7 @@ if (!defined('STATUSNET')) {
/** /**
* Action to delete your own account * Action to delete your own account
* *
* Note that this is distinct from DeleteuserAction, which see. I thought * Note that this is distinct from DeleteuserAction, which see. I thought
* that making that action do both things (delete another user and delete the * that making that action do both things (delete another user and delete the
* current user) would open a lot of holes. I'm open to refactoring, however. * current user) would open a lot of holes. I'm open to refactoring, however.
...@@ -48,7 +48,6 @@ if (!defined('STATUSNET')) { ...@@ -48,7 +48,6 @@ if (!defined('STATUSNET')) {
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class DeleteaccountAction extends Action class DeleteaccountAction extends Action
{ {
private $_complete = false; private $_complete = false;
...@@ -61,19 +60,20 @@ class DeleteaccountAction extends Action ...@@ -61,19 +60,20 @@ class DeleteaccountAction extends Action
* *
* @return boolean true * @return boolean true
*/ */
function prepare($argarray) function prepare($argarray)
{ {
parent::prepare($argarray); parent::prepare($argarray);
$cur = common_current_user(); $cur = common_current_user();
if (empty($cur)) { if (empty($cur)) {
// TRANS: Client exception displayed trying to delete a user account while not logged in.
throw new ClientException(_("Only logged-in users ". throw new ClientException(_("Only logged-in users ".
"can delete their account."), 403); "can delete their account."), 403);
} }
if (!$cur->hasRight(Right::DELETEACCOUNT)) { if (!$cur->hasRight(Right::DELETEACCOUNT)) {
// TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
throw new ClientException(_("You cannot delete your account."), 403); throw new ClientException(_("You cannot delete your account."), 403);
} }
...@@ -87,7 +87,6 @@ class DeleteaccountAction extends Action ...@@ -87,7 +87,6 @@ class DeleteaccountAction extends Action
* *
* @return void * @return void
*/ */
function handle($argarray=null) function handle($argarray=null)
{ {
parent::handle($argarray); parent::handle($argarray);
...@@ -109,7 +108,6 @@ class DeleteaccountAction extends Action ...@@ -109,7 +108,6 @@ class DeleteaccountAction extends Action
* *
* @return boolean is read only action? * @return boolean is read only action?
*/ */
function isReadOnly($args) function isReadOnly($args)
{ {
return false; return false;
...@@ -122,7 +120,6 @@ class DeleteaccountAction extends Action ...@@ -122,7 +120,6 @@ class DeleteaccountAction extends Action
* *
* @return string last modified http header * @return string last modified http header
*/ */
function lastModified() function lastModified()
{ {
// For comparison with If-Last-Modified // For comparison with If-Last-Modified
...@@ -137,7 +134,6 @@ class DeleteaccountAction extends Action ...@@ -137,7 +134,6 @@ class DeleteaccountAction extends Action
* *
* @return string etag http header * @return string etag http header
*/ */
function etag() function etag()
{ {
return null; return null;
...@@ -145,7 +141,7 @@ class DeleteaccountAction extends Action ...@@ -145,7 +141,7 @@ class DeleteaccountAction extends Action
/** /**
* Delete the current user's account * Delete the current user's account
* *
* Checks for the "I am sure." string to make sure the user really * Checks for the "I am sure." string to make sure the user really
* wants to delete their account. * wants to delete their account.
* *
...@@ -156,13 +152,16 @@ class DeleteaccountAction extends Action ...@@ -156,13 +152,16 @@ class DeleteaccountAction extends Action
* *
* @return void * @return void
*/ */
function deleteAccount() function deleteAccount()
{ {
$this->checkSessionToken(); $this->checkSessionToken();
// !!! If this string is changed, it also needs to be changed in DeleteAccountForm::formData()
if ($this->trimmed('iamsure') != _('I am sure.')) { // TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
$this->_error = _('You must write "I am sure." exactly in the box.'); $iamsure = _('I am sure.');
if ($this->trimmed('iamsure') != $iamsure ) {
// TRANS: Notification for user about the text that must be input to be able to delete a user account.
// TRANS: %s is the text that needs to be input.
$this->_error = sprintf(_('You must write "%s" exactly in the box.'), $iamsure);
$this->showPage(); $this->showPage();
return; return;
} }
...@@ -191,7 +190,7 @@ class DeleteaccountAction extends Action ...@@ -191,7 +190,7 @@ class DeleteaccountAction extends Action
/** /**
* Shows the page content. * Shows the page content.
* *
* If the deletion is complete, just shows a completion message. * If the deletion is complete, just shows a completion message.