Allow to configure "client" as fullfeed toggle. If you specify ?fullFeed=true, you...

diff --git a/docs/NEWS b/docs/NEWS
index 95a583a405c9c2a27bcbd6c8087d7b91e225c020..4120ba52b947b31bd5983f5c02d9031b04c06895 100644 (file)
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 1.1-alpha4()
 ------------------------------------------------------------------------
 
+   * Made "fullfeed" syndication option also support "let the client
+     decide", via $_GET['fullFeed'] = true/false. (garvinhicking)
+
    * Added new configuration option to that lets you toggle whether to
      comply with RFC2616 on Conditional GET. (Garvinhicking)
 
@@ -33,13 +36,9 @@ Version 1.1-alpha4()
            options
          - Sort media files by all custom property fields
          - Enhanced media filter for keywords
-
-     TODO:
          - Use entered comments in the "You choose..." picking page
 
-         - Deleting an image shall redirect back to originating screen,
-           not empty acknowledge page
-
+     TODO:
          - Search/Filter for specific properties/keywords:
             Search by: custom property fields. Evaluate input data from
             serendipity_getImageFields(): 'date', 'intrange', 'text'

diff --git a/include/plugin_internal.inc.php b/include/plugin_internal.inc.php
index db1f76871d4ccd1fc6bc1e845428697490ee71fc..e1e03960a786772f4d627e8c8aa6e55cf96ff5a9 100644 (file)
--- a/include/plugin_internal.inc.php
+++ b/include/plugin_internal.inc.php
@@ -695,10 +695,21 @@ class serendipity_syndication_plugin extends serendipity_plugin {
     {
         switch($name) {
             case 'fullfeed':
-                $propbag->add('type',        'boolean');
+                $radio['value'][] = 'false';
+                $radio['desc'][]  = NO;
+
+                $radio['value'][] = 'true';
+                $radio['desc'][]  = YES;
+
+                $radio['value'][] = 'client';
+                $radio['desc'][]  = 'Client';
+
+                $propbag->add('type',        'radio');
                 $propbag->add('name',        SYNDICATION_PLUGIN_FULLFEED);
                 $propbag->add('description', '');
                 $propbag->add('default',     false);
+                $propbag->add('radio_per_row', '3');
+                $propbag->add('rado',        $radio);
                 break;
 
             case 'show_0.91':

diff --git a/rss.php b/rss.php
index c4473d156bf6b7a0a42e9e68d53415c1c84a15a7..0b28c59cfa9b15c77b9f326f0563e53985535ce4 100644 (file)
--- a/rss.php
+++ b/rss.php
@@ -137,6 +137,13 @@ if (is_array($plugins)) {
                 }
             }
             $metadata['fullFeed']          = $plugin->get_config('fullfeed', false);
+            if ($metaData['fullFeed'] === 'client') {
+                if ($_GET['fullFeed'] || $serendipity['GET']['fullFeed']) {
+                    $metaData['fullFeed'] = true;
+                } else {
+                    $metaData['fullFeed'] = false;
+                }
+            }
 
             if ($plugin->get_config('show_feedburner') === 'force' && !preg_match('@FeedBurn@i', $_SERVER['HTTP_USER_AGENT'])) {
                        $url = 'http://feeds.feedburner.com/' . $plugin->get_config('fb_id');