Merge pull request #419 from annando/bad-retriever

Retriever is deactivated, see issue 3482

leistungsschutzrecht/leistungsschutzrecht.php

@@ -71,10 +71,14 @@ function leistungsschutzrecht_fetchsites() {
 	$sitelist = fetch_url($url);
 	$siteurls = explode(',', $sitelist);
 
+	$whitelist = array('tagesschau.de', 'heute.de', 'wdr.de');
+
 	$sites = array();
 	foreach ($siteurls AS $site) {
+		if (!in_array($site, $whitelist)) {
 			$sites[$site] = $site;
 		}
+	}
 
 	// I would prefer parsing the list from the original site, but I haven't found a list.
 	// The following stays here to possibly reenable it in the future without having to reinvent the wheel completely.

retriever/README

@@ -0,0 +1,5 @@
+"retriever" is deactivated since it has side effects for all received posts.
+
+It was created in a time when the option 'Fetch further information for feeds' didn't exist.
+
+To activate it, please go to the list of your contacts, edit the contact and then select between the different options.

retriever/retriever.php

@@ -4,6 +4,7 @@
  * Description: Follow the permalink of RSS/Atom feed items and replace the summary with the full content.
  * Version: 1.0
  * Author: Matthew Exon <http://mat.exon.name>
+ * Status: Unsupported
  */
 
 require_once('include/html2bbcode.php');