moving delete profile to its own space.

[quix0rs-gnu-social.git] / actions / public.php

diff --git a/actions/public.php b/actions/public.php
index d2285fb8fcce57a1896dc9302822e2403ed61ee6..753b9d07fe942a98773d05111785b55902e50657 100644 (file)
--- a/actions/public.php
+++ b/actions/public.php
@@ -44,7 +44,21 @@ class PublicAction extends StreamAction {
        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();
+       }
+
+       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() {
@@ -59,29 +73,18 @@ class PublicAction extends StreamAction {
 
        function show_notices($page) {
 
-               $notice = new Notice();
-
-               # XXX: sub-optimal
-
-               $notice->is_local = 1;
+               $cnt = 0;
+               $notice = Notice::publicStream(($page-1)*NOTICES_PER_PAGE,
+                                                                          NOTICES_PER_PAGE + 1);
 
-               $notice->orderBy('created DESC, notice.id DESC');
-
-               # We fetch one extra, to see if we need an "older" link
-
-               $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
-
-               $cnt = $notice->find();
-
-               if ($cnt > 0) {
+               if ($notice) {
                        common_element_start('ul', array('id' => 'notices'));
-                       for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
-                               if ($notice->fetch()) {
-                                       $this->show_notice($notice);
-                               } else {
-                                       // shouldn't happen!
+                       while ($notice->fetch()) {
+                               $cnt++;
+                               if ($cnt > NOTICES_PER_PAGE) {
                                        break;
                                }
+                               $this->show_notice($notice);
                        }
                        common_element_end('ul');
                }
@@ -89,5 +92,4 @@ class PublicAction extends StreamAction {
                common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
                                                  $page, 'public');
        }
-}
-
+}
\ No newline at end of file