Merge pull request #3392 from Hypolite/issue/#3387

Enforce the domain blocklist

doc/Settings.md

@@ -242,6 +242,12 @@ The receiving end might be off-line, there might be a high system load and so on
 Don't panic!
 Friendica will not queue messages for all time but will sort out *dead* nodes automatically after a while and remove messages from the queue then.
 
+## Server Blocklist
+
+This page allows to block all communications (inbound and outbound) with a specific domain name.
+Each blocked domain entry requires a reason that will be displayed on the [friendica](/friendica) page.
+Matching is exact, blocking a domain doesn't block subdomains.
+
 ## Federation Statistics
 
 The federation statistics page gives you a short summery of the nodes/servers/pods of the decentralized social network federation your node knows.

include/follow.php

@@ -82,6 +82,11 @@ function new_contact($uid,$url,$interactive = false) {
 		return $result;
 	}
 
+	if (blocked_url($url)) {
+		$result['message'] = t('Blocked domain');
+		return $result;
+	}
+
 	if (! $url) {
 		$result['message'] = t('Connect URL missing.');
 		return $result;

include/network.php

@@ -63,15 +63,19 @@ function fetch_url($url,$binary = false, &$redirects = 0, $timeout = 0, $accept_
  *    string 'body' => fetched content
  */
 function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
-
+	$ret = array('return_code' => 0, 'success' => false, 'header' => '', 'body' => '');
-	$ret = array('return_code' => 0, 'success' => false, 'header' => "", 'body' => "");
-
 
 	$stamp1 = microtime(true);
 
 	$a = get_app();
 
+	if (blocked_url($url)) {
+		logger('z_fetch_url: domain of ' . $url . ' is blocked', LOGGER_DATA);
+		return $ret;
+	}
+
 	$ch = @curl_init($url);
+
 	if (($redirects > 8) || (!$ch)) {
 		return $ret;
 	}
@@ -89,7 +93,7 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
 
 	if (x($opts, 'accept_content')) {
 		curl_setopt($ch, CURLOPT_HTTPHEADER, array(
-			"Accept: " . $opts['accept_content']
+			'Accept: ' . $opts['accept_content']
 		));
 	}
 
@@ -97,6 +101,7 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
 	@curl_setopt($ch, CURLOPT_USERAGENT, $a->get_useragent());
 
 	$range = intval(Config::get('system', 'curl_range_bytes', 0));
+
 	if ($range > 0) {
 		@curl_setopt($ch, CURLOPT_RANGE, '0-' . $range);
 	}
@@ -104,9 +109,11 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
 	if (x($opts, 'headers')) {
 		@curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
 	}
+
 	if (x($opts, 'nobody')) {
 		@curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']);
 	}
+
 	if (x($opts, 'timeout')) {
 		@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
 	} else {
@@ -119,20 +126,26 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
 
 	$check_cert = get_config('system', 'verifyssl');
 	@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
+
 	if ($check_cert) {
 		@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
 	}
 
-	$prx = get_config('system','proxy');
+	$proxy = get_config('system', 'proxy');
-	if(strlen($prx)) {
+
+	if (strlen($proxy)) {
 		@curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
-		@curl_setopt($ch, CURLOPT_PROXY, $prx);
+		@curl_setopt($ch, CURLOPT_PROXY, $proxy);
-		$prxusr = @get_config('system','proxyuser');
+		$proxyuser = @get_config('system', 'proxyuser');
-		if(strlen($prxusr))
+
-			@curl_setopt($ch, CURLOPT_PROXYUSERPWD, $prxusr);
+		if (strlen($proxyuser)) {
+			@curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxyuser);
 		}
-	if($binary)
+	}
+
+	if ($binary) {
 		@curl_setopt($ch, CURLOPT_BINARYTRANSFER, 1);
+	}
 
 	$a->set_curl_code(0);
 
@@ -140,6 +153,7 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
 	// if it throws any errors.
 
 	$s = @curl_exec($ch);
+
 	if (curl_errno($ch) !== CURLE_OK) {
 		logger('fetch_url error fetching ' . $url . ': ' . curl_error($ch), LOGGER_NORMAL);
 	}
@@ -167,20 +181,25 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
 	$a->set_curl_headers($header);
 
 	if ($http_code == 301 || $http_code == 302 || $http_code == 303 || $http_code == 307) {
-		$new_location_info = @parse_url($curl_info["redirect_url"]);
+		$new_location_info = @parse_url($curl_info['redirect_url']);
-		$old_location_info = @parse_url($curl_info["url"]);
+		$old_location_info = @parse_url($curl_info['url']);
 
-		$newurl = $curl_info["redirect_url"];
+		$newurl = $curl_info['redirect_url'];
 
-		if (($new_location_info["path"] == "") AND ($new_location_info["host"] != ""))
+		if (($new_location_info['path'] == '') AND ( $new_location_info['host'] != '')) {
-			$newurl = $new_location_info["scheme"]."://".$new_location_info["host"].$old_location_info["path"];
+			$newurl = $new_location_info['scheme'] . '://' . $new_location_info['host'] . $old_location_info['path'];
+		}
 
 		$matches = array();
+
 		if (preg_match('/(Location:|URI:)(.*?)\n/i', $header, $matches)) {
 			$newurl = trim(array_pop($matches));
 		}
-		if(strpos($newurl,'/') === 0)
+
-			$newurl = $old_location_info["scheme"]."://".$old_location_info["host"].$newurl;
+		if (strpos($newurl, '/') === 0) {
+			$newurl = $old_location_info['scheme'] . '://' . $old_location_info['host'] . $newurl;
+		}
+
 		if (filter_var($newurl, FILTER_VALIDATE_URL)) {
 			$redirects++;
 			@curl_close($ch);
@@ -188,44 +207,42 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
 		}
 	}
 
-
 	$a->set_curl_code($http_code);
 	$a->set_curl_content_type($curl_info['content_type']);
 
 	$body = substr($s, strlen($header));
 
-
-
 	$rc = intval($http_code);
 	$ret['return_code'] = $rc;
 	$ret['success'] = (($rc >= 200 && $rc <= 299) ? true : false);
 	$ret['redirect_url'] = $url;
+
 	if (!$ret['success']) {
 		$ret['error'] = curl_error($ch);
 		$ret['debug'] = $curl_info;
 		logger('z_fetch_url: error: ' . $url . ': ' . $ret['error'], LOGGER_DEBUG);
 		logger('z_fetch_url: debug: ' . print_r($curl_info, true), LOGGER_DATA);
 	}
+
 	$ret['body'] = substr($s, strlen($header));
 	$ret['header'] = $header;
+
 	if (x($opts, 'debug')) {
 		$ret['debug'] = $curl_info;
 	}
+
 	@curl_close($ch);
 
-	$a->save_timestamp($stamp1, "network");
+	$a->save_timestamp($stamp1, 'network');
 
 	return($ret);
-
 }
 
-// post request to $url. $params is an array of post variables.
-
 /**
- * @brief Post request to $url
+ * @brief Send POST request to $url
  *
  * @param string $url URL to post
- * @param mixed $params
+ * @param mixed $params array of POST variables
  * @param string $headers HTTP headers
  * @param integer $redirects Recursion counter for internal use - default = 0
  * @param integer $timeout The timeout in seconds, default system config value or 60 seconds
@@ -235,12 +252,19 @@ function z_fetch_url($url,$binary = false, &$redirects = 0, $opts=array()) {
 function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0) {
 	$stamp1 = microtime(true);
 
+	if (blocked_url($url)) {
+		logger('post_url: domain of ' . $url . ' is blocked', LOGGER_DATA);
+		return false;
+	}
+
 	$a = get_app();
 	$ch = curl_init($url);
-	if(($redirects > 8) || (! $ch))
-		return false;
 
-	logger("post_url: start ".$url, LOGGER_DATA);
+	if (($redirects > 8) || (!$ch)) {
+		return false;
+	}
+
+	logger('post_url: start ' . $url, LOGGER_DATA);
 
 	curl_setopt($ch, CURLOPT_HEADER, true);
 	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
@@ -250,8 +274,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
 
 	if (intval($timeout)) {
 		curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
-	}
+	} else {
-	else {
 		$curl_time = intval(get_config('system', 'curl_timeout'));
 		curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
 	}
@@ -265,21 +288,27 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
 			}
 		}
 	}
-	if($headers)
+
+	if ($headers) {
 		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+	}
 
 	$check_cert = get_config('system', 'verifyssl');
 	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
+
 	if ($check_cert) {
 		@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
 	}
-	$prx = get_config('system','proxy');
+
-	if(strlen($prx)) {
+	$proxy = get_config('system', 'proxy');
+
+	if (strlen($proxy)) {
 		curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
-		curl_setopt($ch, CURLOPT_PROXY, $prx);
+		curl_setopt($ch, CURLOPT_PROXY, $proxy);
-		$prxusr = get_config('system','proxyuser');
+		$proxyuser = get_config('system', 'proxyuser');
-		if(strlen($prxusr))
+		if (strlen($proxyuser)) {
-			curl_setopt($ch, CURLOPT_PROXYUSERPWD, $prxusr);
+			curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxyuser);
+		}
 	}
 
 	$a->set_curl_code(0);
@@ -293,7 +322,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
 	$curl_info = curl_getinfo($ch);
 	$http_code = $curl_info['http_code'];
 
-	logger("post_url: result ".$http_code." - ".$url, LOGGER_DATA);
+	logger('post_url: result ' . $http_code . ' - ' . $url, LOGGER_DATA);
 
 	$header = '';
 
@@ -310,27 +339,31 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
 		$matches = array();
 		preg_match('/(Location:|URI:)(.*?)\n/', $header, $matches);
 		$newurl = trim(array_pop($matches));
-		if(strpos($newurl,'/') === 0)
+
-			$newurl = $old_location_info["scheme"] . "://" . $old_location_info["host"] . $newurl;
+		if (strpos($newurl, '/') === 0) {
+			$newurl = $old_location_info['scheme'] . '://' . $old_location_info['host'] . $newurl;
+		}
+
 		if (filter_var($newurl, FILTER_VALIDATE_URL)) {
 			$redirects++;
-			logger("post_url: redirect ".$url." to ".$newurl);
+			logger('post_url: redirect ' . $url . ' to ' . $newurl);
 			return post_url($newurl, $params, $headers, $redirects, $timeout);
-			//return fetch_url($newurl,false,$redirects,$timeout);
 		}
 	}
+
 	$a->set_curl_code($http_code);
+
 	$body = substr($s, strlen($header));
 
 	$a->set_curl_headers($header);
 
 	curl_close($ch);
 
-	$a->save_timestamp($stamp1, "network");
+	$a->save_timestamp($stamp1, 'network');
 
-	logger("post_url: end ".$url, LOGGER_DATA);
+	logger('post_url: end ' . $url, LOGGER_DATA);
 
-	return($body);
+	return $body;
 }
 
 // Generic XML return
@@ -458,9 +491,10 @@ function allowed_url($url) {
 		return false;
 	}
 
-	$str_allowed = get_config('system','allowed_sites');
+	$str_allowed = Config::get('system', 'allowed_sites');
-	if(! $str_allowed)
+	if (! $str_allowed) {
 		return true;
+	}
 
 	$found = false;
 
@@ -468,8 +502,9 @@ function allowed_url($url) {
 
 	// always allow our own site
 
-	if($host == strtolower($_SERVER['SERVER_NAME']))
+	if ($host == strtolower($_SERVER['SERVER_NAME'])) {
 		return true;
+	}
 
 	$fnmatch = function_exists('fnmatch');
 	$allowed = explode(',', $str_allowed);
@@ -486,6 +521,36 @@ function allowed_url($url) {
 	return $found;
 }
 
+/**
+ * Checks if the provided url domain is on the domain blocklist.
+ * Returns true if it is or malformed URL, false if not.
+ *
+ * @param string $url The url to check the domain from
+ * @return boolean
+ */
+function blocked_url($url) {
+	$h = @parse_url($url);
+
+	if (! $h) {
+		return true;
+	}
+
+	$domain_blocklist = Config::get('system', 'blocklist', array());
+	if (! $domain_blocklist) {
+		return false;
+	}
+
+	$host = strtolower($h['host']);
+
+	foreach ($domain_blocklist as $domain_block) {
+		if (strtolower($domain_block['domain']) == $host) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
 /**
  * @brief Check if email address is allowed to register here.
  *

mod/admin.php

@@ -276,9 +276,9 @@ function admin_page_blocklist(App $a) {
 	if (is_array($blocklist)) {
 		foreach($blocklist as $id => $b) {
 			$blocklistform[] = array(
-				'url' => array("url[$id]", t('Blocked URL'), $b['URL'], '', t('The blocked URL'), 'required', '', ''),
+				'domain' => array("domain[$id]", t('Blocked domain'), $b['domain'], '', t('The blocked domain'), 'required', '', ''),
-				'reason' => array("reason[$id]", t("Reason for the block"), $b['reason'], t('The reason why you blocked this URL.').'('.$b['URL'].')', 'required', '', ''),
+				'reason' => array("reason[$id]", t("Reason for the block"), $b['reason'], t('The reason why you blocked this domain.').'('.$b['domain'].')', 'required', '', ''),
-				'delete' => array("delete[$id]", t("Delete UFL").' ('.$b['URL'].')', False , "Check to delete this entry from the blocklist")
+				'delete' => array("delete[$id]", t("Delete domain").' ('.$b['domain'].')', False , "Check to delete this entry from the blocklist")
 			);
 		}
 	}
@@ -286,15 +286,15 @@ function admin_page_blocklist(App $a) {
 	return replace_macros($t, array(
 		'$title' => t('Administration'),
 		'$page' => t('Server Blocklist'),
-		'$intro' => t('This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered URLs you should also give a reason, why you have blocked the remote server.'),
+		'$intro' => t('This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server.'),
 		'$public' => t('The list of blocked servers will be made publically available on the /friendica page so that your users and people investigating communication problems can find the reason easily.'),
 		'$addtitle' => t('Add new entry to block list'),
-		'$newurl' => array('newentry_url', t('Server URL'), '', t('The URL of the new server to add to the block list. Do not include the protocol to the URL.'), 'required', '', ''),
+		'$newdomain' => array('newentry_domain', t('Server Domain'), '', t('The domain of the new server to add to the block list. Do not include the protocol.'), 'required', '', ''),
-		'$newreason' => array('newentry_reason', t('Block reason'), '', t('The reason why you blocked this URL.'), 'required', '', ''),
+		'$newreason' => array('newentry_reason', t('Block reason'), '', t('The reason why you blocked this domain.'), 'required', '', ''),
 		'$submit' => t('Add Entry'),
 		'$savechanges' => t('Save changes to the blocklist'),
 		'$currenttitle' => t('Current Entries in the Blocklist'),
-		'$thurl' => t('Blocked URL'),
+		'$thurl' => t('Blocked domain'),
 		'$threason' => t('Reason for the block'),
 		'$delentry' => t('Delete entry from blocklist'),
 		'$entries' => $blocklistform,
@@ -320,7 +320,7 @@ function admin_page_blocklist_post(App $a) {
 		//  Add new item to blocklist
 		$blocklist = get_config('system', 'blocklist');
 		$blocklist[] = array(
-			'URL' => notags(trim($_POST['newentry_url'])),
+			'domain' => notags(trim($_POST['newentry_domain'])),
 			'reason' => notags(trim($_POST['newentry_reason']))
 		);
 		Config::set('system', 'blocklist', $blocklist);
@@ -328,12 +328,13 @@ function admin_page_blocklist_post(App $a) {
 	} else {
 		// Edit the entries from blocklist
 		$blocklist = array();
-		foreach ($_POST['url'] as $id => $URL) {
+		foreach ($_POST['domain'] as $id => $domain) {
-			$URL = notags(trim($URL));
+			// Trimming whitespaces as well as any lingering slashes
+			$domain = notags(trim($domain, "\x00..\x1F/"));
 			$reason = notags(trim($_POST['reason'][$id]));
 			if (!x($_POST['delete'][$id])) {
 				$blocklist[] = array(
-					'URL' => $URL,
+					'domain' => $domain,
 					'reason' => $reason
 				);
 			}

mod/dfrn_request.php

@@ -514,6 +514,11 @@ function dfrn_request_post(App $a) {
 					return; // NOTREACHED
 				}
 
+				if (blocked_url($url)) {
+					notice( t('Blocked domain') . EOL);
+					goaway(App::get_baseurl() . '/' . $a->cmd);
+					return; // NOTREACHED
+				}
 
 				require_once('include/Scrape.php');
 

mod/friendica.php

@@ -8,13 +8,12 @@ function friendica_init(App $a) {
 
 		$sql_extra = '';
 		if (x($a->config,'admin_nickname')) {
-			$sql_extra = sprintf(" AND nickname = '%s' ",dbesc($a->config['admin_nickname']));
+			$sql_extra = sprintf(" AND `nickname` = '%s' ", dbesc($a->config['admin_nickname']));
 		}
 		if (isset($a->config['admin_email']) && $a->config['admin_email']!='') {
 			$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
 
-			//$r = q("SELECT username, nickname FROM user WHERE email='%s' $sql_extra", dbesc($a->config['admin_email']));
+			$r = q("SELECT `username`, `nickname` FROM `user` WHERE `email` = '%s' $sql_extra", dbesc($adminlist[0]));
-			$r = q("SELECT username, nickname FROM user WHERE email='%s' $sql_extra", dbesc($adminlist[0]));
 			$admin = array(
 				'name' => $r[0]['username'],
 				'profile'=> App::get_baseurl() . '/profile/' . $r[0]['nickname'],
@@ -25,18 +24,22 @@ function friendica_init(App $a) {
 
 		$visible_plugins = array();
 		if (is_array($a->plugins) && count($a->plugins)) {
-			$r = q("select * from addon where hidden = 0");
+			$r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
-			if (dbm::is_result($r))
+			if (dbm::is_result($r)) {
-				foreach($r as $rr)
+				foreach($r as $rr) {
 					$visible_plugins[] = $rr['name'];
 				}
+			}
+		}
 
 		Config::load('feature_lock');
 		$locked_features = array();
 		if (is_array($a->config['feature_lock']) && count($a->config['feature_lock'])) {
 			foreach ($a->config['feature_lock'] as $k => $v) {
-				if($k === 'config_loaded')
+				if ($k === 'config_loaded') {
 					continue;
+				}
+
 				$locked_features[$k] = intval($v);
 			}
 		}
@@ -59,63 +62,63 @@ function friendica_init(App $a) {
 	}
 }
 
-
-
 function friendica_content(App $a) {
+	$o = '<h1>Friendica</h1>' . PHP_EOL;
+	$o .= '<p>';
+	$o .= t('This is Friendica, version') . ' <strong>' . FRIENDICA_VERSION . '</strong> ';
+	$o .= t('running at web location') . ' ' . z_root();
+	$o .= '</p>' . PHP_EOL;
 
-	$o = '';
+	$o .= '<p>';
-	$o .= '<h3>Friendica</h3>';
+	$o .= t('Please visit <a href="http://friendica.com">Friendica.com</a> to learn more about the Friendica project.') . PHP_EOL;
+	$o .= '</p>' . PHP_EOL;
 
-
+	$o .= '<p>';
-	$o .= '<p></p><p>';
+	$o .= t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">'.t('the bugtracker at github').'</a>';
-
+	$o .= '</p>' . PHP_EOL;
-	$o .= t('This is Friendica, version') . ' ' . FRIENDICA_VERSION . ' ';
+	$o .= '<p>';
-	$o .= t('running at web location') . ' ' . z_root() . '</p><p>';
+	$o .= t('Suggestions, praise, donations, etc. - please email "Info" at Friendica - dot com');
-
+	$o .= '</p>' . PHP_EOL;
-	$o .= t('Please visit <a href="http://friendica.com">Friendica.com</a> to learn more about the Friendica project.') . '</p><p>';
-
-	$o .= t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">'.t('the bugtracker at github').'</a></p><p>';
-	$o .= t('Suggestions, praise, donations, etc. - please email "Info" at Friendica - dot com') . '</p>';
-
-	$o .= '<p></p>';
 
 	$visible_plugins = array();
 	if (is_array($a->plugins) && count($a->plugins)) {
-		$r = q("select * from addon where hidden = 0");
+		$r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
-		if (dbm::is_result($r))
+		if (dbm::is_result($r)) {
-			foreach($r as $rr)
+			foreach($r as $rr) {
 				$visible_plugins[] = $rr['name'];
 			}
-
+		}
+	}
 
 	if (count($visible_plugins)) {
-		$o .= '<p>' . t('Installed plugins/addons/apps:') . '</p>';
+		$o .= '<p>' . t('Installed plugins/addons/apps:') . '</p>' . PHP_EOL;
 		$sorted = $visible_plugins;
 		$s = '';
 		sort($sorted);
 		foreach ($sorted as $p) {
 			if (strlen($p)) {
-				if(strlen($s)) $s .= ', ';
+				if (strlen($s)) {
+					$s .= ', ';
+				}
 				$s .= $p;
 			}
 		}
-		$o .= '<div style="margin-left: 25px; margin-right: 25px;">' . $s . '</div>';
+		$o .= '<div style="margin-left: 25px; margin-right: 25px;">' . $s . '</div>' . PHP_EOL;
+	} else {
+		$o .= '<p>' . t('No installed plugins/addons/apps') . '</p>' . PHP_EOL;
 	}
-	else
-		$o .= '<p>' . t('No installed plugins/addons/apps') . '</p>';
 
 	$blocklist = Config::get('system', 'blocklist');
 	if (count($blocklist)) {
-		$o .= '<div id="about_blocklist"><p>'. t('On this server the following remote servers are blocked.') .'</p>';
+		$o .= '<div id="about_blocklist"><p>' . t('On this server the following remote servers are blocked.') . '</p>' . PHP_EOL;
-		$o .= '<table><thead><tr><th>'. t('Blocked URL') .'</th><th>'. t('Reason for the block') .'</th></thead><tbody>';
+		$o .= '<table class="table"><thead><tr><th>' . t('Blocked domain') . '</th><th>' . t('Reason for the block') . '</th></thead><tbody>' . PHP_EOL;
 		foreach ($blocklist as $b) {
-			$o .= '<tr><td>'. $b['URL'] .'</td><td>'. $b['reason'] .'</td></tr>';
+			$o .= '<tr><td>' . $b['domain'] .'</td><td>' . $b['reason'] . '</td></tr>' . PHP_EOL;
 		}
-		$o .= '</tbody></table></div>';
+		$o .= '</tbody></table></div>' . PHP_EOL;
 	}
 
 	call_hooks('about_hook', $o);
 
 	return $o;
-
 }

view/templates/admin_blocklist.tpl

@@ -11,7 +11,7 @@
 	<h2>{{$addtitle}}</h2>
 	<form action="{{$baseurl}}/admin/blocklist" method="post">
 		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
-		{{include file="field_input.tpl" field=$newurl}}
+		{{include file="field_input.tpl" field=$newdomain}}
 		{{include file="field_input.tpl" field=$newreason}}
 		<div class="submit"><input type="submit" name="page_blocklist_save" value="{{$submit}}" /></div>
 	</form>
@@ -22,7 +22,7 @@
 	<form action="{{$baseurl}}/admin/blocklist" method="post">
 		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
 		{{foreach $entries as $e}}
-			{{include file="field_input.tpl" field=$e.url}}
+			{{include file="field_input.tpl" field=$e.domain}}
 			{{include file="field_input.tpl" field=$e.reason}}
 			{{include file="field_checkbox.tpl" field=$e.delete}}
 		{{/foreach}}