X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fnoticesection.php;h=7157feafc565bd81b30f1cba4d0cee5c4dc18442;hb=d88b208edcb75ec864e09bb3ab29785b35064400;hp=b31f18744557be91c42975ca0baaef70139271cb;hpb=da532bae9131b6dec8f5c0d67ce77c4ad1736f7d;p=quix0rs-gnu-social.git

diff --git a/lib/noticesection.php b/lib/noticesection.php
index b31f187445..7157feafc5 100644
--- a/lib/noticesection.php
+++ b/lib/noticesection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Base class for sections showing lists of notices
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Widget
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -40,10 +40,10 @@ define('NOTICES_PER_SECTION', 6);
  * group, or site.
  *
  * @category Widget
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class NoticeSection extends Section
@@ -51,17 +51,13 @@ class NoticeSection extends Section
     function showContent()
     {
         $notices = $this->getNotices();
-
         $cnt = 0;
-
-        $this->out->elementStart('ul', 'notices');
-
+        $this->out->elementStart('ol', 'notices xoxo');
         while ($notices->fetch() && ++$cnt <= NOTICES_PER_SECTION) {
             $this->showNotice($notices);
         }
 
-        $this->out->elementEnd('ul');
-
+        $this->out->elementEnd('ol');
         return ($cnt > NOTICES_PER_SECTION);
     }
 
@@ -73,6 +69,11 @@ class NoticeSection extends Section
     function showNotice($notice)
     {
         $profile = $notice->getProfile();
+        if (empty($profile)) {
+            common_log(LOG_WARNING, sprintf("Notice %d has no profile",
+                                            $notice->id));
+            return;
+        }
         $this->out->elementStart('li', 'hentry notice');
         $this->out->elementStart('div', 'entry-title');
         $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
@@ -89,12 +90,44 @@ class NoticeSection extends Section
                                          'alt' =>  ($profile->fullname) ?
                                          $profile->fullname :
                                          $profile->nickname));
+        $this->out->text(' ');
         $this->out->element('span', 'fn nickname', $profile->nickname);
         $this->out->elementEnd('a');
         $this->out->elementEnd('span');
 
         $this->out->elementStart('p', 'entry-content');
         $this->out->raw($notice->rendered);
+
+        $notice_link_cfg = common_config('site', 'notice_link');
+        if ('direct' === $notice_link_cfg) {
+            $this->out->text(' (');
+            $this->out->element('a', array('href' => $notice->uri), 'see');
+            $this->out->text(')');
+        } elseif ('attachment' === $notice_link_cfg) {
+            if ($count = $notice->hasAttachments()) {
+            // link to attachment(s) pages
+                if (1 === $count) {
+                    $f2p = File_to_post::staticGet('post_id', $notice->id);
+                    $href = common_local_url('attachment', array('attachment' => $f2p->file_id));
+                    $att_class = 'attachment';
+                } else {
+                    $href = common_local_url('attachments', array('notice' => $notice->id));
+                    $att_class = 'attachments';
+                }
+
+                $clip = Theme::path('images/icons/clip.png', 'base');
+                $this->out->elementStart('a', array('class' => $att_class, 'style' => "font-style: italic;", 'href' => $href, 'title' => "# of attachments: $count"));
+                $this->out->raw(" ($count&nbsp");
+                $this->out->element('img', array('style' => 'display: inline', 'align' => 'top', 'width' => 20, 'height' => 20, 'src' => $clip, 'alt' => 'alt'));
+                $this->out->text(')');
+                $this->out->elementEnd('a');
+            } else {
+                $this->out->text(' (');
+                $this->out->element('a', array('href' => $notice->uri), 'see');
+                $this->out->text(')');
+            }
+        }
+
         $this->out->elementEnd('p');
         if (!empty($notice->value)) {
             $this->out->elementStart('p');