Updated recent_entries plugin to show/hide on overview, detailed entry, or all pages

diff --git a/docs/NEWS b/docs/NEWS
index c55a88394baf0330478ea0b45a19b1a84e19c9db..fb6b3484a9f7be56a1d247c4ff2af6895a3beb06 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,9 +3,8 @@
 Version 1.3 ()
 ------------------------------------------------------------------------
 
-    * Added new event-hooks 'backend_directory_delete' and
-      'backend_directory_createoptions' to the backend.
-      (garvinhicking)
+    * Updated recent_entries plugin to show/hide on overview, detailed
+      entry, or all pages (don chambers).
 
     * Updated statistics plugin to contain per week/day visitors.
       (roti)

diff --git a/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php b/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php
index 636411b84d5fe58d42199b19896dd5bfae4ae724..9bb6071a91cbbda7531cd53a72ceab35a98e14ad 100644 (file)
--- a/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php
+++ b/plugins/serendipity_plugin_recententries/serendipity_plugin_recententries.php
@@ -20,14 +20,14 @@ class serendipity_plugin_recententries extends serendipity_plugin {
         $propbag->add('name',          PLUGIN_RECENTENTRIES_TITLE);
         $propbag->add('description',   PLUGIN_RECENTENTRIES_BLAHBLAH);
         $propbag->add('stackable',     true);
-        $propbag->add('author',        'Christian Machmeier, Christian Brabandt, Judebert');
-        $propbag->add('version',       '1.9');
+        $propbag->add('author',        'Christian Machmeier, Christian Brabandt, Judebert, Don Chambers');
+        $propbag->add('version',       '2.0');
         $propbag->add('requirements',  array(
             'serendipity' => '0.8',
             'smarty'      => '2.6.7',
             'php'         => '4.1.0'
         ));
-        $propbag->add('configuration', array('title', 'number', 'number_from', 'dateformat', 'category', 'randomize'));
+        $propbag->add('configuration', array('title', 'number', 'number_from', 'dateformat', 'category', 'randomize', 'show_where'));
         $propbag->add('groups', array('FRONTEND_VIEWS'));
     }
 
@@ -108,6 +108,15 @@ class serendipity_plugin_recententries extends serendipity_plugin {
                 $propbag->add('default',       'none');
                 break;
 
+            case 'show_where':
+                $select = array('extended' => PLUGIN_ITEM_DISPLAY_EXTENDED, 'overview' => PLUGIN_ITEM_DISPLAY_OVERVIEW, 'both' => PLUGIN_ITEM_DISPLAY_BOTH);
+                $propbag->add('type',        'select');
+                $propbag->add('select_values', $select);
+                $propbag->add('name',        PLUGIN_ITEM_DISPLAY);
+                $propbag->add('description', '');
+                $propbag->add('default',     'both');
+            break;
+                
             default:
                 return false;
         }
@@ -120,7 +129,14 @@ class serendipity_plugin_recententries extends serendipity_plugin {
         $number         = $this->get_config('number');
         $dateformat     = $this->get_config('dateformat');
         $category       = $this->get_config('category', 'none');
-        
+        $show_where = $this->get_config('show_where', 'both');
+
+        if ($show_where == 'extended' && (!isset($serendipity['GET']['id']) || !is_numeric($serendipity['GET']['id']))) {
+            return false;
+        } else if ($show_where == 'overview' && isset($serendipity['GET']['id']) && is_numeric($serendipity['GET']['id'])) {
+            return false;
+        }
+
         if ($category == '_cur') {
             $category = $serendipity['GET']['category'];
         }