X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Ffriendica.php;h=e75e9cebaeda19828c79a9df552eaa656d8e5336;hb=796056a6feaf305dd9fb7c97bb43cdbc75ad0641;hp=14363ea4dd033623e6b0dced8bf72140ebd4c12e;hpb=29f7ebe307c22b275466390937b82ccb3820fb1c;p=friendica.git

diff --git a/mod/friendica.php b/mod/friendica.php
index 14363ea4dd..e75e9cebae 100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -11,7 +11,7 @@ use Friendica\Database\DBM;
 
 function friendica_init(App $a)
 {
-	if ($a->argv[1] == "json") {
+	if (!empty($a->argv[1]) && ($a->argv[1] == "json")) {
 		$register_policy = ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'];
 
 		$sql_extra = '';
@@ -86,7 +86,7 @@ function friendica_content(App $a)
 	$o .= L10n::t('Bug reports and issues: please visit') . ' ' . '<a href="https://github.com/friendica/friendica/issues?state=open">'.L10n::t('the bugtracker at github').'</a>';
 	$o .= '</p>' . PHP_EOL;
 	$o .= '<p>';
-	$o .= L10n::t('Suggestions, praise, donations, etc. - please email "Info" at Friendica - dot com');
+	$o .= L10n::t('Suggestions, praise, etc. - please email "info" at "friendi - dot - ca');
 	$o .= '</p>' . PHP_EOL;
 
 	$visible_addons = [];
@@ -112,13 +112,18 @@ function friendica_content(App $a)
 				$s .= $p;
 			}
 		}
-		$o .= '<div style="margin-left: 25px; margin-right: 25px;">' . $s . '</div>' . PHP_EOL;
+		$o .= '<div style="margin-left: 25px; margin-right: 25px; margin-bottom: 25px;">' . $s . '</div>' . PHP_EOL;
 	} else {
 		$o .= '<p>' . L10n::t('No installed addons/apps') . '</p>' . PHP_EOL;
 	}
 
-	$blocklist = Config::get('system', 'blocklist');
-	if (count($blocklist)) {
+	if (Config::get('system', 'tosdisplay'))
+	{
+		$o .= '<p>'.L10n::t('Read about the <a href="%1$s/tos">Terms of Service</a> of this node.', System::baseurl()).'</p>';
+	}
+
+	$blocklist = Config::get('system', 'blocklist', []);
+	if (!empty($blocklist)) {
 		$o .= '<div id="about_blocklist"><p>' . L10n::t('On this server the following remote servers are blocked.') . '</p>' . PHP_EOL;
 		$o .= '<table class="table"><thead><tr><th>' . L10n::t('Blocked domain') . '</th><th>' . L10n::t('Reason for the block') . '</th></thead><tbody>' . PHP_EOL;
 		foreach ($blocklist as $b) {