Fixing broken links during end of installation #26 - https://git.gnu.io/gnu/gnu-social/issues/26
See merge request !2
* @link http://status.net
*/
-if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); }
+if (!defined('GNUSOCIAL')) { exit(1); }
-class AllAction extends ProfileAction
+class AllAction extends ShowstreamAction
{
var $notice;
- protected function profileActionPreparation()
+ protected function getStream()
{
if ($this->scoped instanceof Profile && $this->scoped->isLocal() && $this->scoped->getUser()->streamModeOnly()) {
$stream = new InboxNoticeStream($this->target, $this->scoped);
$stream = new ThreadingInboxNoticeStream($this->target, $this->scoped);
}
- $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
- NOTICES_PER_PAGE + 1);
-
- if ($this->page > 1 && $this->notice->N == 0) {
- // TRANS: Client error when page not found (404).
- $this->clientError(_('No such page.'), 404);
- }
+ return $stream;
}
function title()
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
-class RepliesAction extends ManagedAction
+class RepliesAction extends ShowstreamAction
{
var $page = null;
var $notice;
- protected function doPreparation()
+ protected function getStream()
{
- $nickname = common_canonical_nickname($this->arg('nickname'));
-
- $this->user = User::getKV('nickname', $nickname);
-
- if (!$this->user instanceof User) {
- // TRANS: Client error displayed when trying to reply to a non-exsting user.
- $this->clientError(_('No such user.'));
- }
-
- $this->target = $this->user->getProfile();
-
- if (!$this->target instanceof Profile) {
- // TRANS: Error message displayed when referring to a user without a profile.
- $this->serverError(_('User has no profile.'));
- }
-
- $this->page = $this->int('page') ?: 1;
-
- common_set_returnto($this->selfUrl());
-
- $stream = new ReplyNoticeStream($this->target->getID(), $this->scoped);
-
- $this->notice = $stream->getNotices(($this->page-1) * NOTICES_PER_PAGE,
- NOTICES_PER_PAGE + 1);
-
- if ($this->page > 1 && $this->notice->N == 0) {
- // TRANS: Client error when page not found (404)
- $this->clientError(_('No such page.'), 404);
- }
+ return new ReplyNoticeStream($this->target->getID(), $this->scoped);
}
/**
{
var $notice;
+ protected function doPreparation()
+ {
+ // showstream requires a nickname
+ $nickname_arg = $this->arg('nickname');
+ $nickname = common_canonical_nickname($nickname_arg);
+
+ // Permanent redirect on non-canonical nickname
+
+ if ($nickname_arg != $nickname) {
+ $args = array('nickname' => $nickname);
+ if ($this->arg('page') && $this->arg('page') != 1) {
+ $args['page'] = $this->arg['page'];
+ }
+ common_redirect(common_local_url($this->getActionName(), $args), 301);
+ }
+ $this->user = User::getKV('nickname', $nickname);
+
+ if (!$this->user) {
+ $group = Local_group::getKV('nickname', $nickname);
+ if ($group instanceof Local_group) {
+ common_redirect($group->getProfile()->getUrl());
+ }
+ // TRANS: Client error displayed when calling a profile action without specifying a user.
+ $this->clientError(_('No such user.'), 404);
+ }
+
+ $this->target = $this->user->getProfile();
+ }
+
protected function profileActionPreparation()
+ {
+ $stream = $this->getStream();
+ $this->notice = $stream->getNotices(($this->page-1) * NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+
+ if ($this->page > 1 && $this->notice->N == 0) {
+ // TRANS: Client error when page not found (404).
+ $this->clientError(_('No such page.'), 404);
+ }
+ }
+
+ protected function getStream()
{
if (empty($this->tag)) {
$stream = new ProfileNoticeStream($this->target, $this->scoped);
$stream = new TaggedProfileNoticeStream($this->target, $this->tag, $this->scoped);
}
- $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-
- return true;
+ return $stream;
}
return array(new Feed(Feed::JSON,
common_local_url('ApiTimelineUser',
array(
- 'id' => $this->user->id,
+ 'id' => $this->target->getID(),
'format' => 'as')),
// TRANS: Title for link to notice feed.
// TRANS: %s is a user nickname.
new Feed(Feed::RSS2,
common_local_url('ApiTimelineUser',
array(
- 'id' => $this->user->id,
+ 'id' => $this->target->getID(),
'format' => 'rss')),
// TRANS: Title for link to notice feed.
// TRANS: %s is a user nickname.
new Feed(Feed::ATOM,
common_local_url('ApiTimelineUser',
array(
- 'id' => $this->user->id,
+ 'id' => $this->target->getID(),
'format' => 'atom')),
// TRANS: Title for link to notice feed.
// TRANS: %s is a user nickname.
function showEmptyListMessage()
{
// TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
- $message = sprintf(_('This is the timeline for %1$s, but %1$s hasn\'t posted anything yet.'), $this->target->nickname) . ' ';
+ $message = sprintf(_('This is the timeline for %1$s, but %1$s hasn\'t posted anything yet.'), $this->target->getNickname()) . ' ';
- if (common_logged_in()) {
- $current_user = common_current_user();
- if ($this->user->id === $current_user->id) {
+ if ($this->scoped instanceof Profile) {
+ if ($this->target->getID() === $this->scoped->getID()) {
// TRANS: Second sentence of empty list message for a stream for the user themselves.
$message .= _('Seen anything interesting recently? You haven\'t posted any notices yet, now would be a good time to start :)');
} else {
// TRANS: Second sentence of empty list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
// TRANS: This message contains a Markdown link. Keep "](" together.
- $message .= sprintf(_('You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->target->nickname, '@' . $this->target->nickname);
+ $message .= sprintf(_('You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->target->getNickname(), '@' . $this->target->getNickname());
}
}
else {
// TRANS: Second sentence of empty message for anonymous users. %s is a user nickname.
// TRANS: This message contains a Markdown link. Keep "](" together.
- $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->target->nickname);
+ $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->target->getNickname());
}
$this->elementStart('div', 'guide');
$this->showEmptyListMessage();
}
- $args = array('nickname' => $this->target->nickname);
+ $args = array('nickname' => $this->target->getNickname());
if (!empty($this->tag))
{
$args['tag'] = $this->tag;
$m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
'based on the Free Software [StatusNet](http://status.net/) tool. ' .
'[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'),
- $this->target->nickname, $this->target->nickname);
+ $this->target->getNickname(), $this->target->getNickname());
} else {
// TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
// TRANS: This message contains a Markdown link. Keep "](" together.
$m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
'based on the Free Software [StatusNet](http://status.net/) tool.'),
- $this->target->nickname, $this->target->nickname);
+ $this->target->getNickname(), $this->target->getNickname());
}
$this->elementStart('div', array('id' => 'anon_notice'));
$this->raw(common_markup_to_html($m));
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
/**
* User by ID action class.
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://status.net/
*/
-class UserbyidAction extends Action
+class UserbyidAction extends ShowstreamAction
{
- /**
- * Is read only?
- *
- * @return boolean true
- */
- function isReadOnly($args)
+ protected function doPreparation()
{
- return true;
- }
+ // accessing by ID just requires an ID, not a nickname
+ $this->target = Profile::getByID($this->trimmed('id'));
- /**
- * Class handler.
- *
- * @param array $args array of arguments
- *
- * @return nothing
- */
- protected function handle()
- {
- parent::handle();
- $id = $this->trimmed('id');
- if (!$id) {
- // TRANS: Client error displayed trying to find a user by ID without providing an ID.
- $this->clientError(_('No ID.'));
+ // For local users when accessed by id number, redirect with
+ // the nickname as argument instead of id.
+ if ($this->target->isLocal()) {
+ // Support redirecting to FOAF rdf/xml if the agent prefers it...
+ // Internet Explorer doesn't specify "text/html" and does list "*/*"
+ // at least through version 8. We need to list text/html up front to
+ // ensure that only user-agents who specifically ask for RDF get it.
+ $page_prefs = 'text/html,application/xhtml+xml,application/rdf+xml,application/xml;q=0.3,text/xml;q=0.2';
+ $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
+ $type = common_negotiate_type(common_accept_to_prefs($httpaccept),
+ common_accept_to_prefs($page_prefs));
+ $page = $type === 'application/rdf+xml' ? 'foaf' : 'showstream';
+ $url = common_local_url($page, array('nickname' => $this->target->getNickname()));
+ common_redirect($url, 303);
}
- $user = User::getKV($id);
- if (!$user) {
- // TRANS: Client error displayed trying to find a user by ID for a non-existing ID.
- $this->clientError(_('No such user.'));
- }
-
- // Support redirecting to FOAF rdf/xml if the agent prefers it...
- // Internet Explorer doesn't specify "text/html" and does list "*/*"
- // at least through version 8. We need to list text/html up front to
- // ensure that only user-agents who specifically ask for RDF get it.
- $page_prefs = 'text/html,application/xhtml+xml,application/rdf+xml,application/xml;q=0.3,text/xml;q=0.2';
- $httpaccept = isset($_SERVER['HTTP_ACCEPT'])
- ? $_SERVER['HTTP_ACCEPT'] : null;
- $type = common_negotiate_type(common_accept_to_prefs($httpaccept),
- common_accept_to_prefs($page_prefs));
- $page = $type == 'application/rdf+xml' ? 'foaf' : 'showstream';
- $url = common_local_url($page, array('nickname' => $user->nickname));
- common_redirect($url, 303);
}
}
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
-
-require_once INSTALLDIR.'/lib/profilelist.php';
+if (!defined('GNUSOCIAL')) { exit(1); }
// 10x8
parent::handle();
}
+ protected function doPreparation()
+ {
+ // showstream requires a nickname
+ $nickname_arg = $this->arg('nickname');
+ $nickname = common_canonical_nickname($nickname_arg);
+
+ // Permanent redirect on non-canonical nickname
+
+ if ($nickname_arg != $nickname) {
+ $args = array('nickname' => $nickname);
+ if ($this->arg('page') && $this->arg('page') != 1) {
+ $args['page'] = $this->arg['page'];
+ }
+ common_redirect(common_local_url($this->getActionName(), $args), 301);
+ }
+ $this->user = User::getKV('nickname', $nickname);
+
+ if (!$this->user) {
+ $group = Local_group::getKV('nickname', $nickname);
+ if ($group instanceof Local_group) {
+ common_redirect($group->getProfile()->getUrl());
+ }
+ // TRANS: Client error displayed when calling a profile action without specifying a user.
+ $this->clientError(_('No such user.'), 404);
+ }
+
+ $this->target = $this->user->getProfile();
+ }
+
function showContent()
{
$this->showTagsDropdown();
*/
const DISPLAY_FMT = '[0-9a-zA-Z_]{1,64}';
+ /**
+ * Simplified regex fragment for acceptable full WebFinger ID of a user
+ *
+ * We could probably use an email regex here, but mainly we are interested
+ * in matching it in our URLs, like https://social.example/user@example.com
+ */
+ const WEBFINGER_FMT = '[0-9a-zA-Z_]{1,64}\@[0-9a-zA-Z_-.]{3,255}';
+
/**
* Regex fragment for checking a canonical nickname.
*
protected $target = null; // Profile that we're showing
- protected function doPreparation()
+ protected function prepare(array $args=array())
{
- try {
- $nickname_arg = $this->arg('nickname');
- $nickname = common_canonical_nickname($nickname_arg);
+ // this will call ->doPreparation() which lower classes can use
+ parent::prepare($args);
- // Permanent redirect on non-canonical nickname
-
- if ($nickname_arg != $nickname) {
- $args = array('nickname' => $nickname);
- if ($this->arg('page') && $this->arg('page') != 1) {
- $args['page'] = $this->arg['page'];
- }
- common_redirect(common_local_url($this->getActionName(), $args), 301);
- }
- $this->user = User::getKV('nickname', $nickname);
-
- if (!$this->user) {
- $group = Local_group::getKV('nickname', $nickname);
- if ($group instanceof Local_group) {
- common_redirect($group->getProfile()->getUrl());
- }
- // TRANS: Client error displayed when calling a profile action without specifying a user.
- $this->clientError(_('No such user.'), 404);
- }
-
- $this->target = $this->user->getProfile();
- } catch (NicknameException $e) {
- $id = (int)$this->arg('id');
- $this->target = Profile::getKV('id', $id);
-
- if (!$this->target instanceof Profile) {
- // TRANS: Error message displayed when referring to a user without a profile.
- $this->serverError(_m('Profile ID does not exist.'));
- }
-
- if ($this->target->isLocal()) {
- // For local users when accessed by id number, redirect to
- // the same action but using the nickname as argument.
- common_redirect(common_local_url($this->getActionName(),
- array('nickname'=>$user->getNickname())));
- }
- }
-
- if ($this->target->hasRole(Profile_role::SILENCED) &&
- (empty($this->scoped) || !$this->scoped->hasRight(Right::SILENCEUSER))) {
+ if ($this->target->hasRole(Profile_role::SILENCED)
+ && (!$this->scoped instanceof Profile || !$this->scoped->hasRight(Right::SILENCEUSER))) {
throw new ClientException(_('This profile has been silenced by site moderators'), 403);
}
$this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
common_set_returnto($this->selfUrl());
- return $this->profileActionPreparation();
+ // fetch the actual stream stuff
+ $this->profileActionPreparation();
+
+ return true;
}
protected function profileActionPreparation()
{
- // No-op by default.
+ // Nothing to do by default.
+ }
+
+ public function getTarget()
+ {
+ return $this->target;
}
function isReadOnly($args)
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-if (!defined('STATUSNET')) {
- exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
/**
* Some UI extras for now...
return true;
}
- /**
- * Add ModPlus-related paths to the router table
- *
- * Hook for RouterInitialized event.
- *
- * @param URLMapper $m URL mapper
- *
- * @return boolean hook return
- */
- public function onStartInitializeRouter(URLMapper $m)
- {
- $m->connect('user/remote/:id',
- array('action' => 'remoteprofile'),
- array('id' => '[\d]+'));
-
- return true;
- }
-
/**
* Add per-profile info popup menu for author on notice lists.
*
protected function showProfileOptions(HTMLOutputter $out, Profile $profile)
{
if (!$profile->isGroup() && !$profile->isLocal()) {
- $target = common_local_url('remoteprofile', array('id' => $profile->id));
+ $target = common_local_url('userbyid', array('id' => $profile->getID()));
// TRANS: Label for access to remote profile options.
$label = _m('Remote profile options...');
$out->elementStart('div', 'remote-profile-options');
+++ /dev/null
-<?php
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-class RemoteProfileAction extends ShowstreamAction
-{
- function title()
- {
- $base = $this->target->getBestName();
- $host = parse_url($this->target->profileurl, PHP_URL_HOST);
- // TRANS: Remote profile action page title.
- // TRANS: %1$s is a username, %2$s is a hostname.
- return sprintf(_m('%1$s on %2$s'), $base, $host);
- }
-
- /**
- * Instead of showing notices, link to the original offsite profile.
- */
- function showNotices()
- {
- $url = $this->target->profileurl;
- $host = parse_url($url, PHP_URL_HOST);
- $markdown = sprintf(
- // TRANS: Message on remote profile page.
- // TRANS: This message contains Markdown links in the form [description](link).
- // TRANS: %1$s is a profile nickname, %2$s is a hostname, %3$s is a URL.
- _m('This remote profile is registered on another site; see [%1$s\'s original profile page on %2$s](%3$s).'),
- $this->target->nickname,
- $host,
- $url);
- $html = common_markup_to_html($markdown);
- $this->raw($html);
-
- if ($this->target->hasRole(Profile_role::SILENCED)) {
- // TRANS: Message on blocked remote profile page.
- $markdown = _m('Site moderators have silenced this profile, which prevents delivery of new messages to any users on this site.');
- $this->raw(common_markup_to_html($markdown));
- }else{
-
- $pnl = new NoticeList($this->notice, $this);
- $cnt = $pnl->show();
- if (0 == $cnt) {
- $this->showEmptyListMessage();
- }
-
- $args = array('id' => $this->target->id);
- if (!empty($this->tag))
- {
- $args['tag'] = $this->tag;
- }
- $this->pagination($this->page>1, $cnt>NOTICES_PER_PAGE, $this->page,
- 'remoteprofile', $args);
-
- }
- }
-
- function getFeeds()
- {
- // none
- }
-
- /**
- * Don't do various extra stuff, and also trim some things to avoid crawlers.
- */
- function extraHead()
- {
- $this->element('meta', array('name' => 'robots',
- 'content' => 'noindex,nofollow'));
- }
-
- function showLocalNav()
- {
- // skip
- }
-
- function showSections()
- {
- // skip
- }
-
- function showStatistics()
- {
- // skip
- }
-}
projects / quix0rs-gnu-social.git / commitdiff