diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php index 866b0b11f..c539075bb 100644 --- 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 index 19f99f1e8..83b2dbc1a 100644 --- 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 index 1b0c6f628..d00fd11e5 100644 --- a/blackout/lang/it/messages.po +++ b/blackout/lang/it/messages.po @@ -5,13 +5,14 @@ # # Translators: # fabrixxm , 2014,2018 +# Sylke Vicious , 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 \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 \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" @@ -19,34 +20,48 @@ msgstr "" "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 %s and it will end %s." +msgstr "Per favore ricontrolla le impostazioni attuali per il blackout. L'inizio sarà il %s e terminerà il %s." + +#: 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 YYYY year, MM month, DD day, " -"hh hour and mm minute" -msgstr "il formato è YYYY anno, MM mese, DD giorno, hh ora e mm minuto" +"Format is YYYY-MM-DD hh:mm; YYYY year, MM month, " +"DD day, hh hour and mm minute." +msgstr "Il formato è YYYY-MM-DD hh:mm; YYYY anno, MM mese, DD giorno, hh ora e mm 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." +"Note: The redirect will be active from the moment you press" +" the submit button. Users currently logged in will not be " +"thrown out but can't login again after logging out should the blackout is " +"still in place." +msgstr "Nota: Il reindirizzamento sarà attivo dal momento in cui premerai il pulsante di invio. Gli utenti attualmente autenticati non 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 index b0142236c..6aa8b95e3 100644 --- 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 %s and it will end %s."] = "Per favore ricontrolla le impostazioni attuali per il blackout. L'inizio sarà il %s e terminerà il %s."; $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 YYYY year, MM month, DD day, hh hour and mm minute"] = "il formato è YYYY anno, MM mese, DD giorno, hh ora e mm minuto"; +$a->strings["Format is YYYY-MM-DD hh:mm; YYYY year, MM month, DD day, hh hour and mm minute."] = "Il formato è YYYY-MM-DD hh:mm; YYYY anno, MM mese, DD giorno, hh ora e mm 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["Note: The redirect will be active from the moment you press the submit button. Users currently logged in will not be thrown out but can't login again after logging out should the blackout is still in place."] = "Nota: Il reindirizzamento sarà attivo dal momento in cui premerai il pulsante di invio. Gli utenti attualmente autenticati non 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 index 6bf709708..b602bf63b 100644 --- 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 new file mode 100644 index 000000000..06db44264 --- /dev/null +++ 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 , 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 , 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 new file mode 100644 index 000000000..64de6d409 --- /dev/null +++ b/blockbot/lang/it/strings.php @@ -0,0 +1,13 @@ +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 index 3a32aa2d4..1880b9be4 100644 --- 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 index e0b5f5352..5cf0d27b3 100644 --- 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 index b008b52f9..9bbdf21e5 100644 --- 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 index 2414a3a32..9ea20b56e 100644 --- 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 .= ''; diff --git a/calc/calc.php b/calc/calc.php index 61e9c5db8..7019a80f0 100644 --- 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'][] = '
Calculator
'; } diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php index db67a3554..e0daa6cd7 100644 --- 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 */ diff --git a/convert/convert.php b/convert/convert.php index e95637418..5449cc14b 100644 --- a/convert/convert.php +++ b/convert/convert.php @@ -1,229 +1,225 @@ - - */ -use Friendica\Core\Hook; - -function convert_install() { - Hook::register('app_menu', 'addon/convert/convert.php', 'convert_app_menu'); -} - -function convert_uninstall() { - Hook::unregister('app_menu', 'addon/convert/convert.php', 'convert_app_menu'); -} - -function convert_app_menu($a,&$b) { - $b['app_menu'][] = '
Units Conversion
'; -} - - -function convert_module() {} - - - - - - - -function convert_content($app) { - -include("UnitConvertor.php"); - - class TP_Converter extends UnitConvertor { - function TP_Converter($lang = "en") - { - if ($lang != 'en' ) { - $dec_point = '.'; $thousand_sep = "'"; - } else { - $dec_point = '.'; $thousand_sep = ","; - } - - $this->UnitConvertor($dec_point , $thousand_sep ); - - } // end func UnitConvertor - - function find_base_unit($from,$to) { - while (list($skey,$sval) = each($this->bases)) { - if ($skey == $from || $to == $skey || in_array($to,$sval) || in_array($from,$sval)) { - return $skey; - } - } - return false; - } - - function getTable($value, $from_unit, $to_unit, $precision) { - - if ($base_unit = $this->find_base_unit($from_unit,$to_unit)) { - - // A baseunit was found now lets convert from -> $base_unit - - $cell ['value'] = $this->convert($value, $from_unit, $base_unit, $precision)." ".$base_unit; - $cell ['class'] = ($base_unit == $from_unit || $base_unit == $to_unit) ? "framedred": ""; - $cells[] = $cell; - // We now have the base unit and value now lets produce the table; - while (list($key,$val) = each($this->bases[$base_unit])) { - $cell ['value'] = $this->convert($value, $from_unit, $val, $precision)." ".$val; - $cell ['class'] = ($val == $from_unit || $val == $to_unit) ? "framedred": ""; - $cells[] = $cell; - } - - $cc = count($cells); - $string = ""; - $string .= ""; - $i=0; - foreach ($cells as $cell) { - if ($i==0) { - $string .= ""; - $i++; - } else { - $string .= ""; - } - } - $string .= "
$value $from_unit".$cell['value']."
".$cell['value']."
"; - return $string; - } - - } -} - - -$conv = new TP_Converter('en'); - - -$conversions = [ - 'Temperature'=>['base' =>'Celsius', - 'conv'=>[ - 'Fahrenheit'=>['ratio'=>1.8, 'offset'=>32], - 'Kelvin'=>['ratio'=>1, 'offset'=>273], - 'Reaumur'=>0.8 - ] - ], - 'Weight' => ['base' =>'kg', - 'conv'=>[ - 'g'=>1000, - 'mg'=>1000000, - 't'=>0.001, - 'grain'=>15432, - 'oz'=>35.274, - 'lb'=>2.2046, - 'cwt(UK)' => 0.019684, - 'cwt(US)' => 0.022046, - 'ton (US)' => 0.0011023, - 'ton (UK)' => 0.0009842 - ] - ], - 'Distance' => ['base' =>'km', - 'conv'=>[ - 'm'=>1000, - 'dm'=>10000, - 'cm'=>100000, - 'mm'=>1000000, - 'mile'=>0.62137, - 'naut.mile'=>0.53996, - 'inch(es)'=>39370, - 'ft'=>3280.8, - 'yd'=>1093.6, - 'furlong'=>4.970969537898672, - 'fathom'=>546.8066491688539 - ] - ], - 'Area' => ['base' =>'km 2', - 'conv'=>[ - 'ha'=>100, - 'acre'=>247.105, - 'm 2'=>pow(1000,2), - 'dm 2'=>pow(10000,2), - 'cm 2'=>pow(100000,2), - 'mm 2'=>pow(1000000,2), - 'mile 2'=>pow(0.62137,2), - 'naut.miles 2'=>pow(0.53996,2), - 'in 2'=>pow(39370,2), - 'ft 2'=>pow(3280.8,2), - 'yd 2'=>pow(1093.6,2), - ] - ], - 'Volume' => ['base' =>'m 3', - 'conv'=>[ - 'in 3'=>61023.6, - 'ft 3'=>35.315, - 'cm 3'=>pow(10,6), - 'dm 3'=>1000, - 'litre'=>1000, - 'hl'=>10, - 'yd 3'=>1.30795, - 'gal(US)'=>264.172, - 'gal(UK)'=>219.969, - 'pint' => 2113.376, - 'quart' => 1056.688, - 'cup' => 4266.753, - 'fl oz' => 33814.02, - 'tablespoon' => 67628.04, - 'teaspoon' => 202884.1, - 'pt (UK)'=>1000/0.56826, - 'barrel petroleum'=>1000/158.99, - 'Register Tons'=>2.832, - 'Ocean Tons'=>1.1327 - ] - ], - 'Speed' =>['base' =>'kmph', - 'conv'=>[ - 'mps'=>0.0001726031, - 'milesph'=>0.62137, - 'knots'=>0.53996, - 'mach STP'=>0.0008380431, - 'c (warp)'=>9.265669e-10 - ] - ] -]; - - -while (list($key,$val) = each($conversions)) { - $conv->addConversion($val['base'], $val['conv']); - $list[$key][] = $val['base']; - while (list($ukey,$uval) = each($val['conv'])) { - $list[$key][] = $ukey; - } -} - - $o .= '

Unit Conversions

'; - - - if (isset($_POST['from_unit']) && isset($_POST['value'])) { - $_POST['value'] = $_POST['value'] + 0; - - - $o .= ($conv->getTable($_POST['value'], $_POST['from_unit'], $_POST['to_unit'], 5))."

"; - } else { - $o .= "

Select:

"; - } - - if(isset($_POST['value'])) - $value = $_POST['value']; - else - $value = ''; - - $o .= '
'; - $o .= ''; - $o .= ''; - - $o .= '
'; - - return $o; -} + + */ +use Friendica\Core\Hook; + +function convert_install() { + Hook::register('app_menu', 'addon/convert/convert.php', 'convert_app_menu'); +} + +function convert_app_menu($a,&$b) { + $b['app_menu'][] = '
Units Conversion
'; +} + + +function convert_module() {} + + + + + + + +function convert_content($app) { + +include("UnitConvertor.php"); + + class TP_Converter extends UnitConvertor { + function TP_Converter($lang = "en") + { + if ($lang != 'en' ) { + $dec_point = '.'; $thousand_sep = "'"; + } else { + $dec_point = '.'; $thousand_sep = ","; + } + + $this->UnitConvertor($dec_point , $thousand_sep ); + + } // end func UnitConvertor + + function find_base_unit($from,$to) { + while (list($skey,$sval) = each($this->bases)) { + if ($skey == $from || $to == $skey || in_array($to,$sval) || in_array($from,$sval)) { + return $skey; + } + } + return false; + } + + function getTable($value, $from_unit, $to_unit, $precision) { + + if ($base_unit = $this->find_base_unit($from_unit,$to_unit)) { + + // A baseunit was found now lets convert from -> $base_unit + + $cell ['value'] = $this->convert($value, $from_unit, $base_unit, $precision)." ".$base_unit; + $cell ['class'] = ($base_unit == $from_unit || $base_unit == $to_unit) ? "framedred": ""; + $cells[] = $cell; + // We now have the base unit and value now lets produce the table; + while (list($key,$val) = each($this->bases[$base_unit])) { + $cell ['value'] = $this->convert($value, $from_unit, $val, $precision)." ".$val; + $cell ['class'] = ($val == $from_unit || $val == $to_unit) ? "framedred": ""; + $cells[] = $cell; + } + + $cc = count($cells); + $string = ""; + $string .= ""; + $i=0; + foreach ($cells as $cell) { + if ($i==0) { + $string .= ""; + $i++; + } else { + $string .= ""; + } + } + $string .= "
$value $from_unit".$cell['value']."
".$cell['value']."
"; + return $string; + } + + } +} + + +$conv = new TP_Converter('en'); + + +$conversions = [ + 'Temperature'=>['base' =>'Celsius', + 'conv'=>[ + 'Fahrenheit'=>['ratio'=>1.8, 'offset'=>32], + 'Kelvin'=>['ratio'=>1, 'offset'=>273], + 'Reaumur'=>0.8 + ] + ], + 'Weight' => ['base' =>'kg', + 'conv'=>[ + 'g'=>1000, + 'mg'=>1000000, + 't'=>0.001, + 'grain'=>15432, + 'oz'=>35.274, + 'lb'=>2.2046, + 'cwt(UK)' => 0.019684, + 'cwt(US)' => 0.022046, + 'ton (US)' => 0.0011023, + 'ton (UK)' => 0.0009842 + ] + ], + 'Distance' => ['base' =>'km', + 'conv'=>[ + 'm'=>1000, + 'dm'=>10000, + 'cm'=>100000, + 'mm'=>1000000, + 'mile'=>0.62137, + 'naut.mile'=>0.53996, + 'inch(es)'=>39370, + 'ft'=>3280.8, + 'yd'=>1093.6, + 'furlong'=>4.970969537898672, + 'fathom'=>546.8066491688539 + ] + ], + 'Area' => ['base' =>'km 2', + 'conv'=>[ + 'ha'=>100, + 'acre'=>247.105, + 'm 2'=>pow(1000,2), + 'dm 2'=>pow(10000,2), + 'cm 2'=>pow(100000,2), + 'mm 2'=>pow(1000000,2), + 'mile 2'=>pow(0.62137,2), + 'naut.miles 2'=>pow(0.53996,2), + 'in 2'=>pow(39370,2), + 'ft 2'=>pow(3280.8,2), + 'yd 2'=>pow(1093.6,2), + ] + ], + 'Volume' => ['base' =>'m 3', + 'conv'=>[ + 'in 3'=>61023.6, + 'ft 3'=>35.315, + 'cm 3'=>pow(10,6), + 'dm 3'=>1000, + 'litre'=>1000, + 'hl'=>10, + 'yd 3'=>1.30795, + 'gal(US)'=>264.172, + 'gal(UK)'=>219.969, + 'pint' => 2113.376, + 'quart' => 1056.688, + 'cup' => 4266.753, + 'fl oz' => 33814.02, + 'tablespoon' => 67628.04, + 'teaspoon' => 202884.1, + 'pt (UK)'=>1000/0.56826, + 'barrel petroleum'=>1000/158.99, + 'Register Tons'=>2.832, + 'Ocean Tons'=>1.1327 + ] + ], + 'Speed' =>['base' =>'kmph', + 'conv'=>[ + 'mps'=>0.0001726031, + 'milesph'=>0.62137, + 'knots'=>0.53996, + 'mach STP'=>0.0008380431, + 'c (warp)'=>9.265669e-10 + ] + ] +]; + + +while (list($key,$val) = each($conversions)) { + $conv->addConversion($val['base'], $val['conv']); + $list[$key][] = $val['base']; + while (list($ukey,$uval) = each($val['conv'])) { + $list[$key][] = $ukey; + } +} + + $o .= '

Unit Conversions

'; + + + if (isset($_POST['from_unit']) && isset($_POST['value'])) { + $_POST['value'] = $_POST['value'] + 0; + + + $o .= ($conv->getTable($_POST['value'], $_POST['from_unit'], $_POST['to_unit'], 5))."

"; + } else { + $o .= "

Select:

