From: Evan Prodromou Date: Tue, 27 Sep 2011 15:43:41 +0000 (-0400) Subject: remove unsupported hcard action X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9f954eddc51d6c3f0ea6a4f93ca70c9852da0360;p=quix0rs-gnu-social.git remove unsupported hcard action --- diff --git a/actions/hcard.php b/actions/hcard.php deleted file mode 100644 index 6db2972b9d..0000000000 --- a/actions/hcard.php +++ /dev/null @@ -1,121 +0,0 @@ -. - * - * @category Personal - * @package StatusNet - * @author Evan Prodromou - * @copyright 2010 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 - * @link http://status.net/ - */ - -if (!defined('STATUSNET')) { - exit(1); -} - -/** - * User profile page - * - * @category Personal - * @package StatusNet - * @author Evan Prodromou - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 - * @link http://status.net/ - */ -class HcardAction extends Action -{ - var $user; - var $profile; - - function prepare($args) - { - parent::prepare($args); - - $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); - common_redirect(common_local_url('hcard', $args), 301); - return false; - } - - $this->user = User::staticGet('nickname', $nickname); - - if (!$this->user) { - // TRANS: Client error displayed when trying to get a user hCard for a non-existing user. - $this->clientError(_('No such user.'), 404); - return false; - } - - $this->profile = $this->user->getProfile(); - - if (!$this->profile) { - // TRANS: Error message displayed when referring to a user without a profile. - $this->serverError(_('User has no profile.')); - return false; - } - - return true; - } - - function handle($args) - { - parent::handle($args); - $this->showPage(); - } - - function title() - { - return $this->profile->getBestName(); - } - - function showContent() - { - $up = new ShortUserProfile($this, $this->user, $this->profile); - $up->show(); - } - - function showHeader() - { - return; - } - - function showAside() - { - return; - } - - function showSecondaryNav() - { - return; - } -} - -class ShortUserProfile extends UserProfile -{ - function showEntityActions() - { - return; - } -} diff --git a/lib/router.php b/lib/router.php index 2011d2708c..c9b12ac8e7 100644 --- a/lib/router.php +++ b/lib/router.php @@ -825,7 +825,7 @@ class Router foreach (array('subscriptions', 'subscribers', 'all', 'foaf', 'replies', - 'microsummary', 'hcard') as $a) { + 'microsummary') as $a) { $m->connect($a, array('action' => $a, 'nickname' => $nickname)); @@ -893,7 +893,7 @@ class Router foreach (array('subscriptions', 'subscribers', 'nudge', 'all', 'foaf', 'replies', - 'inbox', 'outbox', 'microsummary', 'hcard') as $a) { + 'inbox', 'outbox', 'microsummary') as $a) { $m->connect(':nickname/'.$a, array('action' => $a), array('nickname' => Nickname::DISPLAY_FMT)); diff --git a/plugins/OStatus/lib/xrdaction.php b/plugins/OStatus/lib/xrdaction.php index 1ac4d40a50..2ba158a3e6 100644 --- a/plugins/OStatus/lib/xrdaction.php +++ b/plugins/OStatus/lib/xrdaction.php @@ -77,11 +77,6 @@ class XrdAction extends Action 'format' => 'atom')), 'type' => 'application/atom+xml'); - // hCard - $xrd->links[] = array('rel' => Discovery::HCARD, - 'type' => 'text/html', - 'href' => common_local_url('hcard', array('nickname' => $nick))); - // XFN $xrd->links[] = array('rel' => 'http://gmpg.org/xfn/11', 'type' => 'text/html',