Merge pull request #1 from friendica/master

Red master has been merged

1 files changed, 24 insertions, 0 deletions

diff --git a/include/externals.php b/include/externals.php
index 1d9fd2902..a96bf7c97 100644
--- a/include/externals.php
+++ b/include/externals.php
@@ -33,8 +33,32 @@ function externals_run($argv, $argc){
 				$url = $r[0]['site_url'];
 		}
 
+		// Note: blacklisted sites must be stored in the config as an array. 
+		// No simple way to turn this into a personal config because we have no identity here.
+		// For that we probably need a variant of superblock.
+
+		$blacklisted = false;
+		$bl1 = get_config('system','blacklisted_sites');
+		if(is_array($bl1) && $bl1) {
+			foreach($bl1 as $bl) {
+				if(strpos($url,$bl) !== false) {
+					$blacklisted = true;
+					break;
+				}
+			}
+		}
+
 		$attempts ++;
 
+		// make sure we can eventually break out if somebody blacklists all known sites
+
+		if($blacklisted) {
+			if($attempts > 20)
+				break;
+			$attempts --;
+			continue;
+		}
+
 		if($url) {
 			if($r[0]['site_pull'] !== '0000-00-00 00:00:00')
 				$mindate = urlencode($r[0]['site_pull']);