X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fnoticesection.php;h=ba30c982e4988926154c35d644891d4330c03d09;hb=HEAD;hp=ceb0bb36f80aa36eecbf39529aacccbc9de89250;hpb=4874ab0e7d4509dc7c60ba14df5f9d881a4839f9;p=quix0rs-gnu-social.git

diff --git a/lib/noticesection.php b/lib/noticesection.php
index ceb0bb36f8..ba30c982e4 100644
--- a/lib/noticesection.php
+++ b/lib/noticesection.php
@@ -27,9 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL') && !defined('GNUSOCIAL')) { exit(1); }
 
 define('NOTICES_PER_SECTION', 6);
 
@@ -48,71 +46,30 @@ define('NOTICES_PER_SECTION', 6);
  * @link     http://status.net/
  */
 
-class NoticeSection extends Section
+abstract class NoticeSection extends Section
 {
+    protected $addressees = false;
+    protected $attachments = false;
+    protected $maxchars = 140;
+    protected $options = false;
+    protected $show_n = NOTICES_PER_SECTION;
+
     function showContent()
     {
-        $notices = $this->getNotices();
-        $cnt = 0;
-        $this->out->elementStart('ol', 'notices xoxo');
-        while ($notices->fetch() && ++$cnt <= NOTICES_PER_SECTION) {
-            $this->showNotice($notices);
+        $prefs = array();
+        foreach (array('addressees', 'attachments', 'maxchars', 'options', 'show_n') as $key) {
+            $prefs[$key] = $this->$key;
         }
+        $prefs['id_prefix'] = $this->divId();
 
-        $this->out->elementEnd('ol');
-        return ($cnt > NOTICES_PER_SECTION);
+        // args: notice object, html outputter, preference array for notice lists and their items
+        $list = new NoticeList($this->getNotices(), $this->out, $prefs);
+        $total = $list->show(); // returns total amount of notices available
+        return ($total > $this->show_n);  // do we have more to show?
     }
 
     function getNotices()
     {
         return null;
     }
-
-    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);
-        $this->out->elementStart('span', 'vcard author');
-        $this->out->elementStart('a', array('title' => ($profile->fullname) ?
-                                            $profile->fullname :
-                                            $profile->nickname,
-                                            'href' => $profile->profileurl,
-                                            'class' => 'url'));
-        $this->out->element('img', array('src' => (($avatar) ? $avatar->displayUrl() :  Avatar::defaultImage(AVATAR_MINI_SIZE)),
-                                         'width' => AVATAR_MINI_SIZE,
-                                         'height' => AVATAR_MINI_SIZE,
-                                         'class' => 'avatar photo',
-                                         '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);
-        $this->out->elementEnd('p');
-
-        $this->out->elementStart('div', 'entry_content');
-        get_class('NoticeList');
-        $nli = new NoticeListItem($notice, $this->out);
-        $nli->showNoticeLink();
-        $this->out->elementEnd('div');
-
-        if (!empty($notice->value)) {
-            $this->out->elementStart('p');
-            $this->out->text($notice->value);
-            $this->out->elementEnd('p');
-        }
-        $this->out->elementEnd('div');
-        $this->out->elementEnd('li');
-    }
 }