summaryrefslogtreecommitdiff
path: root/actions/public.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-12-23 14:19:07 -0500
committerEvan Prodromou <evan@prodromou.name>2008-12-23 14:19:07 -0500
commitedbc0c665cc65875b4d14b79939233b1c9c06bb6 (patch)
tree4daaacb5bb4c52db9131624b4339bd9a60b205dd /actions/public.php
parent17ece0777b22b15c60b27b32f0f7e24ecc447661 (diff)
replace all tabs with four spaces
The PEAR coding standards decree: no tabs, but indent by four spaces. I've done a global search-and-replace on all tabs, replacing them by four spaces. This is a huge change, but it will go a long way to getting us towards phpcs-compliance. And that means better code readability, and that means more participation. darcs-hash:20081223191907-84dde-21e8efe210e6d5d54e935a22d0cee5c7bbfc007d.gz
Diffstat (limited to 'actions/public.php')
-rw-r--r--actions/public.php136
1 files changed, 68 insertions, 68 deletions
diff --git a/actions/public.php b/actions/public.php
index 218f80194..422e4bc98 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -23,77 +23,77 @@ require_once(INSTALLDIR.'/lib/stream.php');
class PublicAction extends StreamAction {
- function handle($args) {
- parent::handle($args);
-
- $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
-
- header('X-XRDS-Location: '. common_local_url('publicxrds'));
-
- common_show_header(_('Public timeline'),
- array($this, 'show_header'), NULL,
- array($this, 'show_top'));
-
- # XXX: Public sidebar here?
-
- $this->show_notices($page);
-
- common_show_footer();
- }
-
- function show_top() {
- if (common_logged_in()) {
- common_notice_form('public');
- } else {
- $instr = $this->get_instructions();
- $output = common_markup_to_html($instr);
- common_element_start('div', 'instructions');
- common_raw($output);
- common_element_end('div');
- }
-
- $this->public_views_menu();
-
- $this->show_feeds_list(array(0=>array('href'=>common_local_url('publicrss'),
- 'type' => 'rss',
- 'version' => 'RSS 1.0',
- 'item' => 'publicrss'),
- 1=>array('href'=>common_local_url('publicatom'),
- 'type' => 'atom',
- 'version' => 'Atom 1.0',
- 'item' => 'publicatom')));
- }
-
- function get_instructions() {
- return _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
- 'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
- '[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ([Read more](%%doc.help%%))');
- }
-
- function show_header() {
- common_element('link', array('rel' => 'alternate',
- 'href' => common_local_url('publicrss'),
- 'type' => 'application/rss+xml',
- 'title' => _('Public Stream Feed')));
- # for client side of OpenID authentication
- common_element('meta', array('http-equiv' => 'X-XRDS-Location',
- 'content' => common_local_url('publicxrds')));
- }
-
- function show_notices($page) {
-
- $cnt = 0;
- $notice = Notice::publicStream(($page-1)*NOTICES_PER_PAGE,
- NOTICES_PER_PAGE + 1);
-
- if (!$notice) {
+ function handle($args) {
+ parent::handle($args);
+
+ $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+ header('X-XRDS-Location: '. common_local_url('publicxrds'));
+
+ common_show_header(_('Public timeline'),
+ array($this, 'show_header'), NULL,
+ array($this, 'show_top'));
+
+ # XXX: Public sidebar here?
+
+ $this->show_notices($page);
+
+ common_show_footer();
+ }
+
+ function show_top() {
+ if (common_logged_in()) {
+ common_notice_form('public');
+ } else {
+ $instr = $this->get_instructions();
+ $output = common_markup_to_html($instr);
+ common_element_start('div', 'instructions');
+ common_raw($output);
+ common_element_end('div');
+ }
+
+ $this->public_views_menu();
+
+ $this->show_feeds_list(array(0=>array('href'=>common_local_url('publicrss'),
+ 'type' => 'rss',
+ 'version' => 'RSS 1.0',
+ 'item' => 'publicrss'),
+ 1=>array('href'=>common_local_url('publicatom'),
+ 'type' => 'atom',
+ 'version' => 'Atom 1.0',
+ 'item' => 'publicatom')));
+ }
+
+ function get_instructions() {
+ return _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
+ 'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
+ '[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ([Read more](%%doc.help%%))');
+ }
+
+ function show_header() {
+ common_element('link', array('rel' => 'alternate',
+ 'href' => common_local_url('publicrss'),
+ 'type' => 'application/rss+xml',
+ 'title' => _('Public Stream Feed')));
+ # for client side of OpenID authentication
+ common_element('meta', array('http-equiv' => 'X-XRDS-Location',
+ 'content' => common_local_url('publicxrds')));
+ }
+
+ function show_notices($page) {
+
+ $cnt = 0;
+ $notice = Notice::publicStream(($page-1)*NOTICES_PER_PAGE,
+ NOTICES_PER_PAGE + 1);
+
+ if (!$notice) {
$this->server_error(_('Could not retrieve public stream.'));
return;
- }
+ }
$cnt = $this->show_notice_list($notice);
- common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
- $page, 'public');
- }
+ common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
+ $page, 'public');
+ }
}