No more needed (for this fix) but maybe later. So I always only comment them out.

[quix0rs-gnu-social.git] / lib / section.php

diff --git a/lib/section.php b/lib/section.php
index d77673898a7d5ab7119bcd6afc4dc7e477f7b2d8..9154bd3e664602540794152294992fc849366cd8 100644 (file)
--- a/lib/section.php
+++ b/lib/section.php
@@ -27,11 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
-
-require_once INSTALLDIR.'/lib/widget.php';
+if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); }
 
 /**
  * Base class for sections
@@ -45,7 +41,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class Section extends Widget
+abstract class Section extends Widget
 {
     /**
      * Show the form
@@ -61,6 +57,19 @@ class Section extends Widget
                                  array('id' => $this->divId(),
                                        'class' => 'section'));
 
+        $this->showTitle();
+
+        $have_more = $this->showContent();
+
+        if ($have_more) {
+            $this->showMore();
+        }
+
+        $this->out->elementEnd('div');
+    }
+
+    function showTitle()
+    {
         $link = $this->link();
         if (!empty($link)) {
             $this->out->elementStart('h2');
@@ -70,25 +79,19 @@ class Section extends Widget
             $this->out->element('h2', null,
                                 $this->title());
         }
-
-        $have_more = $this->showContent();
-
-        if ($have_more) {
-            $this->out->elementStart('p');
-            $this->out->element('a', array('href' => $this->moreUrl(),
-                                      'class' => 'more'),
-                           $this->moreTitle());
-            $this->out->elementEnd('p');
-        }
-
-        $this->out->elementEnd('div');
     }
 
-    function divId()
+    function showMore()
     {
-        return 'generic_section';
+        $this->out->elementStart('p');
+        $this->out->element('a', array('href' => $this->moreUrl(),
+                                       'class' => 'more'),
+                            $this->moreTitle());
+        $this->out->elementEnd('p');
     }
 
+    abstract public function divId();
+
     function title()
     {
         // TRANS: Default title for section/sidebar widget.