"; + } + + if(isset($_POST['value'])) + $value = $_POST['value']; + else + $value = ''; + + $o .= '
'; + $o .= ''; + $o .= ''; + + $o .= '
'; + + return $o; +} diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php index a5df0d2d6..4ca862800 100644 --- a/cookienotice/cookienotice.php +++ b/cookienotice/cookienotice.php @@ -70,7 +70,6 @@ function cookienotice_addon_admin_post(App $a) if ($_POST['cookienotice-submit']) { DI::config()->set('cookienotice', 'text', trim(strip_tags($_POST['cookienotice-text']))); DI::config()->set('cookienotice', 'oktext', trim(strip_tags($_POST['cookienotice-oktext']))); - info(DI::l10n()->t('cookienotice Settings saved.')); } } diff --git a/curweather/curweather.php b/curweather/curweather.php index e4b6119f9..2b8682d15 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -15,7 +15,6 @@ use Friendica\Core\Renderer; use Friendica\Core\Session; use Friendica\DI; -use Friendica\Util\Network; use Friendica\Util\Proxy as ProxyUtils; function curweather_install() @@ -25,13 +24,6 @@ function curweather_install() Hook::register('addon_settings_post', 'addon/curweather/curweather.php', 'curweather_addon_settings_post'); } -function curweather_uninstall() -{ - Hook::unregister('network_mod_init' , 'addon/curweather/curweather.php', 'curweather_network_mod_init'); - Hook::unregister('addon_settings' , 'addon/curweather/curweather.php', 'curweather_addon_settings'); - Hook::unregister('addon_settings_post', 'addon/curweather/curweather.php', 'curweather_addon_settings_post'); -} - // get the weather data from OpenWeatherMap function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cachetime = 0) { @@ -49,10 +41,10 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti } try { - $res = new SimpleXMLElement(Network::fetchUrl($url)); + $res = new SimpleXMLElement(DI::httpRequest()->fetch($url)); } catch (Exception $e) { if (empty($_SESSION['curweather_notice_shown'])) { - info(DI::l10n()->t('Error fetching weather data. Error was: '.$e->getMessage())); + notice(DI::l10n()->t('Error fetching weather data. Error was: ' . $e->getMessage())); $_SESSION['curweather_notice_shown'] = true; } @@ -170,8 +162,6 @@ function curweather_addon_settings_post(App $a, $post) DI::pConfig()->set(local_user(), 'curweather', 'curweather_loc' , trim($_POST['curweather_loc'])); DI::pConfig()->set(local_user(), 'curweather', 'curweather_enable', intval($_POST['curweather_enable'])); DI::pConfig()->set(local_user(), 'curweather', 'curweather_units' , trim($_POST['curweather_units'])); - - info(DI::l10n()->t('Current Weather settings updated.') . EOL); } function curweather_addon_settings(App $a, &$s) @@ -221,8 +211,6 @@ function curweather_addon_admin_post(App $a) if (!empty($_POST['curweather-submit'])) { DI::config()->set('curweather', 'appid', trim($_POST['appid'])); DI::config()->set('curweather', 'cachetime', trim($_POST['cachetime'])); - - info(DI::l10n()->t('Curweather settings saved.' . PHP_EOL)); } } diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index edf6922dc..77aef3af0 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -29,16 +29,6 @@ function diaspora_install() Hook::register('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post'); } -function diaspora_uninstall() -{ - Hook::unregister('hook_fork', 'addon/diaspora/diaspora.php', 'diaspora_hook_fork'); - Hook::unregister('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local'); - Hook::unregister('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send'); - Hook::unregister('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets'); - Hook::unregister('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings'); - Hook::unregister('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post'); -} - function diaspora_jot_nets(App $a, array &$jotnets_fields) { if (!local_user()) { @@ -135,10 +125,8 @@ function diaspora_settings_post(App $a, &$b) DI::pConfig()->set(local_user(),'diaspora', 'aspect' , trim($_POST['aspect'])); DI::pConfig()->set(local_user(),'diaspora', 'post_by_default', intval($_POST['post_by_default'])); } - notice(DI::l10n()->t('Diaspora settings updated.')); } else { DI::pConfig()->delete(local_user(), 'diaspora', 'password'); - notice(DI::l10n()->t('Diaspora connector disabled.')); } } } diff --git a/diaspora/lang/de/messages.po b/diaspora/lang/de/messages.po index 22187254a..5cdcc4676 100644 --- a/diaspora/lang/de/messages.po +++ b/diaspora/lang/de/messages.po @@ -4,59 +4,114 @@ # # # Translators: -# bavatar , 2014 +# foss , 2020 +# Tobias Diekershoff , 2014 +# Tobias Diekershoff , 2018,2020 +# Ulf Rompe , 2019 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: 2014-07-08 19:10+0000\n" -"Last-Translator: bavatar \n" -"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" +"POT-Creation-Date: 2020-05-07 00:15-0400\n" +"PO-Revision-Date: 2020-09-01 12:43+0000\n" +"Last-Translator: Tobias Diekershoff \n" +"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: diaspora.php:37 +#: diaspora.php:53 msgid "Post to Diaspora" msgstr "Auf Diaspora veröffentlichen" -#: diaspora.php:142 +#: diaspora.php:78 +#, php-format msgid "" -"Can't login to your Diaspora account. Please check username and password and" -" ensure you used the complete address (including http...)" -msgstr "Anmeldung bei deinem Diaspora Account fehlgeschlagen. Bitte überprüfe Nutzername und Passwort und stelle sicher, dass die komplette Adresse (inklusive des htto...) verwendet wurde." +"Please remember: You can always be reached from Diaspora with your Friendica" +" handle %s. " +msgstr "Denke daran: Du kannst Jederzeit über deinen Friendica Account %s von Diaspora aus erreicht werden." -#: diaspora.php:149 diaspora.php:153 +#: diaspora.php:79 +msgid "" +"This connector is only meant if you still want to use your old Diaspora " +"account for some time. " +msgstr "Dieser Connector ist ausschließlich dafür gedacht, deinen alten Diaspora Account noch ein wenig weiter zu betreiben." + +#: diaspora.php:80 +#, php-format +msgid "" +"However, it is preferred that you tell your Diaspora contacts the new handle" +" %s instead." +msgstr "Du solltest allerdings deinen Diaspora Kontakten deinen Friendica Account %s mitteilen, damit sie diesem folgen." + +#: diaspora.php:90 +msgid "All aspects" +msgstr "Alle Aspekte" + +#: diaspora.php:91 +msgid "Public" +msgstr "Öffentlich" + +#: diaspora.php:97 +msgid "Post to aspect:" +msgstr "Bei aspect veröffentlichen:" + +#: diaspora.php:98 +#, php-format +msgid "Connected with your Diaspora account %s" +msgstr "Verbunden mit deinem Diaspora-Konto %s" + +#: diaspora.php:101 +msgid "" +"Can't login to your Diaspora account. Please check handle (in the format " +"user@domain.tld) and password." +msgstr "Anmeldung bei deinem Diaspora-Konto fehlgeschlagen. Bitte überprüfe Handle (im Format user@domain.tld) und Passwort." + +#: diaspora.php:109 msgid "Diaspora Export" -msgstr "Diaspora Export" +msgstr "Diaspora-Export" + +#: diaspora.php:110 +msgid "Information" +msgstr "Information" + +#: diaspora.php:111 +msgid "Error" +msgstr "Fehler" -#: diaspora.php:163 +#: diaspora.php:112 +msgid "Save Settings" +msgstr "Einstellungen speichern" + +#: diaspora.php:116 msgid "Enable Diaspora Post Addon" -msgstr "Veröffentlichungen bei Diaspora erlauben" +msgstr "Diaspora-Post-Addon aktivieren" -#: diaspora.php:168 -msgid "Diaspora username" -msgstr "Diaspora Nutzername" +#: diaspora.php:117 +msgid "Diaspora handle" +msgstr "Diaspora-Handle" -#: diaspora.php:173 +#: diaspora.php:118 msgid "Diaspora password" -msgstr "Diaspora Passwort" +msgstr "Diaspora-Passwort" -#: diaspora.php:178 -msgid "Diaspora site URL" -msgstr "URL der Diaspora Seite" +#: diaspora.php:118 +msgid "" +"Privacy notice: Your Diaspora password will be stored unencrypted to " +"authenticate you with your Diaspora pod. This means your Friendica node " +"administrator can have access to it." +msgstr "Datenschutzhinweis: Dein Diaspora-Passwort wird unverschlüsselt gespeichert, um dich an deinem Diaspora-Pod zu authentifizieren. Dadurch kann der Administrator deines Friendica-Knotens Zugriff darauf erlangen." -#: diaspora.php:183 +#: diaspora.php:120 msgid "Post to Diaspora by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Diaspora" -#: diaspora.php:189 -msgid "Save Settings" -msgstr "Einstellungen speichern" +#: diaspora.php:138 +msgid "Diaspora settings updated." +msgstr "Diaspora-Einstellungen aktualisiert." -#: diaspora.php:324 -msgid "Diaspora post failed. Queued for retry." -msgstr "Veröffentlichung bei Diaspora gescheitert. Wir versuchen es später erneut." +#: diaspora.php:141 +msgid "Diaspora connector disabled." +msgstr "Diaspora-Connector deaktiviert." diff --git a/diaspora/lang/de/strings.php b/diaspora/lang/de/strings.php index 22990765e..6d0ab88ee 100644 --- a/diaspora/lang/de/strings.php +++ b/diaspora/lang/de/strings.php @@ -2,16 +2,27 @@ if(! function_exists("string_plural_select_de")) { function string_plural_select_de($n){ + $n = intval($n); return ($n != 1);; }} ; $a->strings["Post to Diaspora"] = "Auf Diaspora veröffentlichen"; -$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Anmeldung bei deinem Diaspora Account fehlgeschlagen. Bitte überprüfe Nutzername und Passwort und stelle sicher, dass die komplette Adresse (inklusive des htto...) verwendet wurde."; -$a->strings["Diaspora Export"] = "Diaspora Export"; -$a->strings["Enable Diaspora Post Addon"] = "Veröffentlichungen bei Diaspora erlauben"; -$a->strings["Diaspora username"] = "Diaspora Nutzername"; -$a->strings["Diaspora password"] = "Diaspora Passwort"; -$a->strings["Diaspora site URL"] = "URL der Diaspora Seite"; -$a->strings["Post to Diaspora by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Diaspora"; +$a->strings["Please remember: You can always be reached from Diaspora with your Friendica handle %s. "] = "Denke daran: Du kannst Jederzeit über deinen Friendica Account %s von Diaspora aus erreicht werden."; +$a->strings["This connector is only meant if you still want to use your old Diaspora account for some time. "] = "Dieser Connector ist ausschließlich dafür gedacht, deinen alten Diaspora Account noch ein wenig weiter zu betreiben."; +$a->strings["However, it is preferred that you tell your Diaspora contacts the new handle %s instead."] = "Du solltest allerdings deinen Diaspora Kontakten deinen Friendica Account %s mitteilen, damit sie diesem folgen."; +$a->strings["All aspects"] = "Alle Aspekte"; +$a->strings["Public"] = "Öffentlich"; +$a->strings["Post to aspect:"] = "Bei aspect veröffentlichen:"; +$a->strings["Connected with your Diaspora account %s"] = "Verbunden mit deinem Diaspora-Konto %s"; +$a->strings["Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."] = "Anmeldung bei deinem Diaspora-Konto fehlgeschlagen. Bitte überprüfe Handle (im Format user@domain.tld) und Passwort."; +$a->strings["Diaspora Export"] = "Diaspora-Export"; +$a->strings["Information"] = "Information"; +$a->strings["Error"] = "Fehler"; $a->strings["Save Settings"] = "Einstellungen speichern"; -$a->strings["Diaspora post failed. Queued for retry."] = "Veröffentlichung bei Diaspora gescheitert. Wir versuchen es später erneut."; +$a->strings["Enable Diaspora Post Addon"] = "Diaspora-Post-Addon aktivieren"; +$a->strings["Diaspora handle"] = "Diaspora-Handle"; +$a->strings["Diaspora password"] = "Diaspora-Passwort"; +$a->strings["Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it."] = "Datenschutzhinweis: Dein Diaspora-Passwort wird unverschlüsselt gespeichert, um dich an deinem Diaspora-Pod zu authentifizieren. Dadurch kann der Administrator deines Friendica-Knotens Zugriff darauf erlangen."; +$a->strings["Post to Diaspora by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Diaspora"; +$a->strings["Diaspora settings updated."] = "Diaspora-Einstellungen aktualisiert."; +$a->strings["Diaspora connector disabled."] = "Diaspora-Connector deaktiviert."; diff --git a/diaspora/lang/en-us/messages.po b/diaspora/lang/en-us/messages.po new file mode 100644 index 000000000..ac7cef472 --- /dev/null +++ b/diaspora/lang/en-us/messages.po @@ -0,0 +1,114 @@ +# ADDON diaspora +# Copyright (C) +# This file is distributed under the same license as the Friendica diaspora addon package. +# +# +# Translators: +# Andy H3 , 2018 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-07 00:15-0400\n" +"PO-Revision-Date: 2020-05-07 06:50+0000\n" +"Last-Translator: Transifex Bot <>\n" +"Language-Team: English (United States) (http://www.transifex.com/Friendica/friendica/language/en_US/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_US\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: diaspora.php:53 +msgid "Post to Diaspora" +msgstr "Post to Diaspora" + +#: diaspora.php:78 +#, php-format +msgid "" +"Please remember: You can always be reached from Diaspora with your Friendica" +" handle %s. " +msgstr "" + +#: diaspora.php:79 +msgid "" +"This connector is only meant if you still want to use your old Diaspora " +"account for some time. " +msgstr "" + +#: diaspora.php:80 +#, php-format +msgid "" +"However, it is preferred that you tell your Diaspora contacts the new handle" +" %s instead." +msgstr "" + +#: diaspora.php:90 +msgid "All aspects" +msgstr "" + +#: diaspora.php:91 +msgid "Public" +msgstr "" + +#: diaspora.php:97 +msgid "Post to aspect:" +msgstr "" + +#: diaspora.php:98 +#, php-format +msgid "Connected with your Diaspora account %s" +msgstr "" + +#: diaspora.php:101 +msgid "" +"Can't login to your Diaspora account. Please check handle (in the format " +"user@domain.tld) and password." +msgstr "" + +#: diaspora.php:109 +msgid "Diaspora Export" +msgstr "Diaspora Export" + +#: diaspora.php:110 +msgid "Information" +msgstr "" + +#: diaspora.php:111 +msgid "Error" +msgstr "" + +#: diaspora.php:112 +msgid "Save Settings" +msgstr "Save settings" + +#: diaspora.php:116 +msgid "Enable Diaspora Post Addon" +msgstr "Enable Diaspora export" + +#: diaspora.php:117 +msgid "Diaspora handle" +msgstr "" + +#: diaspora.php:118 +msgid "Diaspora password" +msgstr "Diaspora password" + +#: diaspora.php:118 +msgid "" +"Privacy notice: Your Diaspora password will be stored unencrypted to " +"authenticate you with your Diaspora pod. This means your Friendica node " +"administrator can have access to it." +msgstr "" + +#: diaspora.php:120 +msgid "Post to Diaspora by default" +msgstr "Post to Diaspora by default" + +#: diaspora.php:138 +msgid "Diaspora settings updated." +msgstr "" + +#: diaspora.php:141 +msgid "Diaspora connector disabled." +msgstr "" diff --git a/diaspora/lang/en-us/strings.php b/diaspora/lang/en-us/strings.php new file mode 100644 index 000000000..237dfee51 --- /dev/null +++ b/diaspora/lang/en-us/strings.php @@ -0,0 +1,28 @@ +strings["Post to Diaspora"] = "Post to Diaspora"; +$a->strings["Please remember: You can always be reached from Diaspora with your Friendica handle %s. "] = ""; +$a->strings["This connector is only meant if you still want to use your old Diaspora account for some time. "] = ""; +$a->strings["However, it is preferred that you tell your Diaspora contacts the new handle %s instead."] = ""; +$a->strings["All aspects"] = ""; +$a->strings["Public"] = ""; +$a->strings["Post to aspect:"] = ""; +$a->strings["Connected with your Diaspora account %s"] = ""; +$a->strings["Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."] = ""; +$a->strings["Diaspora Export"] = "Diaspora Export"; +$a->strings["Information"] = ""; +$a->strings["Error"] = ""; +$a->strings["Save Settings"] = "Save settings"; +$a->strings["Enable Diaspora Post Addon"] = "Enable Diaspora export"; +$a->strings["Diaspora handle"] = ""; +$a->strings["Diaspora password"] = "Diaspora password"; +$a->strings["Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it."] = ""; +$a->strings["Post to Diaspora by default"] = "Post to Diaspora by default"; +$a->strings["Diaspora settings updated."] = ""; +$a->strings["Diaspora connector disabled."] = ""; diff --git a/diaspora/lang/it/messages.po b/diaspora/lang/it/messages.po index 8c3265dc9..f193a623e 100644 --- a/diaspora/lang/it/messages.po +++ b/diaspora/lang/it/messages.po @@ -5,13 +5,14 @@ # # Translators: # fabrixxm , 2014,2018 +# Sylke Vicious , 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 13:21+0000\n" -"Last-Translator: fabrixxm \n" +"POT-Creation-Date: 2020-05-07 00:15-0400\n" +"PO-Revision-Date: 2020-09-01 10:54+0000\n" +"Last-Translator: Sylke Vicious \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" @@ -19,44 +20,96 @@ msgstr "" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: diaspora.php:37 +#: diaspora.php:53 msgid "Post to Diaspora" msgstr "Invia a Diaspora" -#: diaspora.php:142 +#: diaspora.php:78 +#, php-format msgid "" -"Can't login to your Diaspora account. Please check username and password and" -" ensure you used the complete address (including http...)" -msgstr "Non riesco ad autenticarmi con il tuo account Diaspora. Controlla il nome utente e la password e assicurati di aver usato l'indirizzo completo (compreso \"http\" o \"https\")" +"Please remember: You can always be reached from Diaspora with your Friendica" +" handle %s. " +msgstr "Ricorda: Puoi sempre essere raggiunto da Diaspora con il tuo indirizzo Friendica %s." -#: diaspora.php:149 diaspora.php:153 +#: diaspora.php:79 +msgid "" +"This connector is only meant if you still want to use your old Diaspora " +"account for some time. " +msgstr "Questo connettore è utile solo se vuoi utilizzare il tuo vecchio account Diaspora per un po'." + +#: diaspora.php:80 +#, php-format +msgid "" +"However, it is preferred that you tell your Diaspora contacts the new handle" +" %s instead." +msgstr "Comunque, è preferibile che tu comunichi ai tuoi contatti Diaspora il nuovo indirizzo %s." + +#: diaspora.php:90 +msgid "All aspects" +msgstr "Tutti gli aspetti" + +#: diaspora.php:91 +msgid "Public" +msgstr "Pubblico" + +#: diaspora.php:97 +msgid "Post to aspect:" +msgstr "Invia all'aspetto:" + +#: diaspora.php:98 +#, php-format +msgid "Connected with your Diaspora account %s" +msgstr "Connesso con il tuo account Diaspora %s" + +#: diaspora.php:101 +msgid "" +"Can't login to your Diaspora account. Please check handle (in the format " +"user@domain.tld) and password." +msgstr "Non è stato possibile accedere al tuo account Diaspora. Per favore controlla l'indirizzo (nel formato utente@dominio.tld) e password." + +#: diaspora.php:109 msgid "Diaspora Export" msgstr "Esporta Diaspora" -#: diaspora.php:163 +#: diaspora.php:110 +msgid "Information" +msgstr "Informazione" + +#: diaspora.php:111 +msgid "Error" +msgstr "Errore" + +#: diaspora.php:112 +msgid "Save Settings" +msgstr "Salva Impostazioni" + +#: diaspora.php:116 msgid "Enable Diaspora Post Addon" msgstr "Abilita il componente aggiuntivo di invio a Diaspora" -#: diaspora.php:168 -msgid "Diaspora username" -msgstr "Nome utente Diaspora" +#: diaspora.php:117 +msgid "Diaspora handle" +msgstr "Indirizzo Diaspora" -#: diaspora.php:173 +#: diaspora.php:118 msgid "Diaspora password" msgstr "Password Diaspora" -#: diaspora.php:178 -msgid "Diaspora site URL" -msgstr "Indirizzo sito Diaspora" +#: diaspora.php:118 +msgid "" +"Privacy notice: Your Diaspora password will be stored unencrypted to " +"authenticate you with your Diaspora pod. This means your Friendica node " +"administrator can have access to it." +msgstr "Nota sulla privacy: La tua password Diaspora sarà memorizzata in modo non criptato per autenticarti al tuo pod Diaspora. Questo significa che l'amministratore del tuo nodo Friendica può aver accesso a questa." -#: diaspora.php:183 +#: diaspora.php:120 msgid "Post to Diaspora by default" msgstr "Invia sempre a Diaspora" -#: diaspora.php:189 -msgid "Save Settings" -msgstr "Salva Impostazioni" +#: diaspora.php:138 +msgid "Diaspora settings updated." +msgstr "Impostazioni Diaspora aggiornate." -#: diaspora.php:324 -msgid "Diaspora post failed. Queued for retry." -msgstr "Invio a Diaspora fallito. In attesa di riprovare." +#: diaspora.php:141 +msgid "Diaspora connector disabled." +msgstr "Connettore Diaspora disabilitato." diff --git a/diaspora/lang/it/strings.php b/diaspora/lang/it/strings.php index a7778c946..af97743f3 100644 --- a/diaspora/lang/it/strings.php +++ b/diaspora/lang/it/strings.php @@ -2,16 +2,27 @@ if(! function_exists("string_plural_select_it")) { function string_plural_select_it($n){ + $n = intval($n); return ($n != 1);; }} ; $a->strings["Post to Diaspora"] = "Invia a Diaspora"; -$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Non riesco ad autenticarmi con il tuo account Diaspora. Controlla il nome utente e la password e assicurati di aver usato l'indirizzo completo (compreso \"http\" o \"https\")"; +$a->strings["Please remember: You can always be reached from Diaspora with your Friendica handle %s. "] = "Ricorda: Puoi sempre essere raggiunto da Diaspora con il tuo indirizzo Friendica %s."; +$a->strings["This connector is only meant if you still want to use your old Diaspora account for some time. "] = "Questo connettore è utile solo se vuoi utilizzare il tuo vecchio account Diaspora per un po'."; +$a->strings["However, it is preferred that you tell your Diaspora contacts the new handle %s instead."] = "Comunque, è preferibile che tu comunichi ai tuoi contatti Diaspora il nuovo indirizzo %s."; +$a->strings["All aspects"] = "Tutti gli aspetti"; +$a->strings["Public"] = "Pubblico"; +$a->strings["Post to aspect:"] = "Invia all'aspetto:"; +$a->strings["Connected with your Diaspora account %s"] = "Connesso con il tuo account Diaspora %s"; +$a->strings["Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."] = "Non è stato possibile accedere al tuo account Diaspora. Per favore controlla l'indirizzo (nel formato utente@dominio.tld) e password."; $a->strings["Diaspora Export"] = "Esporta Diaspora"; +$a->strings["Information"] = "Informazione"; +$a->strings["Error"] = "Errore"; +$a->strings["Save Settings"] = "Salva Impostazioni"; $a->strings["Enable Diaspora Post Addon"] = "Abilita il componente aggiuntivo di invio a Diaspora"; -$a->strings["Diaspora username"] = "Nome utente Diaspora"; +$a->strings["Diaspora handle"] = "Indirizzo Diaspora"; $a->strings["Diaspora password"] = "Password Diaspora"; -$a->strings["Diaspora site URL"] = "Indirizzo sito Diaspora"; +$a->strings["Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it."] = "Nota sulla privacy: La tua password Diaspora sarà memorizzata in modo non criptato per autenticarti al tuo pod Diaspora. Questo significa che l'amministratore del tuo nodo Friendica può aver accesso a questa."; $a->strings["Post to Diaspora by default"] = "Invia sempre a Diaspora"; -$a->strings["Save Settings"] = "Salva Impostazioni"; -$a->strings["Diaspora post failed. Queued for retry."] = "Invio a Diaspora fallito. In attesa di riprovare."; +$a->strings["Diaspora settings updated."] = "Impostazioni Diaspora aggiornate."; +$a->strings["Diaspora connector disabled."] = "Connettore Diaspora disabilitato."; diff --git a/diaspora/lang/nl/messages.po b/diaspora/lang/nl/messages.po index 25fee1467..94be0bc18 100644 --- a/diaspora/lang/nl/messages.po +++ b/diaspora/lang/nl/messages.po @@ -4,14 +4,15 @@ # # # Translators: +# Casper , 2020 # Jeroen De Meerleer , 2018 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-08-24 13:55+0000\n" -"Last-Translator: Jeroen De Meerleer \n" +"POT-Creation-Date: 2020-05-07 00:15-0400\n" +"PO-Revision-Date: 2020-09-04 21:05+0000\n" +"Last-Translator: Casper \n" "Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,44 +20,96 @@ msgstr "" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: diaspora.php:37 +#: diaspora.php:53 msgid "Post to Diaspora" msgstr "Plaatsen op Diaspora" -#: diaspora.php:142 +#: diaspora.php:78 +#, php-format msgid "" -"Can't login to your Diaspora account. Please check username and password and" -" ensure you used the complete address (including http...)" -msgstr "Kan niet inloggen op je Diaspora account. Gelieve je gebruikersnaam en wachtwoord te controleren en het volledige adres (inclusief http) te controleren" +"Please remember: You can always be reached from Diaspora with your Friendica" +" handle %s. " +msgstr "Let op: vanuit Diaspora ben je altijd bereikbaar met je Friendica-handvat %s. " -#: diaspora.php:149 diaspora.php:153 +#: diaspora.php:79 +msgid "" +"This connector is only meant if you still want to use your old Diaspora " +"account for some time. " +msgstr "Deze connector is alleen bedoeld als je je oude diaspora-account nog enige tijd wilt gebruiken." + +#: diaspora.php:80 +#, php-format +msgid "" +"However, it is preferred that you tell your Diaspora contacts the new handle" +" %s instead." +msgstr "Het verdient echter de voorkeur dat u uw diaspora contacteert met de nieuwe handle %s." + +#: diaspora.php:90 +msgid "All aspects" +msgstr "Alle aspecten" + +#: diaspora.php:91 +msgid "Public" +msgstr "Openbaar" + +#: diaspora.php:97 +msgid "Post to aspect:" +msgstr "Post naar aspect:" + +#: diaspora.php:98 +#, php-format +msgid "Connected with your Diaspora account %s" +msgstr "Verbonden met uw diaspora-account %s" + +#: diaspora.php:101 +msgid "" +"Can't login to your Diaspora account. Please check handle (in the format " +"user@domain.tld) and password." +msgstr "U kunt niet inloggen op uw Diaspora-account. Controleer de handle (in het formaat gebruiker@domein.tld) ​​en het wachtwoord." + +#: diaspora.php:109 msgid "Diaspora Export" msgstr "Diaspora Exporteren" -#: diaspora.php:163 +#: diaspora.php:110 +msgid "Information" +msgstr "Informatie" + +#: diaspora.php:111 +msgid "Error" +msgstr "Fout" + +#: diaspora.php:112 +msgid "Save Settings" +msgstr "Instellingen opslaan" + +#: diaspora.php:116 msgid "Enable Diaspora Post Addon" msgstr "Diaspora Post Addon inschakelen" -#: diaspora.php:168 -msgid "Diaspora username" -msgstr "Diaspora gebruikersnaam" +#: diaspora.php:117 +msgid "Diaspora handle" +msgstr "" -#: diaspora.php:173 +#: diaspora.php:118 msgid "Diaspora password" msgstr "Diaspora wachtwoord" -#: diaspora.php:178 -msgid "Diaspora site URL" -msgstr "Diaspora pod URL" +#: diaspora.php:118 +msgid "" +"Privacy notice: Your Diaspora password will be stored unencrypted to " +"authenticate you with your Diaspora pod. This means your Friendica node " +"administrator can have access to it." +msgstr "Privacyverklaring: uw diaspora-wachtwoord wordt onversleuteld opgeslagen om u te authenticeren met uw diaspora-pod. Dit betekent dat uw Friendica-knooppuntbeheerder er toegang toe heeft." -#: diaspora.php:183 +#: diaspora.php:120 msgid "Post to Diaspora by default" msgstr "Plaatsen op Diaspora als standaard instellen " -#: diaspora.php:189 -msgid "Save Settings" -msgstr "Instellingen opslaan" +#: diaspora.php:138 +msgid "Diaspora settings updated." +msgstr "" -#: diaspora.php:324 -msgid "Diaspora post failed. Queued for retry." -msgstr "Posten naar Diaspora mislukt. In wachtrij geplaatst om opnieuw te proberen." +#: diaspora.php:141 +msgid "Diaspora connector disabled." +msgstr "" diff --git a/diaspora/lang/nl/strings.php b/diaspora/lang/nl/strings.php index 698a875af..2308dc867 100644 --- a/diaspora/lang/nl/strings.php +++ b/diaspora/lang/nl/strings.php @@ -7,12 +7,22 @@ function string_plural_select_nl($n){ }} ; $a->strings["Post to Diaspora"] = "Plaatsen op Diaspora"; -$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Kan niet inloggen op je Diaspora account. Gelieve je gebruikersnaam en wachtwoord te controleren en het volledige adres (inclusief http) te controleren"; +$a->strings["Please remember: You can always be reached from Diaspora with your Friendica handle %s. "] = "Let op: vanuit Diaspora ben je altijd bereikbaar met je Friendica-handvat %s. "; +$a->strings["This connector is only meant if you still want to use your old Diaspora account for some time. "] = "Deze connector is alleen bedoeld als je je oude diaspora-account nog enige tijd wilt gebruiken."; +$a->strings["However, it is preferred that you tell your Diaspora contacts the new handle %s instead."] = "Het verdient echter de voorkeur dat u uw diaspora contacteert met de nieuwe handle %s."; +$a->strings["All aspects"] = "Alle aspecten"; +$a->strings["Public"] = "Openbaar"; +$a->strings["Post to aspect:"] = "Post naar aspect:"; +$a->strings["Connected with your Diaspora account %s"] = "Verbonden met uw diaspora-account %s"; +$a->strings["Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."] = "U kunt niet inloggen op uw Diaspora-account. Controleer de handle (in het formaat gebruiker@domein.tld) ​​en het wachtwoord."; $a->strings["Diaspora Export"] = "Diaspora Exporteren"; +$a->strings["Information"] = "Informatie"; +$a->strings["Error"] = "Fout"; +$a->strings["Save Settings"] = "Instellingen opslaan"; $a->strings["Enable Diaspora Post Addon"] = "Diaspora Post Addon inschakelen"; -$a->strings["Diaspora username"] = "Diaspora gebruikersnaam"; +$a->strings["Diaspora handle"] = ""; $a->strings["Diaspora password"] = "Diaspora wachtwoord"; -$a->strings["Diaspora site URL"] = "Diaspora pod URL"; +$a->strings["Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it."] = "Privacyverklaring: uw diaspora-wachtwoord wordt onversleuteld opgeslagen om u te authenticeren met uw diaspora-pod. Dit betekent dat uw Friendica-knooppuntbeheerder er toegang toe heeft."; $a->strings["Post to Diaspora by default"] = "Plaatsen op Diaspora als standaard instellen "; -$a->strings["Save Settings"] = "Instellingen opslaan"; -$a->strings["Diaspora post failed. Queued for retry."] = "Posten naar Diaspora mislukt. In wachtrij geplaatst om opnieuw te proberen."; +$a->strings["Diaspora settings updated."] = ""; +$a->strings["Diaspora connector disabled."] = ""; diff --git a/discourse/discourse.php b/discourse/discourse.php index f684425a9..3ee980ceb 100644 --- a/discourse/discourse.php +++ b/discourse/discourse.php @@ -7,18 +7,18 @@ * Author: Michael Vogel * */ + use Friendica\App; +use Friendica\Content\Text\Markdown; use Friendica\Core\Hook; use Friendica\Core\Logger; -use Friendica\Core\Renderer; use Friendica\Core\Protocol; +use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Content\Text\Markdown; -use Friendica\Util\Network; +use Friendica\Util\DateTimeFormat; use Friendica\Util\Strings; -Use Friendica\Util\DateTimeFormat; /* Todo: * - Obtaining API tokens to be able to read non public posts as well @@ -114,7 +114,7 @@ function discourse_email_getmessage(App $a, &$message) function discourse_fetch_post($host, $topic, $pid) { $url = $host . '/t/' . $topic . '/' . $pid . '.json'; - $curlResult = Network::curl($url); + $curlResult = DI::httpRequest()->get($url); if (!$curlResult->isSuccess()) { Logger::info('No success', ['url' => $url]); return false; @@ -151,7 +151,7 @@ function discourse_fetch_post_from_api(&$message, $post, $host) { $hostaddr = 'https://' . $host; $url = $hostaddr . '/posts/' . $post . '.json'; - $curlResult = Network::curl($url); + $curlResult = DI::httpRequest()->get($url); if (!$curlResult->isSuccess()) { return false; } @@ -198,12 +198,12 @@ function discourse_get_user($post, $hostaddr) $contact['nurl'] = Strings::normaliseLink($contact['url']); $contact['baseurl'] = $hostaddr; Logger::info('Contact', $contact); - $contact['id'] = Contact::getIdForURL($contact['url'], 0, true, $contact); + $contact['id'] = Contact::getIdForURL($contact['url'], 0, false, $contact); if (!empty($contact['id'])) { $avatar = $contact['photo']; unset($contact['photo']); DBA::update('contact', $contact, ['id' => $contact['id']]); - Contact::updateAvatar($avatar, 0, $contact['id']); + Contact::updateAvatar($contact['id'], $avatar); $contact['photo'] = $avatar; } @@ -268,7 +268,7 @@ function discourse_get_html($message) $profile = discourse_get_profile($xpath); if (!empty($profile['url'])) { Logger::info('Found profile', $profile); - $message['item']['author-id'] = Contact::getIdForURL($profile['url'], 0, true, $profile); + $message['item']['author-id'] = Contact::getIdForURL($profile['url'], 0, false, $profile); $message['item']['author-link'] = $profile['url']; $message['item']['author-name'] = $profile['name']; $message['item']['author-avatar'] = $profile['photo']; diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php index 3d4b42ad8..da35aa0fd 100644 --- a/dwpost/dwpost.php +++ b/dwpost/dwpost.php @@ -16,7 +16,6 @@ use Friendica\DI; use Friendica\Model\Tag; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Network; use Friendica\Util\XML; function dwpost_install() @@ -28,15 +27,6 @@ function dwpost_install() Hook::register('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post'); } -function dwpost_uninstall() -{ - Hook::unregister('post_local', 'addon/dwpost/dwpost.php', 'dwpost_post_local'); - Hook::unregister('notifier_normal', 'addon/dwpost/dwpost.php', 'dwpost_send'); - Hook::unregister('jot_networks', 'addon/dwpost/dwpost.php', 'dwpost_jot_nets'); - Hook::unregister('connector_settings', 'addon/dwpost/dwpost.php', 'dwpost_settings'); - Hook::unregister('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post'); -} - function dwpost_jot_nets(App $a, array &$jotnets_fields) { if (!local_user()) { @@ -231,7 +221,7 @@ function dwpost_send(App $a, array &$b) Logger::log('dwpost: data: ' . $xml, Logger::DATA); if ($dw_blog !== 'test') { - $x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"])->getBody(); + $x = DI::httpRequest()->post($dw_blog, $xml, ["Content-Type: text/xml"])->getBody(); } Logger::log('posted to dreamwidth: ' . ($x) ? $x : '', Logger::DEBUG); diff --git a/dwpost/lang/it/messages.po b/dwpost/lang/it/messages.po index 9ce05fe24..d94751824 100644 --- a/dwpost/lang/it/messages.po +++ b/dwpost/lang/it/messages.po @@ -5,13 +5,14 @@ # # Translators: # fabrixxm , 2014,2018 +# Sylke Vicious , 2020 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-02-27 05:01-0500\n" -"PO-Revision-Date: 2018-03-19 13:21+0000\n" -"Last-Translator: fabrixxm \n" +"PO-Revision-Date: 2020-09-15 11:15+0000\n" +"Last-Translator: Sylke Vicious \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" @@ -25,7 +26,7 @@ msgstr "Invia a Dreamwidth" #: dwpost.php:70 msgid "Dreamwidth Post Settings" -msgstr "Impostazioni Invio a Dreeamwidth" +msgstr "Impostazioni Invio a Dreamwidth" #: dwpost.php:72 msgid "Enable dreamwidth Post Addon" diff --git a/dwpost/lang/it/strings.php b/dwpost/lang/it/strings.php index 0f40abc65..d906cc993 100644 --- a/dwpost/lang/it/strings.php +++ b/dwpost/lang/it/strings.php @@ -2,11 +2,12 @@ if(! function_exists("string_plural_select_it")) { function string_plural_select_it($n){ + $n = intval($n); return ($n != 1);; }} ; $a->strings["Post to Dreamwidth"] = "Invia a Dreamwidth"; -$a->strings["Dreamwidth Post Settings"] = "Impostazioni Invio a Dreeamwidth"; +$a->strings["Dreamwidth Post Settings"] = "Impostazioni Invio a Dreamwidth"; $a->strings["Enable dreamwidth Post Addon"] = "Abilita il componente aggiuntivo di invio a Dreamwidth"; $a->strings["dreamwidth username"] = "Nome utente Dreamwidth"; $a->strings["dreamwidth password"] = "password Dreamwidth"; diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php index 8c260fd71..530239fd2 100644 --- a/forumdirectory/forumdirectory.php +++ b/forumdirectory/forumdirectory.php @@ -23,11 +23,6 @@ function forumdirectory_install() Hook::register('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu'); } -function forumdirectory_uninstall() -{ - Hook::unregister('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu'); -} - function forumdirectory_module() { return; @@ -95,7 +90,7 @@ function forumdirectory_content(App $a) $total = 0; $cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid` - WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` `user`.`page-flags` = ? $sql_extra", + WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? $sql_extra", User::PAGE_FLAGS_COMMUNITY); if (DBA::isResult($cnt)) { $total = $cnt['total']; @@ -127,7 +122,7 @@ function forumdirectory_content(App $a) } DBA::close($r); } else { - info(DI::l10n()->t("No entries \x28some entries may be hidden\x29.") . EOL); + notice(DI::l10n()->t("No entries \x28some entries may be hidden\x29.")); } $tpl = Renderer::getMarkupTemplate('directory_header.tpl'); diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php index 8f787cab1..073b632c7 100644 --- a/fromapp/fromapp.php +++ b/fromapp/fromapp.php @@ -18,15 +18,6 @@ function fromapp_install() Logger::log("installed fromapp"); } - -function fromapp_uninstall() -{ - Hook::unregister('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook'); - Hook::unregister('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings'); - Hook::unregister('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post'); - Logger::log("removed fromapp"); -} - function fromapp_settings_post($a, $post) { if (!local_user() || empty($_POST['fromapp-submit'])) { @@ -35,8 +26,6 @@ function fromapp_settings_post($a, $post) DI::pConfig()->set(local_user(), 'fromapp', 'app', $_POST['fromapp-input']); DI::pConfig()->set(local_user(), 'fromapp', 'force', intval($_POST['fromapp-force'])); - - info(DI::l10n()->t('Fromapp settings updated.') . EOL); } function fromapp_settings(&$a, &$s) diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php index 7a7a6d9ad..937e2f8c1 100644 --- a/geocoordinates/geocoordinates.php +++ b/geocoordinates/geocoordinates.php @@ -5,11 +5,11 @@ * Version: 0.1 * Author: Michael Vogel */ + use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\DI; -use Friendica\Util\Network; use Friendica\Util\Strings; function geocoordinates_install() @@ -18,13 +18,6 @@ function geocoordinates_install() Hook::register('post_remote', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook'); } - -function geocoordinates_uninstall() -{ - Hook::unregister('post_local', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook'); - Hook::unregister('post_remote', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook'); -} - function geocoordinates_resolve_item(&$item) { if((!$item["coord"]) || ($item["location"])) @@ -52,7 +45,7 @@ function geocoordinates_resolve_item(&$item) return; } - $s = Network::fetchUrl("https://api.opencagedata.com/geocode/v1/json?q=".$coords[0].",".$coords[1]."&key=".$key."&language=".$language); + $s = DI::httpRequest()->fetch("https://api.opencagedata.com/geocode/v1/json?q=" . $coords[0] . "," . $coords[1] . "&key=" . $key . "&language=" . $language); if (!$s) { Logger::log("API could not be queried", Logger::DEBUG); @@ -103,5 +96,4 @@ function geocoordinates_addon_admin_post(&$a) $language = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language'])) : ''); DI::config()->set('geocoordinates', 'language', $language); - info(DI::l10n()->t('Settings updated.') . EOL); } diff --git a/geonames/geonames.php b/geonames/geonames.php index e6962d764..cf5425889 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -12,7 +12,6 @@ use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Util\ConfigFileLoader; -use Friendica\Util\Network; use Friendica\Util\XML; function geonames_install() @@ -78,7 +77,7 @@ function geonames_post_hook(App $a, array &$item) /* OK, we're allowed to do our stuff. */ - $s = Network::fetchUrl('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account); + $s = DI::httpRequest()->fetch('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account); if (!$s) { return; @@ -108,8 +107,6 @@ function geonames_addon_settings_post(App $a, array $post) } DI::pConfig()->set(local_user(), 'geonames', 'enable', intval($_POST['geonames-enable'])); - - info(DI::l10n()->t('Geonames settings updated.')); } /** diff --git a/gnot/gnot.php b/gnot/gnot.php index 26012c441..8420ffe49 100644 --- a/gnot/gnot.php +++ b/gnot/gnot.php @@ -22,19 +22,6 @@ function gnot_install() { Logger::log("installed gnot"); } - -function gnot_uninstall() { - - Hook::unregister('addon_settings', 'addon/gnot/gnot.php', 'gnot_settings'); - Hook::unregister('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post'); - Hook::unregister('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail'); - - - Logger::log("removed gnot"); -} - - - /** * * Callback from the settings post function. @@ -49,7 +36,6 @@ function gnot_settings_post($a,$post) { return; DI::pConfig()->set(local_user(),'gnot','enable',intval($_POST['gnot'])); - info(DI::l10n()->t('Gnot settings updated.') . EOL); } diff --git a/googlemaps/googlemaps.php b/googlemaps/googlemaps.php index 09a566e8b..5555ec5ac 100644 --- a/googlemaps/googlemaps.php +++ b/googlemaps/googlemaps.php @@ -16,13 +16,6 @@ function googlemaps_install() Logger::log("installed googlemaps"); } -function googlemaps_uninstall() -{ - Hook::unregister('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location'); - - Logger::log("removed googlemaps"); -} - function googlemaps_location($a, &$item) { diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php index 5ba9dcff0..894abda6d 100644 --- a/gravatar/gravatar.php +++ b/gravatar/gravatar.php @@ -26,16 +26,6 @@ function gravatar_install() { Logger::log("registered gravatar in avatar_lookup hook"); } -/** - * Removes the addon hook - */ -function gravatar_uninstall() { - Hook::unregister('load_config', 'addon/gravatar/gravatar.php', 'gravatar_load_config'); - Hook::unregister('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup'); - - Logger::log("unregistered gravatar in avatar_lookup hook"); -} - function gravatar_load_config(App $a, ConfigFileLoader $loader) { $a->getConfigCache()->load($loader->loadAddonConfig('gravatar')); @@ -125,5 +115,4 @@ function gravatar_addon_admin_post (&$a) { $rating = (!empty($_POST['rating']) ? Strings::escapeTags(trim($_POST['rating'])) : 'g'); DI::config()->set('gravatar', 'default_avatar', $default_avatar); DI::config()->set('gravatar', 'rating', $rating); - info(DI::l10n()->t('Gravatar settings updated.') .EOL); } diff --git a/group_text/group_text.php b/group_text/group_text.php index b8a1d21fd..e0e61ee54 100644 --- a/group_text/group_text.php +++ b/group_text/group_text.php @@ -17,18 +17,6 @@ function group_text_install() { Logger::log("installed group_text"); } - -function group_text_uninstall() { - - Hook::unregister('addon_settings', 'addon/group_text/group_text.php', 'group_text_settings'); - Hook::unregister('addon_settings_post', 'addon/group_text/group_text.php', 'group_text_settings_post'); - - - Logger::log("removed group_text"); -} - - - /** * * Callback from the settings post function. @@ -42,8 +30,6 @@ function group_text_settings_post($a,$post) { if(! local_user() || empty($_POST['group_text-submit'])) return; DI::pConfig()->set(local_user(),'system','groupedit_image_limit',intval($_POST['group_text'])); - - info(DI::l10n()->t('Group Text settings updated.') . EOL); } diff --git a/highlightjs/highlightjs.php b/highlightjs/highlightjs.php index 823541bb4..c46c26aed 100644 --- a/highlightjs/highlightjs.php +++ b/highlightjs/highlightjs.php @@ -16,12 +16,6 @@ function highlightjs_install() Hook::register('footer', __FILE__, 'highlightjs_footer'); } -function highlightjs_uninstall() -{ - Hook::unregister('head' , __FILE__, 'highlightjs_head'); - Hook::unregister('footer', __FILE__, 'highlightjs_footer'); -} - function highlightjs_head(App $a, &$b) { if ($a->getCurrentTheme() == 'frio') { diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index 45ba2bf9a..5021a63ed 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -8,6 +8,7 @@ */ require_once 'mod/item.php'; use Friendica\App; +use Friendica\Content\PageInfo; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; @@ -22,12 +23,6 @@ function ifttt_install() Hook::register('connector_settings_post', 'addon/ifttt/ifttt.php', 'ifttt_settings_post'); } -function ifttt_uninstall() -{ - Hook::unregister('connector_settings', 'addon/ifttt/ifttt.php', 'ifttt_settings'); - Hook::unregister('connector_settings_post', 'addon/ifttt/ifttt.php', 'ifttt_settings_post'); -} - function ifttt_module() { @@ -185,7 +180,7 @@ function ifttt_message($uid, $item) } if ($item['type'] == 'link') { - $data = query_page_info($item['link']); + $data = PageInfo::queryUrl($item['link']); if (isset($item['title']) && (trim($item['title']) != '')) { $data['title'] = $item['title']; @@ -195,7 +190,7 @@ function ifttt_message($uid, $item) $data['text'] = $item['description']; } - $_REQUEST['body'] .= add_page_info_data($data); + $_REQUEST['body'] .= "\n" . PageInfo::getFooterFromData($data); } elseif (($item['type'] == 'photo') && ($item['image'] != '')) { $_REQUEST['body'] .= "\n\n[img]" . $item['image'] . "[/img]\n"; } diff --git a/ifttt/lang/zh-cn/messages.po b/ifttt/lang/zh-cn/messages.po new file mode 100644 index 000000000..4fb9f178d --- /dev/null +++ b/ifttt/lang/zh-cn/messages.po @@ -0,0 +1,57 @@ +# ADDON ifttt +# Copyright (C) +# This file is distributed under the same license as the Friendica ifttt addon package. +# +# +# Translators: +# steve jobs , 2020 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-11-27 09:30+0100\n" +"PO-Revision-Date: 2017-11-27 10:37+0000\n" +"Last-Translator: steve jobs , 2020\n" +"Language-Team: Chinese (China) (https://www.transifex.com/Friendica/teams/12172/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ifttt.php:53 ifttt.php:57 +msgid "IFTTT Mirror" +msgstr "IFTTT 镜像" + +#: ifttt.php:61 +msgid "" +"Create an account at IFTTT. Create " +"three Facebook recipes that are connected with Maker (In the form \"if Facebook then " +"Maker\") with the following parameters:" +msgstr "" +"在IFTTT创建一个帐户。创建三个与Maker(表格为“ if Facebook then Maker”)相关的 " +"Facebook 菜谱，参数如下:" + +#: ifttt.php:68 +msgid "Body for \"new status message\"" +msgstr "" + +#: ifttt.php:70 +msgid "Body for \"new photo upload\"" +msgstr "" + +#: ifttt.php:72 +msgid "Body for \"new link post\"" +msgstr "" + +#: ifttt.php:77 +msgid "Generate new key" +msgstr "生成新的密钥" + +#: ifttt.php:81 +msgid "Save Settings" +msgstr "保存设置" diff --git a/ifttt/lang/zh-cn/strings.php b/ifttt/lang/zh-cn/strings.php new file mode 100644 index 000000000..61e3402e2 --- /dev/null +++ b/ifttt/lang/zh-cn/strings.php @@ -0,0 +1,15 @@ +strings["IFTTT Mirror"] = "IFTTT 镜像"; +$a->strings["Create an account at IFTTT. Create three Facebook recipes that are connected with Maker (In the form \"if Facebook then Maker\") with the following parameters:"] = "在IFTTT创建一个帐户。创建三个与Maker(表格为“ if Facebook then Maker”)相关的 Facebook 菜谱，参数如下:"; +$a->strings["Body for \"new status message\""] = ""; +$a->strings["Body for \"new photo upload\""] = ""; +$a->strings["Body for \"new link post\""] = ""; +$a->strings["Generate new key"] = "生成新的密钥"; +$a->strings["Save Settings"] = "保存设置"; diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php index 00479e3e0..15f2b41e6 100644 --- a/ijpost/ijpost.php +++ b/ijpost/ijpost.php @@ -14,7 +14,6 @@ use Friendica\DI; use Friendica\Model\Tag; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Network; use Friendica\Util\XML; function ijpost_install() @@ -26,15 +25,6 @@ function ijpost_install() Hook::register('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post'); } -function ijpost_uninstall() -{ - Hook::unregister('post_local', 'addon/ijpost/ijpost.php', 'ijpost_post_local'); - Hook::unregister('notifier_normal', 'addon/ijpost/ijpost.php', 'ijpost_send'); - Hook::unregister('jot_networks', 'addon/ijpost/ijpost.php', 'ijpost_jot_nets'); - Hook::unregister('connector_settings', 'addon/ijpost/ijpost.php', 'ijpost_settings'); - Hook::unregister('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post'); -} - function ijpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields) { if (!local_user()) { @@ -229,7 +219,7 @@ function ijpost_send(&$a, &$b) Logger::log('ijpost: data: ' . $xml, Logger::DATA); if ($ij_blog !== 'test') { - $x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"])->getBody(); + $x = DI::httpRequest()->post($ij_blog, $xml, ["Content-Type: text/xml"])->getBody(); } Logger::log('posted to insanejournal: ' . $x ? $x : '', Logger::DEBUG); } diff --git a/impressum/impressum.php b/impressum/impressum.php index 9f7917281..4bbb419ba 100644 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -23,13 +23,6 @@ function impressum_install() { Logger::log("installed impressum Addon"); } -function impressum_uninstall() { - Hook::unregister('load_config', 'addon/impressum/impressum.php', 'impressum_load_config'); - Hook::unregister('about_hook', 'addon/impressum/impressum.php', 'impressum_show'); - Hook::unregister('page_end', 'addon/impressum/impressum.php', 'impressum_footer'); - Logger::log("uninstalled impressum Addon"); -} - function impressum_module() { } function impressum_content() { @@ -98,7 +91,6 @@ function impressum_addon_admin_post (&$a) { DI::config()->set('impressum','email',strip_tags($email)); DI::config()->set('impressum','notes',strip_tags($notes)); DI::config()->set('impressum','footer_text',strip_tags($footer_text)); - info(DI::l10n()->t('Settings updated.'). EOL ); } function impressum_addon_admin (&$a, &$o) { $t = Renderer::getMarkupTemplate( "admin.tpl", "addon/impressum/" ); diff --git a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php index 126ea832d..a49982645 100644 --- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php +++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php @@ -13,11 +13,6 @@ function infiniteimprobabilitydrive_install() Hook::register('app_menu', 'addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php', 'infiniteimprobabilitydrive_app_menu'); } -function infiniteimprobabilitydrive_uninstall() -{ - Hook::unregister('app_menu', 'addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php', 'infiniteimprobabilitydrive_app_menu'); -} - function infiniteimprobabilitydrive_app_menu($a, &$b) { $b['app_menu'][] = '
' . DI::l10n()->t('Infinite Improbability Drive') . '
'; diff --git a/irc/irc.php b/irc/irc.php index 2c969d4be..b5ba5172d 100644 --- a/irc/irc.php +++ b/irc/irc.php @@ -17,13 +17,6 @@ function irc_install() { Hook::register('addon_settings_post', 'addon/irc/irc.php', 'irc_addon_settings_post'); } -function irc_uninstall() { - Hook::unregister('app_menu', 'addon/irc/irc.php', 'irc_app_menu'); - Hook::unregister('addon_settings', 'addon/irc/irc.php', 'irc_addon_settings'); - -} - - function irc_addon_settings(&$a,&$s) { if(! local_user()) return; @@ -62,7 +55,6 @@ function irc_addon_settings_post(&$a, &$b) { DI::pConfig()->set(local_user(), 'irc', 'sitechats', trim($_POST['sitechats'])); } /* upid pop-up thing */ - info(DI::l10n()->t('IRC settings saved.') . EOL); } } @@ -132,8 +124,6 @@ function irc_addon_admin_post (&$a) { if($_POST['irc-submit']) { DI::config()->set('irc','autochans',trim($_POST['autochans'])); DI::config()->set('irc','sitechats',trim($_POST['sitechats'])); - /* stupid pop-up thing */ - info(DI::l10n()->t('IRC settings saved.') . EOL); } } function irc_addon_admin (&$a, &$o) { diff --git a/irc/lang/it/messages.po b/irc/lang/it/messages.po index 69d28e894..bbd199b8e 100644 --- a/irc/lang/it/messages.po +++ b/irc/lang/it/messages.po @@ -5,13 +5,14 @@ # # Translators: # fabrixxm , 2014-2015 +# Sylke Vicious , 2020 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-08 13:17+0200\n" -"PO-Revision-Date: 2017-09-20 06:08+0000\n" -"Last-Translator: fabrixxm \n" +"PO-Revision-Date: 2020-09-17 11:40+0000\n" +"Last-Translator: Sylke Vicious \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" @@ -52,7 +53,7 @@ msgstr "Canali popolari (separati da virgola)" msgid "" "List of popular channels, will be displayed at the side and hotlinked for " "easy joining." -msgstr "Lista di canali popolari: sarà visualizzata a lato e provvista di link per facilitare l'adesione." +msgstr "Lista di canali popolari: sarà visualizzata a lato e provvista di collegamento per facilitare l'adesione." #: irc.php:57 irc.php:128 msgid "IRC settings saved." diff --git a/irc/lang/it/strings.php b/irc/lang/it/strings.php index 19b556494..0c970453b 100644 --- a/irc/lang/it/strings.php +++ b/irc/lang/it/strings.php @@ -2,6 +2,7 @@ if(! function_exists("string_plural_select_it")) { function string_plural_select_it($n){ + $n = intval($n); return ($n != 1);; }} ; @@ -11,7 +12,7 @@ function string_plural_select_it($n){ $a->strings["Channel(s) to auto connect (comma separated)"] = "Canale(i) a cui autocollegarsi (separati da virgola)"; $a->strings["List of channels that shall automatically connected to when the app is launched."] = "Lista di canali che a cui connettersi automaticamente quando l'app è avviata."; $a->strings["Popular Channels (comma separated)"] = "Canali popolari (separati da virgola)"; -$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "Lista di canali popolari: sarà visualizzata a lato e provvista di link per facilitare l'adesione."; +$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "Lista di canali popolari: sarà visualizzata a lato e provvista di collegamento per facilitare l'adesione."; $a->strings["IRC settings saved."] = "Impostazioni IRC salvate."; $a->strings["IRC Chatroom"] = "Stanza IRC"; $a->strings["Popular Channels"] = "Canali Popolari"; diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index ad4d49014..0333d8ecf 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -69,7 +69,6 @@ use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\User; -use Friendica\Util\Network; function jappixmini_install() { @@ -105,19 +104,6 @@ function jappixmini_install() } } -function jappixmini_uninstall() -{ - Hook::unregister('addon_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings'); - Hook::unregister('addon_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post'); - - Hook::unregister('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script'); - Hook::unregister('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login'); - - Hook::unregister('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron'); - - Hook::unregister('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source'); -} - function jappixmini_addon_admin(App $a, &$o) { // display instructions and warnings on addon settings page for admin @@ -434,7 +420,7 @@ function jappixmini_settings_post(App $a, &$b) // check that Jabber password was encrypted with correct Friendica password $friendica_password = trim($b['jappixmini-friendica-password']); if (!User::authenticate((int) $uid, $friendica_password)) { - info("Wrong friendica password!"); + notice("Wrong friendica password!"); return; } } @@ -462,11 +448,9 @@ function jappixmini_settings_post(App $a, &$b) DI::pConfig()->set($uid, 'jappixmini', 'activate' , intval($b['jappixmini-activate'])); DI::pConfig()->set($uid, 'jappixmini', 'dontinsertchat', intval($b['jappixmini-dont-insertchat'])); DI::pConfig()->set($uid, 'jappixmini', 'encrypt' , $encrypt); - info('Jappix Mini settings saved.'); if ($purge) { q("DELETE FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'"); - info('List of addresses purged.'); } } } @@ -660,7 +644,7 @@ function jappixmini_cron(App $a, $d) try { // send request - $answer_json = Network::fetchUrl($url); + $answer_json = DI::httpRequest()->fetch($url); // parse answer $answer = json_decode($answer_json); diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php index 20012a976..d7c2575e0 100644 --- a/js_upload/js_upload.php +++ b/js_upload/js_upload.php @@ -1,7 +1,7 @@ * Maintainer: Hypolite Petovan diff --git a/krynn/krynn.php b/krynn/krynn.php index fe25fdf75..88aa84ea2 100644 --- a/krynn/krynn.php +++ b/krynn/krynn.php @@ -1,7 +1,7 @@ * Planets Author: Tony Baldwin @@ -38,27 +38,6 @@ function krynn_install() { Logger::log("installed krynn"); } - -function krynn_uninstall() { - - /** - * - * uninstall unregisters any hooks created with register_hook - * during install. It may also delete configuration settings - * and any other cleanup. - * - */ - - Hook::unregister('post_local', 'addon/krynn/krynn.php', 'krynn_post_hook'); - Hook::unregister('addon_settings', 'addon/krynn/krynn.php', 'krynn_settings'); - Hook::unregister('addon_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post'); - - - Logger::log("removed krynn"); -} - - - function krynn_post_hook($a, &$item) { /** @@ -70,8 +49,6 @@ function krynn_post_hook($a, &$item) { * */ - Logger::log('krynn invoked'); - if(! local_user()) /* non-zero if this is a logged in user of this system */ return; diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index 42eff1452..954884219 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -25,14 +25,6 @@ function langfilter_install() Hook::register('addon_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post'); } -function langfilter_uninstall() -{ - Hook::unregister('prepare_body_content_filter', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body_content_filter'); - Hook::unregister('prepare_body', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body'); - Hook::unregister('addon_settings', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings'); - Hook::unregister('addon_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post'); -} - /* The settings * 1st check if somebody logged in is calling * 2nd get the current settings @@ -92,8 +84,6 @@ function langfilter_addon_settings_post(App $a, &$b) DI::pConfig()->set(local_user(), 'langfilter', 'languages' , $languages); DI::pConfig()->set(local_user(), 'langfilter', 'minconfidence', $minconfidence); DI::pConfig()->set(local_user(), 'langfilter', 'minlength' , $minlength); - - info(DI::l10n()->t('Language Filter Settings saved.')); } } diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php index 611079965..f99f6eeee 100644 --- a/ldapauth/ldapauth.php +++ b/ldapauth/ldapauth.php @@ -66,12 +66,6 @@ function ldapauth_install() Hook::register('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate'); } -function ldapauth_uninstall() -{ - Hook::unregister('load_config', 'addon/ldapauth/ldapauth.php', 'ldapauth_load_config'); - Hook::unregister('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate'); -} - function ldapauth_load_config(\Friendica\App $a, ConfigFileLoader $loader) { $a->getConfigCache()->load($loader->loadAddonConfig('ldapauth')); diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php index 8bb6f526b..04bbd4741 100644 --- a/leistungsschutzrecht/leistungsschutzrecht.php +++ b/leistungsschutzrecht/leistungsschutzrecht.php @@ -5,10 +5,10 @@ * Version: 0.1 * Author: Michael Vogel */ + use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\DI; -use Friendica\Util\Network; function leistungsschutzrecht_install() { Hook::register('cron', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_cron'); @@ -16,13 +16,6 @@ function leistungsschutzrecht_install() { Hook::register('page_info_data', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo'); } - -function leistungsschutzrecht_uninstall() { - Hook::unregister('cron', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_cron'); - Hook::unregister('getsiteinfo', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo'); - Hook::unregister('page_info_data', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo'); -} - function leistungsschutzrecht_getsiteinfo($a, &$siteinfo) { if (!isset($siteinfo["url"]) || empty($siteinfo['type'])) { return; @@ -79,7 +72,7 @@ function leistungsschutzrecht_fetchsites() { // This list works - but question is how current it is $url = "http://leistungsschutzrecht-stoppen.d-64.org/blacklist.txt"; - $sitelist = Network::fetchUrl($url); + $sitelist = DI::httpRequest()->fetch($url); $siteurls = explode(',', $sitelist); $whitelist = ['tagesschau.de', 'heute.de', 'wdr.de']; diff --git a/libertree/libertree.php b/libertree/libertree.php index 01a9d9420..1062ab5a1 100644 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -12,7 +12,6 @@ use Friendica\Core\Logger; use Friendica\Database\DBA; use Friendica\DI; -use Friendica\Util\Network; function libertree_install() { @@ -24,16 +23,6 @@ function libertree_install() Hook::register('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post'); } -function libertree_uninstall() -{ - Hook::unregister('hook_fork', 'addon/libertree/libertree.php', 'libertree_hook_fork'); - Hook::unregister('post_local', 'addon/libertree/libertree.php', 'libertree_post_local'); - Hook::unregister('notifier_normal', 'addon/libertree/libertree.php', 'libertree_send'); - Hook::unregister('jot_networks', 'addon/libertree/libertree.php', 'libertree_jot_nets'); - Hook::unregister('connector_settings', 'addon/libertree/libertree.php', 'libertree_settings'); - Hook::unregister('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post'); -} - function libertree_jot_nets(App &$a, array &$jotnets_fields) { if(! local_user()) { @@ -243,7 +232,7 @@ function libertree_send(&$a,&$b) { // 'token' => $ltree_api_token ]; - $result = Network::post($ltree_blog, $params)->getBody(); + $result = DI::httpRequest()->post($ltree_blog, $params)->getBody(); Logger::log('libertree: ' . $result); } } diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php index c49ac5c59..9a0c9db6f 100644 --- a/libravatar/libravatar.php +++ b/libravatar/libravatar.php @@ -26,16 +26,6 @@ function libravatar_install() Logger::log("registered libravatar in avatar_lookup hook"); } -/** - * Removes the addon hook - */ -function libravatar_uninstall() -{ - Hook::unregister('load_config', 'addon/libravatar/libravatar.php', 'libravatar_load_config'); - Hook::unregister('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup'); - Logger::log("unregistered libravatar in avatar_lookup hook"); -} - function libravatar_load_config(App $a, ConfigFileLoader $loader) { $a->getConfigCache()->load($loader->loadAddonConfig('libravatar')); @@ -126,5 +116,4 @@ function libravatar_addon_admin_post(&$a) $default_avatar = (!empty($_POST['avatar']) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon'); DI::config()->set('libravatar', 'default_avatar', $default_avatar); - info(DI::l10n()->t('Libravatar settings updated.') .EOL); } diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php index 5120612d0..0d0610086 100644 --- a/ljpost/ljpost.php +++ b/ljpost/ljpost.php @@ -14,7 +14,6 @@ use Friendica\DI; use Friendica\Model\Tag; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Network; use Friendica\Util\XML; function ljpost_install() { @@ -25,15 +24,6 @@ function ljpost_install() { Hook::register('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post'); } -function ljpost_uninstall() { - Hook::unregister('post_local', 'addon/ljpost/ljpost.php', 'ljpost_post_local'); - Hook::unregister('notifier_normal', 'addon/ljpost/ljpost.php', 'ljpost_send'); - Hook::unregister('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets'); - Hook::unregister('connector_settings', 'addon/ljpost/ljpost.php', 'ljpost_settings'); - Hook::unregister('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post'); - -} - function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields) { @@ -241,7 +231,7 @@ function ljpost_send(&$a,&$b) { Logger::log('ljpost: data: ' . $xml, Logger::DATA); if ($lj_blog !== 'test') { - $x = Network::post($lj_blog, $xml, ["Content-Type: text/xml"])->getBody(); + $x = DI::httpRequest()->post($lj_blog, $xml, ["Content-Type: text/xml"])->getBody(); } Logger::log('posted to livejournal: ' . ($x) ? $x : '', Logger::DEBUG); } diff --git a/mahjongg/mahjongg.php b/mahjongg/mahjongg.php index 502c92d98..7bc0adc98 100644 --- a/mahjongg/mahjongg.php +++ b/mahjongg/mahjongg.php @@ -12,11 +12,6 @@ function mahjongg_install() { Hook::register('app_menu', 'addon/mahjongg/mahjongg.php', 'mahjongg_app_menu'); } -function mahjongg_uninstall() { - Hook::unregister('app_menu', 'addon/mahjongg/mahjongg.php', 'mahjongg_app_menu'); - -} - function mahjongg_app_menu($a,&$b) { $b['app_menu'][] = '
Mahjongg
'; } diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index 89e6cc014..23aed60f9 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -12,9 +12,8 @@ use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; -use Friendica\Protocol\Activity; -use Friendica\Util\Network; use Friendica\Model\Item; +use Friendica\Protocol\Activity; function mailstream_install() { Hook::register('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings'); @@ -57,19 +56,6 @@ function mailstream_install() { } } -function mailstream_uninstall() { - Hook::unregister('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings'); - Hook::unregister('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post'); - Hook::unregister('post_local', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook'); - Hook::unregister('post_remote', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook'); - Hook::unregister('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook'); - Hook::unregister('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook'); - Hook::unregister('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); - Hook::unregister('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook'); - Hook::unregister('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron'); - Hook::unregister('incoming_mail', 'addon/mailstream/mailstream.php', 'mailstream_incoming_mail'); -} - function mailstream_module() {} function mailstream_addon_admin(&$a,&$o) { @@ -169,7 +155,7 @@ function mailstream_do_images($a, &$item, &$attachments) { continue; } $cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-'); - $curlResult = Network::fetchUrlFull($url, true, 0, '', $cookiejar); + $curlResult = DI::httpRequest()->fetchFull($url, true, 0, '', $cookiejar); $attachments[$url] = [ 'data' => $curlResult->getBody(), 'guid' => hash("crc32", $url), diff --git a/markdown/lang/it/messages.po b/markdown/lang/it/messages.po new file mode 100644 index 000000000..e5846130f --- /dev/null +++ b/markdown/lang/it/messages.po @@ -0,0 +1,39 @@ +# ADDON markdown +# Copyright (C) +# This file is distributed under the same license as the Friendica markdown addon package. +# +# +# Translators: +# Sylke Vicious , 2020 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-12-26 10:04+0000\n" +"PO-Revision-Date: 2019-12-27 06:41+0000\n" +"Last-Translator: Sylke Vicious , 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" + +#: markdown.php:32 +msgid "Markdown" +msgstr "Markdown" + +#: markdown.php:33 +msgid "Enable Markdown parsing" +msgstr "Abilita analisi Markdown" + +#: markdown.php:33 +msgid "" +"If enabled, self created items will additionally be parsed via Markdown." +msgstr "Se abilitato, gli elementi creati saranno analizzati via Markdown." + +#: markdown.php:34 +msgid "Save Settings" +msgstr "Salva Impostazioni" diff --git a/markdown/lang/it/strings.php b/markdown/lang/it/strings.php new file mode 100644 index 000000000..ebb93a456 --- /dev/null +++ b/markdown/lang/it/strings.php @@ -0,0 +1,12 @@ +strings["Markdown"] = "Markdown"; +$a->strings["Enable Markdown parsing"] = "Abilita analisi Markdown"; +$a->strings["If enabled, self created items will additionally be parsed via Markdown."] = "Se abilitato, gli elementi creati saranno analizzati via Markdown."; +$a->strings["Save Settings"] = "Salva Impostazioni"; diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php index a6c95d340..eeada8625 100644 --- a/mastodoncustomemojis/mastodoncustomemojis.php +++ b/mastodoncustomemojis/mastodoncustomemojis.php @@ -15,7 +15,6 @@ use Friendica\Core\Hook; use Friendica\Core\Protocol; use Friendica\DI; -use Friendica\Util\Network; use Friendica\Util\Proxy as ProxyUtils; function mastodoncustomemojis_install() @@ -28,16 +27,6 @@ function mastodoncustomemojis_install() Hook::register('contacts_mod_init', __FILE__, 'mastodoncustomemojis_css_hook'); } -function mastodoncustomemojis_uninstall() -{ - Hook::unregister('put_item_in_cache', __FILE__, 'mastodoncustomemojis_put_item_in_cache'); - Hook::unregister('network_mod_init', __FILE__, 'mastodoncustomemojis_css_hook'); - Hook::unregister('display_mod_init', __FILE__, 'mastodoncustomemojis_css_hook'); - Hook::unregister('search_mod_init', __FILE__, 'mastodoncustomemojis_css_hook'); - Hook::unregister('community_mod_init', __FILE__, 'mastodoncustomemojis_css_hook'); - Hook::unregister('contacts_mod_init', __FILE__, 'mastodoncustomemojis_css_hook'); -} - function mastodoncustomemojis_css_hook(App $a) { DI::page()['htmlhead'] .= <<fetchFull($api_url); if ($fetchResult->isSuccess()) { $emojis_array = json_decode($fetchResult->getBody(), true); diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php index 3cc42c47f..9734457d6 100644 --- a/mathjax/mathjax.php +++ b/mathjax/mathjax.php @@ -20,18 +20,6 @@ function mathjax_install() Hook::register('addon_settings_post', __FILE__, 'mathjax_settings_post'); } -function mathjax_uninstall() -{ - Hook::unregister('footer' , __FILE__, 'mathjax_footer'); - Hook::unregister('addon_settings' , __FILE__, 'mathjax_settings'); - Hook::unregister('addon_settings_post', __FILE__, 'mathjax_settings_post'); - - // Legacy hooks - Hook::unregister('load_config' , __FILE__, 'mathjax_load_config'); - Hook::unregister('page_header' , __FILE__, 'mathjax_page_header'); - Hook::unregister('template_vars' , __FILE__, 'mathjax_template_vars'); -} - function mathjax_settings_post($a) { if (!local_user() || empty($_POST['mathjax-submit'])) { diff --git a/membersince/membersince.php b/membersince/membersince.php index 6e96e904f..635a0158d 100644 --- a/membersince/membersince.php +++ b/membersince/membersince.php @@ -16,11 +16,6 @@ function membersince_install() Hook::register('profile_advanced', 'addon/membersince/membersince.php', 'membersince_display'); } -function membersince_uninstall() -{ - Hook::unregister('profile_advanced', 'addon/membersince/membersince.php', 'membersince_display'); -} - function membersince_display(Friendica\App $a, &$b) { if ($a->getCurrentTheme() == 'frio') { diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php index 1505176e4..2491aa806 100644 --- a/morechoice/morechoice.php +++ b/morechoice/morechoice.php @@ -18,18 +18,6 @@ function morechoice_install() { Hook::register('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector'); } - -function morechoice_uninstall() { - - Hook::unregister('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector'); - Hook::unregister('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector'); - Hook::unregister('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector'); - -// We need to leave this here for a while, because we now have a situation where people can end up with an orphaned hook. - Hook::unregister('poke_verbs', 'addon/morechoice/morechoice.php', 'morechoice_poke_verbs'); - -} - function morechoice_gender_selector($a,&$b) { $b['Androgyne'] = DI::l10n()->t('Androgyne'); $b['Bear'] = DI::l10n()->t('Bear'); diff --git a/morepokes/morepokes.php b/morepokes/morepokes.php index f943a8f47..4e7e7cfe9 100644 --- a/morepokes/morepokes.php +++ b/morepokes/morepokes.php @@ -14,11 +14,6 @@ function morepokes_install() Hook::register('poke_verbs', 'addon/morepokes/morepokes.php', 'morepokes_poke_verbs'); } -function morepokes_uninstall() -{ - Hook::unregister('poke_verbs', 'addon/morepokes/morepokes.php', 'morepokes_poke_verbs'); -} - function morepokes_poke_verbs($a, &$b) { $b['bitchslap'] = ['bitchslapped', DI::l10n()->t('bitchslap'), DI::l10n()->t('bitchslapped')]; diff --git a/namethingy/namethingy.php b/namethingy/namethingy.php index 7e314e891..52a48c5f9 100644 --- a/namethingy/namethingy.php +++ b/namethingy/namethingy.php @@ -14,11 +14,6 @@ function namethingy_install() { Hook::register('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu'); } -function namethingy_uninstall() { - Hook::unregister('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu'); - -} - function namethingy_app_menu($a,&$b) { $b['app_menu'][] = '
NameThingy
'; } diff --git a/newmemberwidget/lang/it/messages.po b/newmemberwidget/lang/it/messages.po index b62a779b4..5258d6b6a 100644 --- a/newmemberwidget/lang/it/messages.po +++ b/newmemberwidget/lang/it/messages.po @@ -5,13 +5,14 @@ # # Translators: # fabrixxm , 2014 +# Sylke Vicious , 2020 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-06-01 14:12+0200\n" -"PO-Revision-Date: 2017-09-20 06:08+0000\n" -"Last-Translator: fabrixxm \n" +"PO-Revision-Date: 2020-09-17 11:38+0000\n" +"Last-Translator: Sylke Vicious \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" @@ -49,21 +50,21 @@ msgstr "Il tuo messaggio per i nuovi utenti. Puoi usare BBCode" #: newmemberwidget.php:51 msgid "Add a link to global support forum" -msgstr "Aggiunge un link al forum di supporto globale" +msgstr "Aggiunge un collegamento al forum di supporto globale" #: newmemberwidget.php:51 msgid "Should a link to the global support forum be displayed?" -msgstr "Mostrare il link al forum di supporto globale?" +msgstr "Mostrare il collegamento al forum di supporto globale?" #: newmemberwidget.php:52 msgid "Add a link to the local support forum" -msgstr "Aggiunge un link al forum di supporto locale" +msgstr "Aggiunge un collegamento al forum di supporto locale" #: newmemberwidget.php:52 msgid "" "If you have a local support forum and wand to have a link displayed in the " "widget, check this box." -msgstr "Se hai un forum di supporto locale e vuoi che sia mostrato il link nel widget, seleziona questo box." +msgstr "Se hai un forum di supporto locale e vuoi che sia mostrato il collegamento nel widget, seleziona questo box." #: newmemberwidget.php:53 msgid "Name of the local support group" diff --git a/newmemberwidget/lang/it/strings.php b/newmemberwidget/lang/it/strings.php index a9a089048..6138ea6a1 100644 --- a/newmemberwidget/lang/it/strings.php +++ b/newmemberwidget/lang/it/strings.php @@ -2,6 +2,7 @@ if(! function_exists("string_plural_select_it")) { function string_plural_select_it($n){ + $n = intval($n); return ($n != 1);; }} ; @@ -12,9 +13,9 @@ function string_plural_select_it($n){ $a->strings["Save Settings"] = "Salva Impostazioni"; $a->strings["Message"] = "Messaggio"; $a->strings["Your message for new members. You can use bbcode here."] = "Il tuo messaggio per i nuovi utenti. Puoi usare BBCode"; -$a->strings["Add a link to global support forum"] = "Aggiunge un link al forum di supporto globale"; -$a->strings["Should a link to the global support forum be displayed?"] = "Mostrare il link al forum di supporto globale?"; -$a->strings["Add a link to the local support forum"] = "Aggiunge un link al forum di supporto locale"; -$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "Se hai un forum di supporto locale e vuoi che sia mostrato il link nel widget, seleziona questo box."; +$a->strings["Add a link to global support forum"] = "Aggiunge un collegamento al forum di supporto globale"; +$a->strings["Should a link to the global support forum be displayed?"] = "Mostrare il collegamento al forum di supporto globale?"; +$a->strings["Add a link to the local support forum"] = "Aggiunge un collegamento al forum di supporto locale"; +$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "Se hai un forum di supporto locale e vuoi che sia mostrato il collegamento nel widget, seleziona questo box."; $a->strings["Name of the local support group"] = "Nome del gruppo locale di supporto"; $a->strings["If you checked the above, specify the nickname of the local support group here (i.e. helpers)"] = "Se hai selezionato il box sopra, specifica qui il nome utente del gruppo locale di supporto (e.s. 'supporto')"; diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php index 585568135..d748816e0 100644 --- a/newmemberwidget/newmemberwidget.php +++ b/newmemberwidget/newmemberwidget.php @@ -19,11 +19,6 @@ function newmemberwidget_install() Logger::log('newmemberwidget installed'); } -function newmemberwidget_uninstall() -{ - Hook::unregister( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init'); -} - function newmemberwidget_network_mod_init ($a, $b) { if (empty($_SESSION['new_member'])) { diff --git a/notifyall/lang/ru/messages.po b/notifyall/lang/ru/messages.po new file mode 100644 index 000000000..63d448468 --- /dev/null +++ b/notifyall/lang/ru/messages.po @@ -0,0 +1,60 @@ +# ADDON notifyall +# Copyright (C) +# This file is distributed under the same license as the Friendica notifyall addon package. +# +# +# Translators: +# Alexander An , 2020 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-08-14 16:41+0200\n" +"PO-Revision-Date: 2016-08-14 19:29+0000\n" +"Last-Translator: Alexander An , 2020\n" +"Language-Team: Russian (https://www.transifex.com/Friendica/teams/12172/ru/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" + +#: notifyall.php:26 +msgid "Send email to all members" +msgstr "Послать почту всем пользователям" + +#: notifyall.php:42 +#, php-format +msgid "%s Administrator" +msgstr "%s Администратор" + +#: notifyall.php:44 +#, php-format +msgid "%1$s, %2$s Administrator" +msgstr "%1$s, %2$s Администратор" + +#: notifyall.php:60 +msgid "No recipients found." +msgstr "Получатели не найдены." + +#: notifyall.php:78 +msgid "Emails sent" +msgstr "Сообщения высланы." + +#: notifyall.php:86 +msgid "Send email to all members of this Friendica instance." +msgstr "Выслать почтовое сообщение всем пользователям этого узла Friendica." + +#: notifyall.php:91 +msgid "Message subject" +msgstr "Тема сообщения" + +#: notifyall.php:92 +msgid "Test mode (only send to administrator)" +msgstr "Пробный режим (отправить только администратору)" + +#: notifyall.php:93 +msgid "Submit" +msgstr "Отправить" diff --git a/notifyall/lang/ru/strings.php b/notifyall/lang/ru/strings.php new file mode 100644 index 000000000..4d394daef --- /dev/null +++ b/notifyall/lang/ru/strings.php @@ -0,0 +1,17 @@ +=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);; +}} +; +$a->strings["Send email to all members"] = "Послать почту всем пользователям"; +$a->strings["%s Administrator"] = "%s Администратор"; +$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Администратор"; +$a->strings["No recipients found."] = "Получатели не найдены."; +$a->strings["Emails sent"] = "Сообщения высланы."; +$a->strings["Send email to all members of this Friendica instance."] = "Выслать почтовое сообщение всем пользователям этого узла Friendica."; +$a->strings["Message subject"] = "Тема сообщения"; +$a->strings["Test mode (only send to administrator)"] = "Пробный режим (отправить только администратору)"; +$a->strings["Submit"] = "Отправить"; diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php index 6d1793804..e5e94c7ec 100644 --- a/notifyall/notifyall.php +++ b/notifyall/notifyall.php @@ -15,16 +15,6 @@ use Friendica\Core\Renderer; use Friendica\DI; -function notifyall_install() -{ - Logger::log("installed notifyall"); -} - -function notifyall_uninstall() -{ - Logger::log("removed notifyall"); -} - function notifyall_module() {} function notifyall_addon_admin(App $a, &$o) @@ -66,7 +56,7 @@ function notifyall_post(App $a) DI::emailer()->send($notifyEmail->withRecipient($recipient['email'])); } - notice(DI::l10n()->t('Emails sent')); + info(DI::l10n()->t('Emails sent')); DI::baseUrl()->redirect('admin'); } diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php index a0765b962..b99501c3a 100644 --- a/notimeline/notimeline.php +++ b/notimeline/notimeline.php @@ -16,12 +16,6 @@ function notimeline_install() Hook::register('addon_settings_post', 'addon/notimeline/notimeline.php', 'notimeline_settings_post'); } -function notimeline_uninstall() -{ - Hook::unregister('addon_settings', 'addon/notimeline/notimeline.php', 'notimeline_settings'); - Hook::unregister('addon_settings_post', 'addon/notimeline/notimeline.php', 'notimeline_settings_post'); -} - function notimeline_settings_post($a, $post) { if (!local_user() || empty($_POST['notimeline-submit'])) { @@ -29,7 +23,6 @@ function notimeline_settings_post($a, $post) } DI::pConfig()->set(local_user(), 'system', 'no_wall_archive_widget', intval($_POST['notimeline'])); - info(DI::l10n()->t('No Timeline settings updated.') . EOL); } function notimeline_settings(&$a, &$s) diff --git a/nsfw/lang/it/messages.po b/nsfw/lang/it/messages.po index abb605cd4..a84d0a136 100644 --- a/nsfw/lang/it/messages.po +++ b/nsfw/lang/it/messages.po @@ -5,13 +5,14 @@ # # Translators: # fabrixxm , 2014-2015,2018 +# Sylke Vicious , 2020 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-01 11:11-0400\n" -"PO-Revision-Date: 2018-05-28 09:01+0000\n" -"Last-Translator: fabrixxm \n" +"PO-Revision-Date: 2020-09-17 11:25+0000\n" +"Last-Translator: Sylke Vicious \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" @@ -29,7 +30,7 @@ msgid "" " can be used to filter content tagged with for instance #NSFW that may be " "deemed inappropriate at certain times or places, such as being at work. It " "is also useful for hiding irrelevant or annoying content from direct view." -msgstr "Questo componente aggiuntivo cerca per le parole specificate nei messaggi e li collassa. Può essere usato per filtrare contenuto taggato, per esempio, #NSFW (non sicuro per il lavoro), che puo' risultare inappropriato in certi orari o in certi luoghi, come appunto al lavoro. È anche utile per nascondere contenuto irrilevante o fastidioso." +msgstr "Questo componente aggiuntivo cerca per le parole specificate nei messaggi e li collassa. Può essere usato per filtrare contenuto taggato, per esempio, #NSFW (non sicuro per il lavoro), che può risultare inappropriato in certi orari o in certi luoghi, come appunto al lavoro. È anche utile per nascondere contenuto irrilevante o fastidioso." #: nsfw.php:86 msgid "Enable Content filter" diff --git a/nsfw/lang/it/strings.php b/nsfw/lang/it/strings.php index 18ecfb164..69d9e287d 100644 --- a/nsfw/lang/it/strings.php +++ b/nsfw/lang/it/strings.php @@ -7,7 +7,7 @@ function string_plural_select_it($n){ }} ; $a->strings["Content Filter (NSFW and more)"] = "Filtro Contenuto (NSFW e altro)"; -$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "Questo componente aggiuntivo cerca per le parole specificate nei messaggi e li collassa. Può essere usato per filtrare contenuto taggato, per esempio, #NSFW (non sicuro per il lavoro), che puo' risultare inappropriato in certi orari o in certi luoghi, come appunto al lavoro. È anche utile per nascondere contenuto irrilevante o fastidioso."; +$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "Questo componente aggiuntivo cerca per le parole specificate nei messaggi e li collassa. Può essere usato per filtrare contenuto taggato, per esempio, #NSFW (non sicuro per il lavoro), che può risultare inappropriato in certi orari o in certi luoghi, come appunto al lavoro. È anche utile per nascondere contenuto irrilevante o fastidioso."; $a->strings["Enable Content filter"] = "Abilita il Filtro Contenuti"; $a->strings["Comma separated list of keywords to hide"] = "Elenco separato da virgole di parole da nascondere"; $a->strings["Save Settings"] = "Salva Impostazioni"; diff --git a/nsfw/lang/nl/messages.po b/nsfw/lang/nl/messages.po index e7af8746c..a012eee14 100644 --- a/nsfw/lang/nl/messages.po +++ b/nsfw/lang/nl/messages.po @@ -4,14 +4,15 @@ # # # Translators: +# Casper , 2020 # Jeroen De Meerleer , 2018 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-04-01 11:11-0400\n" -"PO-Revision-Date: 2018-08-24 13:43+0000\n" -"Last-Translator: Jeroen De Meerleer \n" +"PO-Revision-Date: 2020-09-04 21:08+0000\n" +"Last-Translator: Casper \n" "Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,7 @@ msgid "" " can be used to filter content tagged with for instance #NSFW that may be " "deemed inappropriate at certain times or places, such as being at work. It " "is also useful for hiding irrelevant or annoying content from direct view." -msgstr "" +msgstr "Deze add-on zoekt naar gespecificeerde woorden / tekst in berichten en vouwt ze samen. Het kan worden gebruikt om inhoud te filteren die is getagd met bijvoorbeeld #NSFW die op bepaalde tijden of plaatsen als ongepast kan worden beschouwd, zoals op het werk. Het is ook handig om irrelevante of irritante inhoud voor direct zicht te verbergen." #: nsfw.php:86 msgid "Enable Content filter" diff --git a/nsfw/lang/nl/strings.php b/nsfw/lang/nl/strings.php index d1a121a7c..83dc72413 100644 --- a/nsfw/lang/nl/strings.php +++ b/nsfw/lang/nl/strings.php @@ -7,7 +7,7 @@ function string_plural_select_nl($n){ }} ; $a->strings["Content Filter (NSFW and more)"] = "Inhoud filter (NSFW en meer)"; -$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = ""; +$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "Deze add-on zoekt naar gespecificeerde woorden / tekst in berichten en vouwt ze samen. Het kan worden gebruikt om inhoud te filteren die is getagd met bijvoorbeeld #NSFW die op bepaalde tijden of plaatsen als ongepast kan worden beschouwd, zoals op het werk. Het is ook handig om irrelevante of irritante inhoud voor direct zicht te verbergen."; $a->strings["Enable Content filter"] = "Content filter inschakelen"; $a->strings["Comma separated list of keywords to hide"] = ""; $a->strings["Save Settings"] = "Instellingen opslaan"; diff --git a/nsfw/lang/ru/messages.po b/nsfw/lang/ru/messages.po new file mode 100644 index 000000000..caa7ef3aa --- /dev/null +++ b/nsfw/lang/ru/messages.po @@ -0,0 +1,62 @@ +# ADDON nsfw +# Copyright (C) +# This file is distributed under the same license as the Friendica nsfw addon package. +# +# +# Translators: +# Alexander An , 2020 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-04-01 11:11-0400\n" +"PO-Revision-Date: 2020-09-01 05:38+0000\n" +"Last-Translator: Alexander An \n" +"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" + +#: nsfw.php:77 nsfw.php:81 +msgid "Content Filter (NSFW and more)" +msgstr "Фильтр контента (NSFW и прочее)" + +#: nsfw.php:85 +msgid "" +"This addon searches for specified words/text in posts and collapses them. It" +" can be used to filter content tagged with for instance #NSFW that may be " +"deemed inappropriate at certain times or places, such as being at work. It " +"is also useful for hiding irrelevant or annoying content from direct view." +msgstr "Это дополнение ищет указанные слова и выражения в записях и сворачивает запись, если найдёт. Это можно использовать для скрытия записей с тэгом #NSFW, просмотр которых может быть нежелателен в определённое время, например, на работе. Так же можно использовать для скрытия иного контента." + +#: nsfw.php:86 +msgid "Enable Content filter" +msgstr "Включить фильтр контента" + +#: nsfw.php:89 +msgid "Comma separated list of keywords to hide" +msgstr "Ключевые слова для скрытия, через запятую" + +#: nsfw.php:93 +msgid "Save Settings" +msgstr "Сохранить настройки" + +#: nsfw.php:94 +msgid "Use /expression/ to provide regular expressions" +msgstr "Используйте формат /expression/ для регулярных выражений" + +#: nsfw.php:109 +msgid "NSFW Settings saved." +msgstr "Настройки NSFW сохранены" + +#: nsfw.php:162 +#, php-format +msgid "Filtered tag: %s" +msgstr "Скрыт тэг: %s" + +#: nsfw.php:164 +#, php-format +msgid "Filtered word: %s" +msgstr "Скрыто слово: %s" diff --git a/nsfw/lang/ru/strings.php b/nsfw/lang/ru/strings.php index 7e821ed88..d16d1195d 100644 --- a/nsfw/lang/ru/strings.php +++ b/nsfw/lang/ru/strings.php @@ -1,10 +1,17 @@ -strings["Not Safe For Work (General Purpose Content Filter) settings"] = ""; -$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = ""; -$a->strings["Enable Content filter"] = "Включить фильтр содержимого"; -$a->strings["Comma separated list of keywords to hide"] = "ключевые слова, которые скрыть (список через запятую)"; -$a->strings["Submit"] = "Подтвердить"; -$a->strings["Use /expression/ to provide regular expressions"] = ""; -$a->strings["NSFW Settings saved."] = "NSFW Настройки сохранены."; -$a->strings["%s - Click to open/close"] = "%s - Нажмите для открытия / закрытия"; +=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);; +}} +; +$a->strings["Content Filter (NSFW and more)"] = "Фильтр контента (NSFW и прочее)"; +$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "Это дополнение ищет указанные слова и выражения в записях и сворачивает запись, если найдёт. Это можно использовать для скрытия записей с тэгом #NSFW, просмотр которых может быть нежелателен в определённое время, например, на работе. Так же можно использовать для скрытия иного контента."; +$a->strings["Enable Content filter"] = "Включить фильтр контента"; +$a->strings["Comma separated list of keywords to hide"] = "Ключевые слова для скрытия, через запятую"; +$a->strings["Save Settings"] = "Сохранить настройки"; +$a->strings["Use /expression/ to provide regular expressions"] = "Используйте формат /expression/ для регулярных выражений"; +$a->strings["NSFW Settings saved."] = "Настройки NSFW сохранены"; +$a->strings["Filtered tag: %s"] = "Скрыт тэг: %s"; +$a->strings["Filtered word: %s"] = "Скрыто слово: %s"; diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index 85260c7f7..9f81b29d8 100644 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -17,14 +17,6 @@ function nsfw_install() Hook::register('addon_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post'); } -function nsfw_uninstall() -{ - Hook::unregister('prepare_body_content_filter', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body_content_filter'); - Hook::unregister('prepare_body', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body'); - Hook::unregister('addon_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings'); - Hook::unregister('addon_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post'); -} - // This function isn't perfect and isn't trying to preserve the html structure - it's just a // quick and dirty filter to pull out embedded photo blobs because 'nsfw' seems to come up // inside them quite often. We don't need anything fancy, just pull out the data blob so we can @@ -105,7 +97,6 @@ function nsfw_addon_settings_post(&$a, &$b) $enable = (!empty($_POST['nsfw-enable']) ? intval($_POST['nsfw-enable']) : 0); $disable = 1 - $enable; DI::pConfig()->set(local_user(), 'nsfw', 'disable', $disable); - info(DI::l10n()->t('NSFW Settings saved.') . EOL); } } diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php index 9143fb494..f12badeb4 100644 --- a/numfriends/numfriends.php +++ b/numfriends/numfriends.php @@ -17,16 +17,6 @@ function numfriends_install() { Logger::log("installed numfriends"); } - -function numfriends_uninstall() { - - Hook::unregister('addon_settings', 'addon/numfriends/numfriends.php', 'numfriends_settings'); - Hook::unregister('addon_settings_post', 'addon/numfriends/numfriends.php', 'numfriends_settings_post'); - - - Logger::log("removed numfriends"); -} - /** * * Callback from the settings post function. @@ -40,7 +30,6 @@ function numfriends_settings_post($a,$post) { return; DI::pConfig()->set(local_user(),'system','display_friend_count',intval($_POST['numfriends'])); - info( DI::l10n()->t('Numfriends settings updated.') . EOL); } diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php index 5df1c7d7d..168d3d2ff 100644 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -9,13 +9,12 @@ * */ -use Friendica\DI; use Friendica\Core\Cache\Duration; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Renderer; +use Friendica\DI; use Friendica\Util\ConfigFileLoader; -use Friendica\Util\Network; use Friendica\Util\Strings; const OSM_TMS = 'https://www.openstreetmap.org'; @@ -35,18 +34,6 @@ function openstreetmap_install() Logger::log("installed openstreetmap"); } -function openstreetmap_uninstall() -{ - Hook::unregister('load_config', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_load_config'); - Hook::unregister('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location'); - Hook::unregister('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map'); - Hook::unregister('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map'); - Hook::unregister('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates'); - Hook::unregister('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader'); - - Logger::log("removed openstreetmap"); -} - function openstreetmap_load_config(\Friendica\App $a, ConfigFileLoader $loader) { $a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap')); @@ -132,7 +119,7 @@ function openstreetmap_get_coordinates($a, &$b) $j = DI::cache()->get($cachekey); if (is_null($j)) { - $curlResult = Network::curl($nomserver . $args); + $curlResult = DI::httpRequest()->get($nomserver . $args); if ($curlResult->isSuccess()) { $j = json_decode($curlResult->getBody(), true); DI::cache()->set($cachekey, $j, Duration::MONTH); @@ -223,6 +210,4 @@ function openstreetmap_addon_admin_post(&$a) DI::config()->set('openstreetmap', 'nomserver', $urlnom); DI::config()->set('openstreetmap', 'zoom', $zoom); DI::config()->set('openstreetmap', 'marker', $marker); - - info(DI::l10n()->t('Settings updated.') . EOL); } diff --git a/pageheader/lang/ru/messages.po b/pageheader/lang/ru/messages.po new file mode 100644 index 000000000..f637afa42 --- /dev/null +++ b/pageheader/lang/ru/messages.po @@ -0,0 +1,42 @@ +# ADDON pageheader +# Copyright (C) +# This file is distributed under the same license as the Friendica pageheader addon package. +# +# +# Translators: +# Alexander An , 2020 +msgid "" +msgstr "" +"Project-Id-Version: friendica\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-03-11 18:52+0100\n" +"PO-Revision-Date: 2020-09-01 05:29+0000\n" +"Last-Translator: Alexander An \n" +"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" + +#: pageheader.php:53 +msgid "\"pageheader\" Settings" +msgstr "" + +#: pageheader.php:54 +msgid "Message" +msgstr "Сообщение" + +#: pageheader.php:54 +msgid "" +"Message to display on every page on this server (or put a pageheader.html " +"file in your docroot)" +msgstr "Сообщение для отображения на каждой странице этого сервера (или поместите файл pageheader.html в корневую папку веб-сервера)" + +#: pageheader.php:55 +msgid "Save Settings" +msgstr "Сохранить настройки" + +#: pageheader.php:69 +msgid "pageheader Settings saved." +msgstr "pageheader Настройки сохранены." diff --git a/pageheader/lang/ru/strings.php b/pageheader/lang/ru/strings.php index edf7ea453..39e28e218 100644 --- a/pageheader/lang/ru/strings.php +++ b/pageheader/lang/ru/strings.php @@ -1,5 +1,13 @@ -strings["\"pageheader\" Settings"] = ""; -$a->strings["Submit"] = "Подтвердить"; -$a->strings["pageheader Settings saved."] = ""; +=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);; +}} +; +$a->strings["\"pageheader\" Settings"] = ""; +$a->strings["Message"] = "Сообщение"; +$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "Сообщение для отображения на каждой странице этого сервера (или поместите файл pageheader.html в корневую папку веб-сервера)"; +$a->strings["Save Settings"] = "Сохранить настройки"; +$a->strings["pageheader Settings saved."] = "pageheader Настройки сохранены."; diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php index 201df3221..f0d75400e 100644 --- a/pageheader/pageheader.php +++ b/pageheader/pageheader.php @@ -51,7 +51,6 @@ function pageheader_addon_admin_post(App $a) if (isset($_POST['pageheader-words'])) { DI::config()->set('pageheader', 'text', trim(strip_tags($_POST['pageheader-words']))); } - info(DI::l10n()->t('pageheader Settings saved.')); } } diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php index e9a3c66ea..5b43c8f19 100644 --- a/phpmailer/phpmailer.php +++ b/phpmailer/phpmailer.php @@ -90,9 +90,14 @@ function phpmailer_emailer_send_prepare(App $a, IEmail &$email) // additional headers if (!empty($email->getAdditionalMailHeader())) { - foreach (explode("\n", trim($email->getAdditionalMailHeader())) as $header_line) { - list($name, $value) = explode(':', $header_line, 2); - $mailer->addCustomHeader(trim($name), trim($value)); + foreach ($email->getAdditionalMailHeader() as $name => $values) { + // Set the "Message-ID" header for PHP-Mailer directly + if ($name == 'Message-Id') { + // implode all values to one entry, because there's only one value possible + $mailer->MessageID = trim(implode("", $values)); + } else { + $mailer->addCustomHeader(trim($name), trim(implode("\n", $values))); + } } } diff --git a/piwik/lang/it/messages.po b/piwik/lang/it/messages.po index e7a070b17..033fc7369 100644 --- a/piwik/lang/it/messages.po +++ b/piwik/lang/it/messages.po @@ -5,13 +5,14 @@ # # Translators: # fabrixxm , 2014-2015,2019 +# Sylke Vicious , 2020 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-02-19 10:42+0100\n" -"PO-Revision-Date: 2019-03-11 14:19+0000\n" -"Last-Translator: fabrixxm \n" +"PO-Revision-Date: 2020-09-17 11:39+0000\n" +"Last-Translator: Sylke Vicious \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" @@ -53,7 +54,7 @@ msgstr "ID del sito" #: piwik.php:107 msgid "Show opt-out cookie link?" -msgstr "Mostra il link per il cookie opt-out?" +msgstr "Mostra il collegamento per l'opt-out dei cookie?" #: piwik.php:108 msgid "Asynchronous tracking" diff --git a/piwik/lang/it/strings.php b/piwik/lang/it/strings.php index 0fc1c7638..e523a69dc 100644 --- a/piwik/lang/it/strings.php +++ b/piwik/lang/it/strings.php @@ -12,6 +12,6 @@ function string_plural_select_it($n){ $a->strings["Matomo (Piwik) Base URL"] = "Indirizzo di base di Matomo (Piwik)"; $a->strings["Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)"] = "Percorso assoluto alla tua installazione di Matomo (Piwik) (senza il protocollo (http/https), con la barra alla fine)"; $a->strings["Site ID"] = "ID del sito"; -$a->strings["Show opt-out cookie link?"] = "Mostra il link per il cookie opt-out?"; +$a->strings["Show opt-out cookie link?"] = "Mostra il collegamento per l'opt-out dei cookie?"; $a->strings["Asynchronous tracking"] = "Tracciamento asincrono"; $a->strings["Settings updated."] = "Impostazioni aggiornate."; diff --git a/piwik/piwik.php b/piwik/piwik.php index 6dba45a34..d461cfd4f 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -45,13 +45,6 @@ function piwik_install() { Logger::log("installed piwik addon"); } -function piwik_uninstall() { - Hook::unregister('load_config', 'addon/piwik/piwik.php', 'piwik_load_config'); - Hook::unregister('page_end', 'addon/piwik/piwik.php', 'piwik_analytics'); - - Logger::log("uninstalled piwik addon"); -} - function piwik_load_config(\Friendica\App $a, ConfigFileLoader $loader) { $a->getConfigCache()->load($loader->loadAddonConfig('piwik')); @@ -117,5 +110,4 @@ function piwik_addon_admin_post (&$a) { DI::config()->set('piwik', 'siteid', $id); DI::config()->set('piwik', 'optout', $optout); DI::config()->set('piwik', 'async', $async); - info(DI::l10n()->t('Settings updated.'). EOL); } diff --git a/planets/planets.php b/planets/planets.php index ea543f409..9fed41862 100644 --- a/planets/planets.php +++ b/planets/planets.php @@ -35,27 +35,6 @@ function planets_install() { Logger::log("installed planets"); } - -function planets_uninstall() { - - /** - * - * uninstall unregisters any hooks created with register_hook - * during install. It may also delete configuration settings - * and any other cleanup. - * - */ - - Hook::unregister('post_local', 'addon/planets/planets.php', 'planets_post_hook'); - Hook::unregister('addon_settings', 'addon/planets/planets.php', 'planets_settings'); - Hook::unregister('addon_settings_post', 'addon/planets/planets.php', 'planets_settings_post'); - - - Logger::log("removed planets"); -} - - - function planets_post_hook($a, &$item) { /** diff --git a/public_server/public_server.php b/public_server/public_server.php index 41c628325..549020bd2 100644 --- a/public_server/public_server.php +++ b/public_server/public_server.php @@ -27,15 +27,6 @@ function public_server_install() Hook::register('logged_in', 'addon/public_server/public_server.php', 'public_server_login'); } -function public_server_uninstall() -{ - Hook::unregister('load_config', 'addon/public_server/public_server.php', 'public_server_load_config'); - Hook::unregister('register_account', 'addon/public_server/public_server.php', 'public_server_register_account'); - Hook::unregister('cron', 'addon/public_server/public_server.php', 'public_server_cron'); - Hook::unregister('enotify', 'addon/public_server/public_server.php', 'public_server_enotify'); - Hook::unregister('logged_in', 'addon/public_server/public_server.php', 'public_server_login'); -} - function public_server_load_config(App $a, ConfigFileLoader $loader) { $a->getConfigCache()->load($loader->loadAddonConfig('public_server')); @@ -160,7 +151,6 @@ function public_server_addon_admin_post(&$a) DI::config()->set('public_server', 'flagusers', $flagusers); DI::config()->set('public_server', 'flagposts', $flagposts); DI::config()->set('public_server', 'flagpostsexpire', $flagpostsexpire); - info(DI::l10n()->t('Settings saved').EOL); } function public_server_addon_admin(&$a, &$o) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 87e3344d0..2e2ca98cb 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -23,7 +23,6 @@ use Friendica\Protocol\ActivityNamespace; use Friendica\Util\ConfigFileLoader; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Network; use Friendica\Util\Strings; use Friendica\Util\XML; @@ -46,19 +45,6 @@ function pumpio_install() Hook::register('check_item_notification', 'addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); } -function pumpio_uninstall() -{ - Hook::unregister('load_config', 'addon/pumpio/pumpio.php', 'pumpio_load_config'); - Hook::unregister('hook_fork', 'addon/pumpio/pumpio.php', 'pumpio_hook_fork'); - Hook::unregister('post_local', 'addon/pumpio/pumpio.php', 'pumpio_post_local'); - Hook::unregister('notifier_normal', 'addon/pumpio/pumpio.php', 'pumpio_send'); - Hook::unregister('jot_networks', 'addon/pumpio/pumpio.php', 'pumpio_jot_nets'); - Hook::unregister('connector_settings', 'addon/pumpio/pumpio.php', 'pumpio_settings'); - Hook::unregister('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post'); - Hook::unregister('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron'); - Hook::unregister('check_item_notification', 'addon/pumpio/pumpio.php', 'pumpio_check_item_notification'); -} - function pumpio_module() {} function pumpio_content(App $a) @@ -925,8 +911,6 @@ function pumpio_dounlike(App $a, $uid, $self, $post, $own_id) function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion = true) { - require_once('include/items.php'); - if (empty($post->object->id)) { Logger::log('Got empty like: '.print_r($post, true), Logger::DEBUG); return; @@ -1071,7 +1055,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) } if (!empty($contact->image->url)) { - Contact::updateAvatar($contact->image->url, $uid, $contact_id); + Contact::updateAvatar($contact_id, $contact->image->url); } return $contact_id; @@ -1096,8 +1080,6 @@ function pumpio_dodelete(App $a, $uid, $self, $post, $own_id) function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcompletion = true) { - require_once('include/items.php'); - if (($post->verb == "like") || ($post->verb == "favorite")) { return pumpio_dolike($a, $uid, $self, $post, $own_id); } @@ -1609,7 +1591,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id) function pumpio_reachable($url) { - return Network::curl($url, false, ['timeout' => 10])->isSuccess(); + return DI::httpRequest()->get($url, false, ['timeout' => 10])->isSuccess(); } /* diff --git a/qcomment/qcomment.css b/qcomment/qcomment.css deleted file mode 100644 index 3e5513bbc..000000000 --- a/qcomment/qcomment.css +++ /dev/null @@ -1,19 +0,0 @@ - -#qcomment-label { - float: left; - width: 300px; - margin-top: 10px; -} - -#qcomment-words { - float: left; - margin-top: 10px; - width: 100px; - height: 150px; - -} - -#qcomment-submit { - margin-top: 15px; -} - diff --git a/qcomment/qcomment.js b/qcomment/qcomment.js new file mode 100644 index 000000000..1f5c3496f --- /dev/null +++ b/qcomment/qcomment.js @@ -0,0 +1,18 @@ +function qCommentInsert(obj, id) +{ + let $textarea = $('#comment-edit-text-' + id); + + if ($textarea.val() === '') { + $textarea.addClass('comment-edit-text-full'); + $textarea.removeClass('comment-edit-text-empty'); + openMenu('comment-edit-submit-wrapper-' + id); + } + + var ins = $(obj).val(); + ins = ins.replace('<', '<'); + ins = ins.replace('>', '>'); + ins = ins.replace('&', '&'); + ins = ins.replace('"', '"'); + $textarea.val($textarea.val() + ins); + $(obj).val(''); +} diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php index 1ce092053..ed110f667 100644 --- a/qcomment/qcomment.php +++ b/qcomment/qcomment.php @@ -21,16 +21,16 @@ use Friendica\DI; use Friendica\Util\XML; -function qcomment_install() { - Hook::register('addon_settings', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings'); - Hook::register('addon_settings_post', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings_post'); - +function qcomment_install() +{ + Hook::register('addon_settings' , __FILE__, 'qcomment_addon_settings'); + Hook::register('addon_settings_post', __FILE__, 'qcomment_addon_settings_post'); + Hook::register('footer' , __FILE__, 'qcomment_footer'); } -function qcomment_uninstall() { - Hook::unregister('addon_settings', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings'); - Hook::unregister('addon_settings_post', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings_post'); - +function qcomment_footer(\Friendica\App $a, &$b) +{ + DI::page()->registerFooterScript(__DIR__ . '/qcomment.js'); } function qcomment_addon_settings(&$a, &$s) @@ -39,24 +39,16 @@ function qcomment_addon_settings(&$a, &$s) return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - - DI::page()['htmlhead'] .= '' . "\r\n"; - $words = DI::pConfig()->get(local_user(), 'qcomment', 'words', DI::l10n()->t(':-)') . "\n" . DI::l10n()->t(':-(') . "\n" . DI::l10n()->t('lol')); - $s .= '
'; - $s .= '

' . DI::l10n()->t('Quick Comment Settings') . '

'; - $s .= '
'; - $s .= '
' . DI::l10n()->t("Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.") . '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - $s .= '
'; - $s .= '
'; - - return; + $t = \Friendica\Core\Renderer::getMarkupTemplate('settings.tpl', 'addon/qcomment/'); + $s .= \Friendica\Core\Renderer::replaceMacros($t, [ + '$postpost' => isset($_POST['qcomment-words']), + '$header' => DI::l10n()->t('Quick Comment Settings'), + '$description' => DI::l10n()->t("Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."), + '$save' => DI::l10n()->t('Save Settings'), + '$words' => ['qcomment-words', DI::l10n()->t('Enter quick comments, one per line'), $words, null, ' rows="10"'], + ]); } function qcomment_addon_settings_post(&$a, &$b) @@ -65,8 +57,7 @@ function qcomment_addon_settings_post(&$a, &$b) return; } - if ($_POST['qcomment-submit']) { + if (isset($_POST['qcomment-words'])) { DI::pConfig()->set(local_user(), 'qcomment', 'words', XML::escape($_POST['qcomment-words'])); - info(DI::l10n()->t('Quick Comment settings saved.') . EOL); } } diff --git a/qcomment/templates/settings.tpl b/qcomment/templates/settings.tpl new file mode 100644 index 000000000..31ccea86d --- /dev/null +++ b/qcomment/templates/settings.tpl @@ -0,0 +1,21 @@ + +

{{$header}}

+ +
+ +

{{$header}}

+ + +
+

{{$description}}

+ + {{include file="field_textarea.tpl" field=$words}} + +
+ +
+
+
diff --git a/randplace/randplace.php b/randplace/randplace.php index 886d79d12..3576fef85 100644 --- a/randplace/randplace.php +++ b/randplace/randplace.php @@ -52,17 +52,12 @@ function randplace_uninstall() { /** * - * uninstall unregisters any hooks created with register_hook - * during install. It may also delete configuration settings - * and any other cleanup. + * This function should undo anything that was done in name_install() + * + * Except hooks, they are all unregistered automatically and don't need to be unregistered manually. * */ - Hook::unregister('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook'); - Hook::unregister('addon_settings', 'addon/randplace/randplace.php', 'randplace_settings'); - Hook::unregister('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post'); - - Logger::log("removed randplace"); } diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php index 268171828..6fe75f169 100644 --- a/remote_permissions/remote_permissions.php +++ b/remote_permissions/remote_permissions.php @@ -19,12 +19,6 @@ function remote_permissions_install() { Hook::register('addon_settings_post', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings_post'); } -function remote_permissions_uninstall() { - Hook::unregister('lockview_content', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_content'); - Hook::unregister('addon_settings', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings'); - Hook::unregister('addon_settings_post', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings_post'); -} - function remote_permissions_settings(&$a,&$o) { if(! local_user()) @@ -60,7 +54,6 @@ function remote_permissions_settings_post($a,$post) { return; DI::pConfig()->set(local_user(),'remote_perms','show',intval($_POST['remote-perms'])); - info(DI::l10n()->t('Remote Permissions settings updated.') . EOL); } function remote_permissions_content($a, $item_copy) { @@ -209,5 +202,4 @@ function remote_permissions_addon_admin(&$a, &$o){ function remote_permissions_addon_admin_post(&$a){ $choice = (!empty($_POST['remotepermschoice']) ? Strings::escapeTags(trim($_POST['remotepermschoice'])) : ''); DI::config()->set('remote_perms','global',($choice == 1 ? 1 : 0)); - info(DI::l10n()->t('Settings updated.'). EOL); } diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php index c44d0a305..acc6521a5 100644 --- a/rendertime/rendertime.php +++ b/rendertime/rendertime.php @@ -14,12 +14,6 @@ function rendertime_install() { Hook::register('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end'); } - -function rendertime_uninstall() { - Hook::unregister('init_1', 'addon/rendertime/rendertime.php', 'rendertime_init_1'); - Hook::unregister('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end'); -} - function rendertime_init_1(&$a) { } diff --git a/securemail/SecureTestEmail.php b/securemail/SecureTestEmail.php index e15ef601f..8341f5451 100644 --- a/securemail/SecureTestEmail.php +++ b/securemail/SecureTestEmail.php @@ -54,6 +54,6 @@ public function __construct(App $a, IConfig $config, IPConfig $pConfig, BaseURL parent::__construct($sitename, $sender_email, $sender_email, $a->user['email'], $subject, "

{$message}

", $message, - '', local_user()); + [], local_user()); } } diff --git a/securemail/securemail.php b/securemail/securemail.php index 115ba4729..fb801a4ce 100644 --- a/securemail/securemail.php +++ b/securemail/securemail.php @@ -26,16 +26,6 @@ function securemail_install() Logger::log('installed securemail'); } -function securemail_uninstall() -{ - Hook::unregister('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings'); - Hook::unregister('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post'); - - Hook::unregister('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare'); - - Logger::log('removed securemail'); -} - /** * @brief Build user settings form * @@ -86,7 +76,6 @@ function securemail_settings_post(App &$a, array &$b) DI::pConfig()->set(local_user(), 'securemail', 'pkey', trim($_POST['securemail-pkey'])); $enable = (!empty($_POST['securemail-enable']) ? 1 : 0); DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable); - info(DI::l10n()->t('Secure Mail Settings saved.') . EOL); if ($_POST['securemail-submit'] == DI::l10n()->t('Save and send test')) { diff --git a/showmore/showmore.php b/showmore/showmore.php index 277c29ced..7583fd33d 100644 --- a/showmore/showmore.php +++ b/showmore/showmore.php @@ -18,13 +18,6 @@ function showmore_install() Hook::register('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post'); } -function showmore_uninstall() -{ - Hook::unregister('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body'); - Hook::unregister('addon_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings'); - Hook::unregister('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post'); -} - function showmore_addon_settings(&$a, &$s) { if (!local_user()) { @@ -73,7 +66,6 @@ function showmore_addon_settings_post(&$a, &$b) $enable = (!empty($_POST['showmore-enable']) ? intval($_POST['showmore-enable']) : 0); $disable = 1-$enable; DI::pConfig()->set(local_user(), 'showmore', 'disable', $disable); - info(DI::l10n()->t('Show More Settings saved.') . EOL); } } diff --git a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php index 892b4a70b..329b7282a 100644 --- a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php +++ b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php @@ -13,12 +13,6 @@ function smiley_pack_es_install() { Hook::register('smilie', 'addon/smiley_pack_es/smiley_pack_es.php', 'smiley_pack_smilies_es'); } -function smiley_pack_es_uninstall() { - Hook::unregister('smilie', 'addon/smiley_pack_es/smiley_pack_es.php', 'smiley_pack_smilies'); -} - - - function smiley_pack_smilies_es(&$a,&$b) { #Smileys are split into various directories by the intended range of emotions. This is in case we get too big and need to modularise things. We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever. diff --git a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php index 7472bd1cb..bcefa7c3f 100644 --- a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php +++ b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php @@ -15,12 +15,6 @@ function smiley_pack_fr_install() { Hook::register('smilie', 'addon/smiley_pack_fr/smiley_pack_fr.php', 'smiley_pack_fr_smilies'); } -function smiley_pack_fr_uninstall() { - Hook::unregister('smilie', 'addon/smiley_pack_fr/smiley_pack_fr.php', 'smiley_pack_fr_smilies'); -} - - - function smiley_pack_fr_smilies(&$a,&$b) { #Smileys are split into various directories by the intended range of emotions. This is in case we get too big and need to modularise things. We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever. diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php index a80ab717c..6562e29bf 100644 --- a/smiley_pack/smiley_pack.php +++ b/smiley_pack/smiley_pack.php @@ -14,12 +14,6 @@ function smiley_pack_install() { Hook::register('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies'); } -function smiley_pack_uninstall() { - Hook::unregister('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies'); -} - - - function smiley_pack_smilies(&$a,&$b) { #Smileys are split into various directories by the intended range of emotions. This is in case we get too big and need to modularise things. We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever. diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php index 9d4916372..fc4207736 100644 --- a/smileybutton/smileybutton.php +++ b/smileybutton/smileybutton.php @@ -16,16 +16,6 @@ function smileybutton_install() { Logger::log("installed smileybutton"); } - -function smileybutton_uninstall() { - //Delet registered hooks - Hook::unregister('jot_tool', 'addon/smileybutton/smileybutton.php', 'show_button'); - - Logger::log("removed smileybutton"); -} - - - function show_button(Friendica\App $a, &$b) { // Disable if theme is quattro // TODO add style for quattro diff --git a/smilies_adult/smilies_adult.php b/smilies_adult/smilies_adult.php index 84bb24cf5..b55a0a2fe 100644 --- a/smilies_adult/smilies_adult.php +++ b/smilies_adult/smilies_adult.php @@ -15,12 +15,6 @@ function smilies_adult_install() { Hook::register('smilie', 'addon/smilies_adult/smilies_adult.php', 'smilies_adult_smilies'); } -function smilies_adult_uninstall() { - Hook::unregister('smilie', 'addon/smilies_adult/smilies_adult.php', 'smilies_adult_smilies'); -} - - - function smilies_adult_smilies(&$a,&$b) { $b['texts'][] = '(o)(o)'; diff --git a/sniper/sniper.php b/sniper/sniper.php index 97d26b7b9..31c97a843 100644 --- a/sniper/sniper.php +++ b/sniper/sniper.php @@ -16,11 +16,6 @@ function sniper_install() { Hook::register('app_menu', 'addon/sniper/sniper.php', 'sniper_app_menu'); } -function sniper_uninstall() { - Hook::unregister('app_menu', 'addon/sniper/sniper.php', 'sniper_app_menu'); - -} - function sniper_app_menu($a,&$b) { $b['app_menu'][] = '
Hot Shot Sniper
'; } diff --git a/startpage/startpage.php b/startpage/startpage.php index 9192b5a8e..8cdf444f1 100644 --- a/startpage/startpage.php +++ b/startpage/startpage.php @@ -15,13 +15,6 @@ function startpage_install() { Hook::register('addon_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post'); } -function startpage_uninstall() -{ - Hook::unregister('home_init', 'addon/startpage/startpage.php', 'startpage_home_init'); - Hook::unregister('addon_settings', 'addon/startpage/startpage.php', 'startpage_settings'); - Hook::unregister('addon_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post'); -} - function startpage_home_init($a, $b) { if (!local_user()) { diff --git a/statusnet/lang/it/messages.po b/statusnet/lang/it/messages.po index c2c3404f2..9216db8f8 100644 --- a/statusnet/lang/it/messages.po +++ b/statusnet/lang/it/messages.po @@ -5,13 +5,14 @@ # # Translators: # fabrixxm , 2014-2015 +# Sylke Vicious , 2020 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-07-27 07:21+0200\n" -"PO-Revision-Date: 2017-09-20 06:08+0000\n" -"Last-Translator: fabrixxm \n" +"PO-Revision-Date: 2020-09-17 11:40+0000\n" +"Last-Translator: Sylke Vicious \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" @@ -127,7 +128,7 @@ msgid "" "details from unknown viewers?) the link potentially included in public " "postings relayed to GNU Social will lead the visitor to a blank page " "informing the visitor that the access to your profile has been restricted." -msgstr "Nota: A causa delle tue impostazioni di privacy(Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?) il link potenzialmente incluse nei messaggi pubblici inviati a GNU Social porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato." +msgstr "Nota: A causa delle tue impostazioni di privacy(Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?) il collegamento potenzialmente incluso nei messaggi pubblici inviati a GNU Social porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato." #: statusnet.php:385 msgid "Allow posting to GNU Social" diff --git a/statusnet/lang/it/strings.php b/statusnet/lang/it/strings.php index e96776841..8f44cf772 100644 --- a/statusnet/lang/it/strings.php +++ b/statusnet/lang/it/strings.php @@ -2,6 +2,7 @@ if(! function_exists("string_plural_select_it")) { function string_plural_select_it($n){ + $n = intval($n); return ($n != 1);; }} ; @@ -26,7 +27,7 @@ function string_plural_select_it($n){ $a->strings["Cancel GNU Social Connection"] = "Annulla la connessione a GNU Social"; $a->strings["Currently connected to: "] = "Al momento connesso con:"; $a->strings["If enabled all your public postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Se abilitato tutti i tuoi messaggi pubblici possono essere inviati all'account GNU Social associato. Puoi scegliere di farlo sempre (qui) o ogni volta che invii, nelle impostazioni di privacy del messaggio."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: A causa delle tue impostazioni di privacy(Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?) il link potenzialmente incluse nei messaggi pubblici inviati a GNU Social porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato."; +$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: A causa delle tue impostazioni di privacy(Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?) il collegamento potenzialmente incluso nei messaggi pubblici inviati a GNU Social porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato."; $a->strings["Allow posting to GNU Social"] = "Permetti l'invio a GNU Social"; $a->strings["Send public postings to GNU Social by default"] = "Invia sempre i messaggi pubblici a GNU Social"; $a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "Clona tutti i messaggi da GNU Social che non sono risposte o messaggi ripetuti"; diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index f75d23460..0ab711cad 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -40,6 +40,7 @@ use CodebirdSN\CodebirdSN; use Friendica\App; use Friendica\Content\OEmbed; +use Friendica\Content\PageInfo; use Friendica\Content\Text\HTML; use Friendica\Content\Text\Plaintext; use Friendica\Core\Hook; @@ -56,7 +57,6 @@ use Friendica\Model\User; use Friendica\Protocol\Activity; use Friendica\Util\DateTimeFormat; -use Friendica\Util\Network; use Friendica\Util\Strings; function statusnet_install() @@ -74,24 +74,6 @@ function statusnet_install() Logger::log("installed GNU Social"); } -function statusnet_uninstall() -{ - Hook::unregister('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); - Hook::unregister('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); - Hook::unregister('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); - Hook::unregister('hook_fork', 'addon/statusnet/statusnet.php', 'statusnet_hook_fork'); - Hook::unregister('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local'); - Hook::unregister('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets'); - Hook::unregister('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron'); - Hook::unregister('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body'); - Hook::unregister('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification'); - - // old setting - remove only - Hook::unregister('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook'); - Hook::unregister('addon_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings'); - Hook::unregister('addon_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post'); -} - function statusnet_check_item_notification(App $a, &$notification_data) { if (DI::pConfig()->get($notification_data["uid"], 'statusnet', 'post')) { @@ -154,7 +136,7 @@ function statusnet_settings_post(App $a, $post) foreach ($globalsn as $asn) { if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl']) { $apibase = $asn['apiurl']; - $c = Network::fetchUrl($apibase . 'statusnet/version.xml'); + $c = DI::httpRequest()->fetch($apibase . 'statusnet/version.xml'); if (strlen($c) > 0) { DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey']); DI::pConfig()->set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret']); @@ -172,7 +154,7 @@ function statusnet_settings_post(App $a, $post) // we'll check the API Version for that, if we don't get one we'll try to fix the path but will // resign quickly after this one try to fix the path ;-) $apibase = $_POST['statusnet-baseapi']; - $c = Network::fetchUrl($apibase . 'statusnet/version.xml'); + $c = DI::httpRequest()->fetch($apibase . 'statusnet/version.xml'); if (strlen($c) > 0) { // ok the API path is correct, let's save the settings DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); @@ -182,7 +164,7 @@ function statusnet_settings_post(App $a, $post) } else { // the API path is not correct, maybe missing trailing / ? $apibase = $apibase . '/'; - $c = Network::fetchUrl($apibase . 'statusnet/version.xml'); + $c = DI::httpRequest()->fetch($apibase . 'statusnet/version.xml'); if (strlen($c) > 0) { // ok the API path is now correct, let's save the settings DI::pConfig()->set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']); @@ -223,8 +205,6 @@ function statusnet_settings_post(App $a, $post) if (!intval($_POST['statusnet-mirror'])) DI::pConfig()->delete(local_user(), 'statusnet', 'lastid'); - - info(DI::l10n()->t('GNU Social settings updated.') . EOL); } } } @@ -612,7 +592,7 @@ function statusnet_post_hook(App $a, &$b) } if ($image != "") { - $img_str = Network::fetchUrl($image); + $img_str = DI::httpRequest()->fetch($image); $tempfile = tempnam(get_temppath(), "cache"); file_put_contents($tempfile, $img_str); $postdata = ["status" => $msg, "media[]" => $tempfile]; @@ -896,7 +876,7 @@ function statusnet_fetchtimeline(App $a, $uid) $_REQUEST["title"] = ""; - $_REQUEST["body"] = add_page_info_to_body($post->text, true); + $_REQUEST["body"] = PageInfo::searchAndAppendToBody($post->text, true); if (is_string($post->place->name)) { $_REQUEST["location"] = $post->place->name; } @@ -1449,7 +1429,7 @@ function statusnet_convertmsg(App $a, $body) Logger::log("statusnet_convertmsg: expanding url " . $match[1], Logger::DEBUG); - $expanded_url = Network::finalUrl($match[1]); + $expanded_url = DI::httpRequest()->finalUrl($match[1]); Logger::log("statusnet_convertmsg: fetching data for " . $expanded_url, Logger::DEBUG); @@ -1473,7 +1453,7 @@ function statusnet_convertmsg(App $a, $body) } elseif ($oembed_data->type != "link") { $body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body); } else { - $img_str = Network::fetchUrl($expanded_url, true, 4); + $img_str = DI::httpRequest()->fetch($expanded_url, true, 4); $tempfile = tempnam(get_temppath(), "cache"); file_put_contents($tempfile, $img_str); @@ -1494,7 +1474,7 @@ function statusnet_convertmsg(App $a, $body) } if ($footerurl != "") { - $footer = add_page_info($footerurl); + $footer = "\n" . PageInfo::getFooterFromUrl($footerurl); } if (($footerlink != "") && (trim($footer) != "")) { diff --git a/superblock/superblock.php b/superblock/superblock.php index e0b3ff83e..7bf2bc4ce 100644 --- a/superblock/superblock.php +++ b/superblock/superblock.php @@ -19,15 +19,6 @@ function superblock_install() Hook::register('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store'); } -function superblock_uninstall() -{ - Hook::unregister('addon_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings'); - Hook::unregister('addon_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post'); - Hook::unregister('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start'); - Hook::unregister('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu'); - Hook::unregister('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store'); -} - function superblock_addon_settings(&$a, &$s) { if (!local_user()) { @@ -68,11 +59,13 @@ function superblock_addon_settings_post(&$a, &$b) if (!empty($_POST['superblock-submit'])) { DI::pConfig()->set(local_user(), 'system', 'blocked',trim($_POST['superblock-words'])); - info(DI::l10n()->t('SUPERBLOCK Settings saved.') . EOL); } } function superblock_enotify_store(&$a,&$b) { + if (empty($b['uid'])) { + return; + } $words = DI::pConfig()->get($b['uid'], 'system', 'blocked'); if ($words) { @@ -163,6 +156,5 @@ function superblock_init(&$a) } DI::pConfig()->set(local_user(), 'system', 'blocked', $words); - info(DI::l10n()->t('superblock settings updated') . EOL ); exit(); } diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php index cb95babfc..1806ea2cc 100644 --- a/testdrive/testdrive.php +++ b/testdrive/testdrive.php @@ -26,17 +26,6 @@ function testdrive_install() { } - -function testdrive_uninstall() { - - Hook::unregister('load_config', 'addon/testdrive/testdrive.php', 'testdrive_load_config'); - Hook::unregister('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account'); - Hook::unregister('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron'); - Hook::unregister('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify'); - Hook::unregister('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update'); - -} - function testdrive_load_config(App $a, ConfigFileLoader $loader) { $a->getConfigCache()->load($loader->loadAddonConfig('testdrive')); diff --git a/tictac/tictac.php b/tictac/tictac.php index 08a8c09c7..47c9e806e 100644 --- a/tictac/tictac.php +++ b/tictac/tictac.php @@ -12,11 +12,6 @@ function tictac_install() { Hook::register('app_menu', 'addon/tictac/tictac.php', 'tictac_app_menu'); } -function tictac_uninstall() { - Hook::unregister('app_menu', 'addon/tictac/tictac.php', 'tictac_app_menu'); - -} - function tictac_app_menu($a,&$b) { $b['app_menu'][] = '
' . DI::l10n()->t('Three Dimensional Tic-Tac-Toe') . '
'; } diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index e42e97aaf..4504534cb 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -29,16 +29,6 @@ function tumblr_install() Hook::register('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post'); } -function tumblr_uninstall() -{ - Hook::unregister('hook_fork', 'addon/tumblr/tumblr.php', 'tumblr_hook_fork'); - Hook::unregister('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local'); - Hook::unregister('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send'); - Hook::unregister('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets'); - Hook::unregister('connector_settings', 'addon/tumblr/tumblr.php', 'tumblr_settings'); - Hook::unregister('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post'); -} - function tumblr_module() { } @@ -90,8 +80,6 @@ function tumblr_addon_admin_post(App $a) DI::config()->set('tumblr', 'consumer_key',$consumer_key); DI::config()->set('tumblr', 'consumer_secret',$consumer_secret); - - info(DI::l10n()->t('Settings updated.'). EOL); } function tumblr_connect(App $a) diff --git a/twitter/lang/it/messages.po b/twitter/lang/it/messages.po index 7ce7330aa..253f17d24 100644 --- a/twitter/lang/it/messages.po +++ b/twitter/lang/it/messages.po @@ -5,13 +5,14 @@ # # Translators: # fabrixxm , 2014-2015,2018 +# Sylke Vicious , 2020 msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-06-02 10:25+0700\n" -"PO-Revision-Date: 2018-06-06 15:03+0000\n" -"Last-Translator: fabrixxm \n" +"PO-Revision-Date: 2020-09-17 11:44+0000\n" +"Last-Translator: Sylke Vicious \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" @@ -50,7 +51,7 @@ msgid "" "button below to get a PIN from Twitter which you have to copy into the input" " box below and submit the form. Only your public posts will" " be posted to Twitter." -msgstr "Il componente aggiuntivo Twitter è abilitato ma non hai ancora collegato i tuoi account Friendica e Twitter. Per farlo, clicca il bottone qui sotto per ricevere un PIN da Twitter che dovrai copiare nel campo qui sotto. Solo i tuoi post pubblici saranno inviati a Twitter." +msgstr "Il componente aggiuntivo Twitter è abilitato ma non hai ancora collegato i tuoi account Friendica e Twitter. Per farlo, clicca il bottone qui sotto per ricevere un PIN da Twitter che dovrai copiare nel campo qui sotto. Solo i tuoi messaggi pubblici saranno inviati a Twitter." #: twitter.php:317 msgid "Log in with Twitter" @@ -89,7 +90,7 @@ msgid "" "details from unknown viewers?) the link potentially included in public " "postings relayed to Twitter will lead the visitor to a blank page informing " "the visitor that the access to your profile has been restricted." -msgstr "Nota: A causa delle tue impostazioni di privacy(Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?) il link potenzialmente incluso nei messaggi pubblici inviati a Twitter porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato." +msgstr "Nota: A causa delle tue impostazioni di privacy(Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?) il collegamento potenzialmente incluso nei messaggi pubblici inviati a Twitter porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato." #: twitter.php:353 msgid "Send public postings to Twitter by default" @@ -115,7 +116,7 @@ msgid "" "from whom you would like to see posts here. However if enabled, you cannot " "merely remove a twitter contact from the Friendica contact list, as it will " "recreate this contact when they post again." -msgstr "Questo creerà automaticamente un contatto in Friendica appena ricevi un messaggio da un tuo contatto sulla rete Twitter. Se non abiliti questa opzione, dovrai aggiungere a mano in Friendica i contatti Twitter da cui vuoi ricevere i messaggi. Se abilitato, pero', non potrai semplicemente rimuovere un contatto Twitter dal tuo elenco contatti su Friendica, dato che questo sarà ricreato la prossima volta che invierà un messaggio." +msgstr "Questo creerà automaticamente un contatto in Friendica appena ricevi un messaggio da un tuo contatto sulla rete Twitter. Se non abiliti questa opzione, dovrai aggiungere a mano in Friendica i contatti Twitter da cui vuoi ricevere i messaggi. Se abilitato, però, non potrai semplicemente rimuovere un contatto Twitter dal tuo elenco contatti su Friendica, dato che questo sarà ricreato la prossima volta che invierà un messaggio." #: twitter.php:614 msgid "Twitter post failed. Queued for retry." diff --git a/twitter/lang/it/strings.php b/twitter/lang/it/strings.php index deb5b4c1b..a0f3c67e5 100644 --- a/twitter/lang/it/strings.php +++ b/twitter/lang/it/strings.php @@ -11,7 +11,7 @@ function string_plural_select_it($n){ $a->strings["Twitter settings updated."] = "Impostazioni di Twitter aggiornate."; $a->strings["Twitter Import/Export/Mirror"] = "Importa/Esporta/Clona Twitter"; $a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nessuna coppia di chiavi per Twitter trovata. Contatta l'amministratore del sito."; -$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Il componente aggiuntivo Twitter è abilitato ma non hai ancora collegato i tuoi account Friendica e Twitter. Per farlo, clicca il bottone qui sotto per ricevere un PIN da Twitter che dovrai copiare nel campo qui sotto. Solo i tuoi post pubblici saranno inviati a Twitter."; +$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your public posts will be posted to Twitter."] = "Il componente aggiuntivo Twitter è abilitato ma non hai ancora collegato i tuoi account Friendica e Twitter. Per farlo, clicca il bottone qui sotto per ricevere un PIN da Twitter che dovrai copiare nel campo qui sotto. Solo i tuoi messaggi pubblici saranno inviati a Twitter."; $a->strings["Log in with Twitter"] = "Accedi con Twitter"; $a->strings["Copy the PIN from Twitter here"] = "Copia il PIN da Twitter qui"; $a->strings["Save Settings"] = "Salva Impostazioni"; @@ -19,12 +19,12 @@ function string_plural_select_it($n){ $a->strings["Disconnect"] = "Disconnetti"; $a->strings["Allow posting to Twitter"] = "Permetti l'invio a Twitter"; $a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Se abilitato tutti i tuoi messaggi pubblici possono essere inviati all'account Twitter associato. Puoi scegliere di farlo sempre (qui) o ogni volta che invii, nelle impostazioni di privacy del messaggio."; -$a->strings["Note: Due to your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: A causa delle tue impostazioni di privacy(Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?) il link potenzialmente incluso nei messaggi pubblici inviati a Twitter porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato."; +$a->strings["Note: Due to your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Nota: A causa delle tue impostazioni di privacy(Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?) il collegamento potenzialmente incluso nei messaggi pubblici inviati a Twitter porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato."; $a->strings["Send public postings to Twitter by default"] = "Invia sempre i messaggi pubblici a Twitter"; $a->strings["Mirror all posts from twitter that are no replies"] = "Clona tutti i messaggi da Twitter che non sono risposte"; $a->strings["Import the remote timeline"] = "Importa la timeline remota"; $a->strings["Automatically create contacts"] = "Crea automaticamente i contatti"; -$a->strings["This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again."] = "Questo creerà automaticamente un contatto in Friendica appena ricevi un messaggio da un tuo contatto sulla rete Twitter. Se non abiliti questa opzione, dovrai aggiungere a mano in Friendica i contatti Twitter da cui vuoi ricevere i messaggi. Se abilitato, pero', non potrai semplicemente rimuovere un contatto Twitter dal tuo elenco contatti su Friendica, dato che questo sarà ricreato la prossima volta che invierà un messaggio."; +$a->strings["This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again."] = "Questo creerà automaticamente un contatto in Friendica appena ricevi un messaggio da un tuo contatto sulla rete Twitter. Se non abiliti questa opzione, dovrai aggiungere a mano in Friendica i contatti Twitter da cui vuoi ricevere i messaggi. Se abilitato, però, non potrai semplicemente rimuovere un contatto Twitter dal tuo elenco contatti su Friendica, dato che questo sarà ricreato la prossima volta che invierà un messaggio."; $a->strings["Twitter post failed. Queued for retry."] = "Invio a Twitter fallito. In coda per riprovare."; $a->strings["Settings updated."] = "Impostazioni aggiornate."; $a->strings["Consumer key"] = "Consumer key"; diff --git a/twitter/twitter.php b/twitter/twitter.php index 4c9701d84..375e264cd 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -67,6 +67,7 @@ use Codebird\Codebird; use Friendica\App; use Friendica\Content\OEmbed; +use Friendica\Content\PageInfo; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\Plaintext; use Friendica\Core\Hook; @@ -88,7 +89,6 @@ use Friendica\Util\ConfigFileLoader; use Friendica\Util\DateTimeFormat; use Friendica\Util\Images; -use Friendica\Util\Network; use Friendica\Util\Strings; require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php'; @@ -240,9 +240,9 @@ function twitter_settings_post(App $a) DI::pConfig()->set(local_user(), 'twitter', 'oauthsecret', $token['oauth_token_secret']); DI::pConfig()->set(local_user(), 'twitter', 'post', 1); } catch(Exception $e) { - info($e->getMessage()); + notice($e->getMessage()); } catch(TwitterOAuthException $e) { - info($e->getMessage()); + notice($e->getMessage()); } // reload the Addon Settings page, if we don't do it see Bug #42 DI::baseUrl()->redirect('settings/connectors'); @@ -258,8 +258,6 @@ function twitter_settings_post(App $a) if (!intval($_POST['twitter-mirror'])) { DI::pConfig()->delete(local_user(), 'twitter', 'lastid'); } - - info(DI::l10n()->t('Twitter settings updated.') . EOL); } } } @@ -673,7 +671,7 @@ function (array $attributes, array $author_contact, $content, $is_quote_share) { continue; } - $img_str = Network::fetchUrl($image['url']); + $img_str = DI::httpRequest()->fetch($image['url']); $tempfile = tempnam(get_temppath(), 'cache'); file_put_contents($tempfile, $img_str); @@ -736,7 +734,6 @@ function twitter_addon_admin_post(App $a) $consumersecret = !empty($_POST['consumersecret']) ? Strings::escapeTags(trim($_POST['consumersecret'])) : ''; DI::config()->set('twitter', 'consumerkey', $consumerkey); DI::config()->set('twitter', 'consumersecret', $consumersecret); - info(DI::l10n()->t('Settings updated.') . EOL); } function twitter_addon_admin(App $a, &$o) @@ -1126,12 +1123,12 @@ function twitter_fetch_contact($uid, $data, $create_user) if (DBA::isResult($pcontact)) { $cid = $pcontact['id']; } else { - $cid = Contact::getIdForURL($fields['url'], 0, true, $fields); + $cid = Contact::getIdForURL($fields['url'], 0, false, $fields); } if (!empty($cid)) { DBA::update('contact', $fields, ['id' => $cid]); - Contact::updateAvatar($avatar, 0, $cid); + Contact::updateAvatar($cid, $avatar); } $contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'alias' => "twitter::" . $data->id_str]); @@ -1163,7 +1160,7 @@ function twitter_fetch_contact($uid, $data, $create_user) Group::addMember(User::getDefaultGroup($uid), $contact_id); - Contact::updateAvatar($avatar, $uid, $contact_id); + Contact::updateAvatar($contact_id, $avatar); } else { if ($contact["readonly"] || $contact["blocked"]) { Logger::log("twitter_fetch_contact: Contact '" . $contact["nick"] . "' is blocked or readonly.", Logger::DEBUG); @@ -1179,7 +1176,7 @@ function twitter_fetch_contact($uid, $data, $create_user) $update = true; } - Contact::updateAvatar($avatar, $uid, $contact['id']); + Contact::updateAvatar($contact['id'], $avatar); if ($contact['name'] != $data->name) { $fields['name-date'] = $fields['uri-date'] = DateTimeFormat::utcNow(); @@ -1296,7 +1293,7 @@ function twitter_expand_entities($body, stdClass $status, $picture) $expanded_url = $url->expanded_url; - $final_url = Network::finalUrl($url->expanded_url); + $final_url = DI::httpRequest()->finalUrl($url->expanded_url); $oembed_data = OEmbed::fetchURL($final_url); @@ -1317,7 +1314,7 @@ function twitter_expand_entities($body, stdClass $status, $picture) } elseif ($oembed_data->type != 'link') { $replace = '[url=' . $expanded_url . ']' . $url->display_url . '[/url]'; } else { - $img_str = Network::fetchUrl($final_url, true, 4); + $img_str = DI::httpRequest()->fetch($final_url, true, 4); $tempfile = tempnam(get_temppath(), 'cache'); file_put_contents($tempfile, $img_str); @@ -1356,7 +1353,7 @@ function twitter_expand_entities($body, stdClass $status, $picture) if (empty($status->quoted_status)) { $footer = ''; if ($attachmentUrl) { - $footer = add_page_info($attachmentUrl, false, $picture); + $footer = "\n" . PageInfo::getFooterFromUrl($attachmentUrl, false, $picture); } if (trim($footer)) { @@ -1364,11 +1361,11 @@ function twitter_expand_entities($body, stdClass $status, $picture) } elseif ($picture) { $body .= "\n\n[img]" . $picture . "[/img]\n"; } else { - $body = add_page_info_to_body($body); + $body = PageInfo::searchAndAppendToBody($body); } } - return ['body' => $body, 'plain' => $plain, 'taglist' => $taglist]; + return ['body' => $body, 'plain' => trim($plain), 'taglist' => $taglist]; } /** diff --git a/unicode_smilies/unicode_smilies.php b/unicode_smilies/unicode_smilies.php index af286276e..ef7bb6150 100644 --- a/unicode_smilies/unicode_smilies.php +++ b/unicode_smilies/unicode_smilies.php @@ -13,10 +13,6 @@ function unicode_smilies_install() { Hook::register('smilie', 'addon/unicode_smilies/unicode_smilies.php', 'unicode_smilies_smilies'); } -function unicode_smilies_uninstall() { - Hook::unregister('smilie', 'addon/unicode_smilies/unicode_smilies.php', 'unicode_smilies_smilies'); -} - function unicode_smilies_smilies(&$a,&$b) { Smilies::add($b, ':-)', '😀'); Smilies::add($b, ':)', '😀'); diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php index 10f883593..cbdf54617 100644 --- a/viewsrc/viewsrc.php +++ b/viewsrc/viewsrc.php @@ -16,13 +16,6 @@ function viewsrc_install() { Hook::register('page_end', 'addon/viewsrc/viewsrc.php', 'viewsrc_page_end'); } - -function viewsrc_uninstall() { - Hook::unregister('item_photo_menu', 'addon/viewsrc/viewsrc.php', 'viewsrc_item_photo_menu'); - Hook::unregister('page_end', 'addon/viewsrc/viewsrc.php', 'viewsrc_page_end'); - -} - function viewsrc_page_end(&$a, &$o){ DI::page()['htmlhead'] .= <<< EOS