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

diff --git a/mod/friendica.php b/mod/friendica.php
index 318d309e36..e75e9cebae 100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -1,17 +1,21 @@
 <?php
-
+/**
+ * @file mod/friendica.php
+ */
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Database\DBM;
 
-function friendica_init(App $a) {
-	if ($a->argv[1] == "json"){
+function friendica_init(App $a)
+{
+	if (!empty($a->argv[1]) && ($a->argv[1] == "json")) {
 		$register_policy = ['REGISTER_CLOSED', 'REGISTER_APPROVE', 'REGISTER_OPEN'];
 
 		$sql_extra = '';
-		if (x($a->config,'admin_nickname')) {
+		if (x($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']!='') {
@@ -30,7 +34,7 @@ function friendica_init(App $a) {
 		if (is_array($a->addons) && count($a->addons)) {
 			$r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
 			if (DBM::is_result($r)) {
-				foreach($r as $rr) {
+				foreach ($r as $rr) {
 					$visible_addons[] = $rr['name'];
 				}
 			}
@@ -57,7 +61,7 @@ function friendica_init(App $a) {
 			'admin'           => $admin,
 			'site_name'       => $a->config['sitename'],
 			'platform'        => FRIENDICA_PLATFORM,
-			'info'            => ((x($a->config,'info')) ? $a->config['info'] : ''),
+			'info'            => ((x($a->config, 'info')) ? $a->config['info'] : ''),
 			'no_scrape_url'   => System::baseUrl().'/noscrape'
 		];
 
@@ -66,36 +70,37 @@ function friendica_init(App $a) {
 	}
 }
 
-function friendica_content(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') . ' ' . System::baseUrl();
+	$o .= L10n::t('This is Friendica, version') . ' <strong>' . FRIENDICA_VERSION . '</strong> ';
+	$o .= L10n::t('running at web location') . ' ' . System::baseUrl();
 	$o .= '</p>' . PHP_EOL;
 
 	$o .= '<p>';
-	$o .= t('Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.') . PHP_EOL;
+	$o .= L10n::t('Please visit <a href="https://friendi.ca">Friendi.ca</a> to learn more about the Friendica project.') . PHP_EOL;
 	$o .= '</p>' . PHP_EOL;
 
 	$o .= '<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 .= 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 .= 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 = [];
 	if (is_array($a->addons) && count($a->addons)) {
 		$r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
 		if (DBM::is_result($r)) {
-			foreach($r as $rr) {
+			foreach ($r as $rr) {
 				$visible_addons[] = $rr['name'];
 			}
 		}
 	}
 
 	if (count($visible_addons)) {
-		$o .= '<p>' . t('Installed addons/addons/apps:') . '</p>' . PHP_EOL;
+		$o .= '<p>' . L10n::t('Installed addons/apps:') . '</p>' . PHP_EOL;
 		$sorted = $visible_addons;
 		$s = '';
 		sort($sorted);
@@ -107,15 +112,20 @@ 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>' . t('No installed addons/addons/apps') . '</p>' . PHP_EOL;
+		$o .= '<p>' . L10n::t('No installed addons/apps') . '</p>' . PHP_EOL;
+	}
+
+	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 (count($blocklist)) {
-		$o .= '<div id="about_blocklist"><p>' . t('On this server the following remote servers are blocked.') . '</p>' . PHP_EOL;
-		$o .= '<table class="table"><thead><tr><th>' . t('Blocked domain') . '</th><th>' . t('Reason for the block') . '</th></thead><tbody>' . PHP_EOL;
+	$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) {
 			$o .= '<tr><td>' . $b['domain'] .'</td><td>' . $b['reason'] . '</td></tr>' . PHP_EOL;
 		}