X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fall.php;h=3eb1852147f4b8467f27fd2f41b6dbd850101a90;hb=2eadeca74515802dccc63d7ec84af1bc7d1338d9;hp=5ffc7e9bd17d1d44838b2085b4f3d8c08bb2e1f2;hpb=6f531745ca21e7b5460be90890c55b1934a45f15;p=quix0rs-gnu-social.git
diff --git a/actions/all.php b/actions/all.php
index 5ffc7e9bd1..3eb1852147 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -15,28 +15,24 @@
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
- *
+ *
* @category Actions
* @package Actions
* @author Evan Prodromou
- * @author Evan Prodromou
* @author Mike Cochrane
* @author Robin Millette
* @author Adrian Lang
* @author Meitar Moscovitz
- * @author Sarven Capadisli
+ * @author Sarven Capadisli
* @author Craig Andrews
- * @author Evan Prodromou
- * @author Evan Prodromou
* @author Jeffery To
* @author Zach Copley
- * @author csarven
* @license GNU Affero General Public License http://www.gnu.org/licenses/
* @link http://status.net
*/
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
}
require_once INSTALLDIR.'/lib/personalgroupnav.php';
@@ -85,7 +81,7 @@ class AllAction extends ProfileAction
function title()
{
if ($this->page > 1) {
- return sprintf(_("%s and friends, page %d"), $this->user->nickname, $this->page);
+ return sprintf(_('%1$s and friends, page %2$d'), $this->user->nickname, $this->page);
} else {
return sprintf(_("%s and friends"), $this->user->nickname);
}
@@ -103,19 +99,17 @@ class AllAction extends ProfileAction
sprintf(_('Feed for friends of %s (RSS 1.0)'), $this->user->nickname)),
new Feed(Feed::RSS2,
common_local_url(
- 'api', array(
- 'apiaction' => 'statuses',
- 'method' => 'friends_timeline',
- 'argument' => $this->user->nickname.'.rss'
+ 'ApiTimelineFriends', array(
+ 'format' => 'rss',
+ 'id' => $this->user->nickname
)
),
sprintf(_('Feed for friends of %s (RSS 2.0)'), $this->user->nickname)),
new Feed(Feed::ATOM,
common_local_url(
- 'api', array(
- 'apiaction' => 'statuses',
- 'method' => 'friends_timeline',
- 'argument' => $this->user->nickname.'.atom'
+ 'ApiTimelineFriends', array(
+ 'format' => 'atom',
+ 'id' => $this->user->nickname
)
),
sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname))
@@ -137,7 +131,7 @@ class AllAction extends ProfileAction
if ($this->user->id === $current_user->id) {
$message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
} else {
- $message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
+ $message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
}
} else {
$message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname);
@@ -166,12 +160,11 @@ class AllAction extends ProfileAction
function showPageTitle()
{
- $user =& common_current_user();
+ $user = common_current_user();
if ($user && ($user->id == $this->user->id)) {
$this->element('h1', null, _("You and friends"));
} else {
$this->element('h1', null, sprintf(_('%s and friends'), $this->user->nickname));
}
}
-
}