Merge branch '2020.09-rc' into stable

friendica · Sep 20, 2020 · 2365a9a · 2365a9a
2 parents 0a43efa + 10d1156
commit 2365a9a
Show file tree

Hide file tree

Showing 132 changed files with 1,377 additions and 1,258 deletions.
diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
@@ -65,13 +65,6 @@ function advancedcontentfilter_install(App $a)
 	Logger::log("installed advancedcontentfilter");
 }
 
-function advancedcontentfilter_uninstall()
-{
-	Hook::unregister('dbstructure_definition'     , __FILE__, 'advancedcontentfilter_dbstructure_definition');
-	Hook::unregister('prepare_body_content_filter', __FILE__, 'advancedcontentfilter_prepare_body_content_filter');
-	Hook::unregister('addon_settings'             , __FILE__, 'advancedcontentfilter_addon_settings');
-}
-
 /*
  * Hooks
  */

diff --git a/blackout/blackout.php b/blackout/blackout.php
@@ -54,9 +54,6 @@ function blackout_install() {
 	Hook::register('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
 }
 
-function blackout_uninstall() {
-	Hook::unregister('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
-}
 function blackout_redirect ($a, $b) {
 	// if we have a logged in user, don't throw her out
 	if (local_user()) {

diff --git a/blackout/lang/it/messages.po b/blackout/lang/it/messages.po
@@ -5,48 +5,63 @@
 # 
 # Translators:
 # fabrixxm <[email protected]>, 2014,2018
+# Sylke Vicious <[email protected]>, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2018-03-19 19:50+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"POT-Creation-Date: 2019-03-12 09:26+0100\n"
+"PO-Revision-Date: 2020-08-31 15:28+0000\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: blackout.php:99
+#: blackout.php:101
+msgid ""
+"The end-date is prior to the start-date of the blackout, you should fix this"
+msgstr "La data di fine è precedente alla data di inizio blackout, dovresti sistemarle"
+
+#: blackout.php:103
+#, php-format
+msgid ""
+"Please double check that the current settings for the blackout. Begin will "
+"be <strong>%s</strong> and it will end <strong>%s</strong>."
+msgstr "Per favore ricontrolla le impostazioni attuali per il blackout. L'inizio sarà il <strong>%s</strong> e terminerà il <strong>%s</strong>."
+
+#: blackout.php:106
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
-#: blackout.php:100
+#: blackout.php:107
 msgid "Redirect URL"
 msgstr "URL di reindirizzamento"
 
-#: blackout.php:100
+#: blackout.php:107
 msgid "all your visitors from the web will be redirected to this URL"
 msgstr "tutti i visitatori dal web verranno reindirizzati a questo URL"
 
-#: blackout.php:101
+#: blackout.php:108
 msgid "Begin of the Blackout"
 msgstr "Inzio del blackout"
 
-#: blackout.php:101
+#: blackout.php:108
 msgid ""
-"format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, "
-"<em>hh</em> hour and <em>mm</em> minute"
-msgstr "il formato è <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto"
+"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
+"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
+msgstr "Il formato è <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto."
 
-#: blackout.php:102
+#: blackout.php:109
 msgid "End of the Blackout"
 msgstr "Fine del blackout"
 
-#: blackout.php:108
+#: blackout.php:111
 msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr "La data di fine è precedente alla data di inizio. Dovresti sistemarla."
+"<strong>Note</strong>: The redirect will be active from the moment you press"
+" the submit button. Users currently logged in will <strong>not</strong> be "
+"thrown out but can't login again after logging out should the blackout is "
+"still in place."
+msgstr "<strong>Nota</strong>: Il reindirizzamento sarà attivo dal momento in cui premerai il pulsante di invio. Gli utenti attualmente autenticati <strong>non</strong> saranno disconnessi ma non potranno accedere in caso di disconnessione fintanto che il blackout sarà attivo."
diff --git a/blackout/lang/it/strings.php b/blackout/lang/it/strings.php
@@ -2,13 +2,16 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
+	$n = intval($n);
 	return ($n != 1);;
 }}
 ;
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "La data di fine è precedente alla data di inizio blackout, dovresti sistemarle";
+$a->strings["Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."] = "Per favore ricontrolla le impostazioni attuali per il blackout. L'inizio sarà il <strong>%s</strong> e terminerà il <strong>%s</strong>.";
 $a->strings["Save Settings"] = "Salva Impostazioni";
 $a->strings["Redirect URL"] = "URL di reindirizzamento";
 $a->strings["all your visitors from the web will be redirected to this URL"] = "tutti i visitatori dal web verranno reindirizzati a questo URL";
 $a->strings["Begin of the Blackout"] = "Inzio del blackout";
-$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "il formato è <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto";
+$a->strings["Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."] = "Il formato è <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto.";
 $a->strings["End of the Blackout"] = "Fine del blackout";
-$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "La data di fine è precedente alla data di inizio. Dovresti sistemarla.";
+$a->strings["<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."] = "<strong>Nota</strong>: Il reindirizzamento sarà attivo dal momento in cui premerai il pulsante di invio. Gli utenti attualmente autenticati <strong>non</strong> saranno disconnessi ma non potranno accedere in caso di disconnessione fintanto che il blackout sarà attivo.";
diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
@@ -22,11 +22,6 @@ function blockbot_install() {
 	Hook::register('init_1', __FILE__, 'blockbot_init_1');
 }
 
-
-function blockbot_uninstall() {
-	Hook::unregister('init_1', __FILE__, 'blockbot_init_1');
-}
-
 function blockbot_addon_admin(&$a, &$o) {
 	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/blockbot/");
 
@@ -42,7 +37,6 @@ function blockbot_addon_admin_post(&$a) {
 	DI::config()->set('blockbot', 'good_crawlers', $_POST['good_crawlers'] ?? false);
 	DI::config()->set('blockbot', 'block_gab', $_POST['block_gab'] ?? false);
 	DI::config()->set('blockbot', 'training', $_POST['training'] ?? false);
-	info(DI::l10n()->t('Settings updated.'). EOL);
 }
 
 function blockbot_init_1(App $a) {
@@ -54,7 +48,8 @@ function blockbot_init_1(App $a) {
 
 	// List of "good" crawlers
 	$good_agents = ['fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
-			'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/'];
+		'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/',
+		'PTST/'];
 
 	// List of known crawlers.
 	$agents = ['SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/',

diff --git a/blockbot/lang/it/messages.po b/blockbot/lang/it/messages.po
@@ -0,0 +1,42 @@
+# ADDON blockbot
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockbot addon package.
+# 
+# 
+# Translators:
+# Sylke Vicious <[email protected]>, 2020
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-08-07 09:03+0200\n"
+"PO-Revision-Date: 2019-08-07 07:43+0000\n"
+"Last-Translator: Sylke Vicious <[email protected]>, 2020\n"
+"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blockbot.php:35
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: blockbot.php:36
+msgid "Allow \"good\" crawlers"
+msgstr "Permetti crawler \"buoni\""
+
+#: blockbot.php:37
+msgid "Block GabSocial"
+msgstr "Blocca GabSocial"
+
+#: blockbot.php:38
+msgid "Training mode"
+msgstr "Modalità addestramento"
+
+#: blockbot.php:46
+msgid "Settings updated."
+msgstr "Impostazioni aggiornate."
diff --git a/blockbot/lang/it/strings.php b/blockbot/lang/it/strings.php
@@ -0,0 +1,13 @@
+<?php
+
+if(! function_exists("string_plural_select_it")) {
+function string_plural_select_it($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Allow \"good\" crawlers"] = "Permetti crawler \"buoni\"";
+$a->strings["Block GabSocial"] = "Blocca GabSocial";
+$a->strings["Training mode"] = "Modalità addestramento";
+$a->strings["Settings updated."] = "Impostazioni aggiornate.";
diff --git a/blockem/blockem.php b/blockem/blockem.php
@@ -23,18 +23,6 @@ function blockem_install()
 	Hook::register('enotify_store'              , 'addon/blockem/blockem.php', 'blockem_enotify_store');
 }
 
-function blockem_uninstall()
-{
-	Hook::unregister('prepare_body_content_filter', 'addon/blockem/blockem.php', 'blockem_prepare_body_content_filter');
-	Hook::unregister('prepare_body'               , 'addon/blockem/blockem.php', 'blockem_prepare_body');
-	Hook::unregister('display_item'               , 'addon/blockem/blockem.php', 'blockem_display_item');
-	Hook::unregister('addon_settings'             , 'addon/blockem/blockem.php', 'blockem_addon_settings');
-	Hook::unregister('addon_settings_post'        , 'addon/blockem/blockem.php', 'blockem_addon_settings_post');
-	Hook::unregister('conversation_start'         , 'addon/blockem/blockem.php', 'blockem_conversation_start');
-	Hook::unregister('item_photo_menu'            , 'addon/blockem/blockem.php', 'blockem_item_photo_menu');
-	Hook::unregister('enotify_store'              , 'addon/blockem/blockem.php', 'blockem_enotify_store');
-}
-
 function blockem_addon_settings (App $a, &$s)
 {
 	if (!local_user()) {
@@ -78,7 +66,6 @@ function blockem_addon_settings_post(App $a, array &$b)
 
 	if (!empty($_POST['blockem-submit'])) {
 		DI::pConfig()->set(local_user(), 'blockem', 'words', trim($_POST['blockem-words']));
-		info(DI::l10n()->t('BLOCKEM Settings saved.') . EOL);
 	}
 }
 
@@ -242,6 +229,5 @@ function blockem_init(App $a)
 	}
 
 	DI::pConfig()->set(local_user(), 'blockem', 'words', $words);
-	info(DI::l10n()->t('blockem settings updated') . EOL);
 	exit();
 }
diff --git a/blogger/blogger.php b/blogger/blogger.php
@@ -11,7 +11,6 @@
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
-use Friendica\Util\Network;
 use Friendica\Util\XML;
 
 function blogger_install()
@@ -24,22 +23,6 @@ function blogger_install()
 	Hook::register('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
 }
 
-function blogger_uninstall()
-{
-	Hook::unregister('hook_fork',               'addon/blogger/blogger.php', 'blogger_hook_fork');
-	Hook::unregister('post_local',              'addon/blogger/blogger.php', 'blogger_post_local');
-	Hook::unregister('notifier_normal',         'addon/blogger/blogger.php', 'blogger_send');
-	Hook::unregister('jot_networks',            'addon/blogger/blogger.php', 'blogger_jot_nets');
-	Hook::unregister('connector_settings',      'addon/blogger/blogger.php', 'blogger_settings');
-	Hook::unregister('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
-
-	// obsolete - remove
-	Hook::unregister('post_local_end',      'addon/blogger/blogger.php', 'blogger_send');
-	Hook::unregister('addon_settings',      'addon/blogger/blogger.php', 'blogger_settings');
-	Hook::unregister('addon_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
-}
-
-
 function blogger_jot_nets(App $a, array &$jotnets_fields)
 {
 	if (!local_user()) {
@@ -225,7 +208,7 @@ function blogger_send(App $a, array &$b)
 		Logger::log('blogger: data: ' . $xml, Logger::DATA);
 
 		if ($bl_blog !== 'test') {
-			$x = Network::post($bl_blog, $xml)->getBody();
+			$x = DI::httpRequest()->post($bl_blog, $xml)->getBody();
 		}
 
 		Logger::log('posted to blogger: ' . (($x) ? $x : ''), Logger::DEBUG);

diff --git a/buffer/buffer.php b/buffer/buffer.php
@@ -29,16 +29,6 @@ function buffer_install()
 	Hook::register('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post');
 }
 
-function buffer_uninstall()
-{
-	Hook::unregister('hook_fork',               'addon/buffer/buffer.php', 'buffer_hook_fork');
-	Hook::unregister('post_local',              'addon/buffer/buffer.php', 'buffer_post_local');
-	Hook::unregister('notifier_normal',         'addon/buffer/buffer.php', 'buffer_send');
-	Hook::unregister('jot_networks',            'addon/buffer/buffer.php', 'buffer_jot_nets');
-	Hook::unregister('connector_settings',      'addon/buffer/buffer.php', 'buffer_settings');
-	Hook::unregister('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post');
-}
-
 function buffer_module()
 {
 }
@@ -89,8 +79,6 @@ function buffer_addon_admin_post(App $a)
 
 	DI::config()->set('buffer', 'client_id'    , $client_id);
 	DI::config()->set('buffer', 'client_secret', $client_secret);
-
-	info(DI::l10n()->t('Settings updated.'). EOL);
 }
 
 function buffer_connect(App $a)

diff --git a/buglink/buglink.php b/buglink/buglink.php
@@ -15,11 +15,6 @@ function buglink_install()
 	Hook::register('page_end', 'addon/buglink/buglink.php', 'buglink_active');
 }
 
-function buglink_uninstall()
-{
-	Hook::unregister('page_end', 'addon/buglink/buglink.php', 'buglink_active');
-}
-
 function buglink_active(App $a, &$b)
 {
 	$b .= '<div id="buglink_wrapper" style="position: fixed; bottom: 5px; left: 5px;"><a href="https://github.com/friendica/friendica/issues" target="_blank" rel="noopener noreferrer" title="' . DI::l10n()->t('Report Bug') . '"><img src="addon/buglink/bug-x.gif" alt="' . DI::l10n()->t('Report Bug') . '" /></a></div>';

diff --git a/calc/calc.php b/calc/calc.php
@@ -12,11 +12,6 @@ function calc_install() {
 	Hook::register('app_menu', 'addon/calc/calc.php', 'calc_app_menu');
 }
 
-function calc_uninstall() {
-	Hook::unregister('app_menu', 'addon/calc/calc.php', 'calc_app_menu');
-
-}
-
 function calc_app_menu($a,&$b) {
 	$b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>'; 
 }

diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
@@ -31,18 +31,6 @@ function catavatar_install()
 	Logger::log('registered catavatar');
 }
 
-/**
- * Removes the addon hook
- */
-function catavatar_uninstall()
-{
-	Hook::unregister('avatar_lookup', 'addon/catavatar/catavatar.php', 'catavatar_lookup');
-	Hook::unregister('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings');
-	Hook::unregister('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post');
-
-	Logger::log('unregistered catavatar');
-}
-
 /**
  * Cat avatar user settings page
  */