From 9806bdf05c8c897a0731e78a37c3383f085ea075 Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Thu, 20 Apr 2006 11:26:41 +0000 Subject: [PATCH] Allow to configure "client" as fullfeed toggle. If you specify ?fullFeed=true, you can get a full feed. --- docs/NEWS | 9 ++++----- include/plugin_internal.inc.php | 13 ++++++++++++- rss.php | 7 +++++++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/docs/NEWS b/docs/NEWS index 95a583a..4120ba5 100644 --- 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 db1f768..e1e0396 100644 --- 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 c4473d1..0b28c59 100644 --- 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'); -- 2.39.5