diff --git a/plugins/serendipity_plugin_syndication/serendipity_plugin_syndication.php b/plugins/serendipity_plugin_syndication/serendipity_plugin_syndication.php index cedc501a..e58f03af 100644 --- a/plugins/serendipity_plugin_syndication/serendipity_plugin_syndication.php +++ b/plugins/serendipity_plugin_syndication/serendipity_plugin_syndication.php @@ -13,12 +13,11 @@ class serendipity_plugin_syndication extends serendipity_plugin { $propbag->add('description', SHOWS_RSS_BLAHBLAH); $propbag->add('stackable', true); $propbag->add('author', 'Serendipity Team'); - $propbag->add('version', '2.2.4'); + $propbag->add('version', '2.3.0'); $propbag->add('configuration', array( 'title', 'big_img', 'feed_format', - 'subToMe', 'show_comment_feed', 'separator', 'iconURL', @@ -33,17 +32,13 @@ class serendipity_plugin_syndication extends serendipity_plugin { $propbag->add('legal', array( 'services' => array( - 'subtome' => array( - 'url' => 'https://www.subtome.com', - 'desc' => 'Enables visitors to easily subscribe to RSS feeds. The visitor loads a JavaScript from their servers, thus the IP address will be known to the service.' - ), 'feedburner.com' => array( 'url' => 'https://www.feedburner.com', 'desc' => 'Feedburner can be used to track your feed subscription statistics. If used, a tracking pixel is loaded from FeedBurner.com servers and the IP address of the visitor will be known to the service.' ), ), 'frontend' => array( - 'To allow easy subscription to feeds and optional tracking statistics, the subtome or feedburner services can be used.', + 'To allow easy subscription to feeds and optional tracking statistics, the legacy feedburner services can be used.', ), 'backend' => array( ), @@ -129,13 +124,6 @@ class serendipity_plugin_syndication extends serendipity_plugin { $propbag->add('default', ''); break; - case 'subToMe': - $propbag->add('type', 'boolean'); - $propbag->add('name', SYNDICATION_PLUGIN_SUBTOME); - $propbag->add('description', SYNDICATION_PLUGIN_SUBTOME_DESC); - $propbag->add('default', false); - break; - case 'custom_url': $propbag->add('type', 'boolean'); $propbag->add('name', SYNDICATION_PLUGIN_CUSTOMURL); @@ -164,7 +152,6 @@ class serendipity_plugin_syndication extends serendipity_plugin { if ($custom_img != 'none' && $custom_img != "feedburner") { $custom_img = serendipity_getTemplateFile($custom_img); } - $subtome = serendipity_db_bool($this->get_config('subToMe', true)); $fbid = $this->get_config('fb_id'); $custom_url = serendipity_db_bool($this->get_config('custom_url', false)); $feed_format = $this->get_config('feed_format', 'rss'); @@ -215,44 +202,33 @@ class serendipity_plugin_syndication extends serendipity_plugin { } } - $onclick = ""; - if ($subtome) { - $onclick = $this->getOnclick($mainFeed); - } - echo "\n".'
\n"; } - function generateFeedButton($feed, $label, $onclick, $icon, $small = false) + function generateFeedButton($feed, $label, $icon, $small = false) { - $link = 'href="'.$feed.'" '. $onclick; + $link = 'href="'.$feed.'" '; $output = '