friendica
/
friendica-addons
7
2
Fork 13
Code Issues 3 Pull Requests 2 Releases 16 Wiki Activity

Merge branch '2020.09-rc' into stable

This commit is contained in:
Tobias Diekershoff 2020-09-20 21:13:21 +02:00
parent 0a43efa8a8 10d1156a77
commit 2365a9ae02
132 changed files with 1400 additions and 1281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
advancedcontentfilter/advancedcontentfilter.php
View File

@ -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
*/

3
blackout/blackout.php
View File

@ -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()) {

47
blackout/lang/it/messages.po
View File

@ -5,13 +5,14 @@
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
# Sylke Vicious <silkevicious@gmail.com>, 2020
msgid ""
msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-06-22 13:18+0200\n"
"PO-Revision-Date: 2018-03-19 19:50+0000\n"
"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
"POT-Creation-Date: 2019-03-12 09:26+0100\n"
"PO-Revision-Date: 2020-08-31 15:28+0000\n"
"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -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 <strong>%s</strong> and it will end <strong>%s</strong>."
msgstr "Per favore ricontrolla le impostazioni attuali per il blackout. L'inizio sarà il <strong>%s</strong> e terminerà il <strong>%s</strong>."
#: blackout.php:106
msgid "Save Settings"
msgstr "Salva Impostazioni"
#: blackout.php:100
#: blackout.php:107
msgid "Redirect URL"
msgstr "URL di reindirizzamento"
#: blackout.php:100
#: blackout.php:107
msgid "all your visitors from the web will be redirected to this URL"
msgstr "tutti i visitatori dal web verranno reindirizzati a questo URL"
#: blackout.php:101
#: blackout.php:108
msgid "Begin of the Blackout"
msgstr "Inzio del blackout"
#: blackout.php:101
#: blackout.php:108
msgid ""
"format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, "
"<em>hh</em> hour and <em>mm</em> minute"
msgstr "il formato è <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto"
"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
msgstr "Il formato è <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto."
#: blackout.php:102
#: blackout.php:109
msgid "End of the Blackout"
msgstr "Fine del blackout"
#: blackout.php:108
#: blackout.php:111
msgid ""
"The end-date is prior to the start-date of the blackout, you should fix "
"this."
msgstr "La data di fine è precedente alla data di inizio. Dovresti sistemarla."
"<strong>Note</strong>: The redirect will be active from the moment you press"
" the submit button. Users currently logged in will <strong>not</strong> be "
"thrown out but can't login again after logging out should the blackout is "
"still in place."
msgstr "<strong>Nota</strong>: Il reindirizzamento sarà attivo dal momento in cui premerai il pulsante di invio. Gli utenti attualmente autenticati <strong>non</strong> saranno disconnessi ma non potranno accedere in caso di disconnessione fintanto che il blackout sarà attivo."

7
blackout/lang/it/strings.php
View File

@ -2,13 +2,16 @@
if(! function_exists("string_plural_select_it")) {
function string_plural_select_it($n){
$n = intval($n);
return ($n != 1);;
}}
;
$a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "La data di fine è precedente alla data di inizio blackout, dovresti sistemarle";
$a->strings["Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."] = "Per favore ricontrolla le impostazioni attuali per il blackout. L'inizio sarà il <strong>%s</strong> e terminerà il <strong>%s</strong>.";
$a->strings["Save Settings"] = "Salva Impostazioni";
$a->strings["Redirect URL"] = "URL di reindirizzamento";
$a->strings["all your visitors from the web will be redirected to this URL"] = "tutti i visitatori dal web verranno reindirizzati a questo URL";
$a->strings["Begin of the Blackout"] = "Inzio del blackout";
$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "il formato è <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto";
$a->strings["Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."] = "Il formato è <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto.";
$a->strings["End of the Blackout"] = "Fine del blackout";
$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "La data di fine è precedente alla data di inizio. Dovresti sistemarla.";
$a->strings["<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."] = "<strong>Nota</strong>: Il reindirizzamento sarà attivo dal momento in cui premerai il pulsante di invio. Gli utenti attualmente autenticati <strong>non</strong> saranno disconnessi ma non potranno accedere in caso di disconnessione fintanto che il blackout sarà attivo.";

9
blockbot/blockbot.php
View File

@ -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/',

42
blockbot/lang/it/messages.po Normal file
View File

@ -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 <silkevicious@gmail.com>, 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 <silkevicious@gmail.com>, 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."

13
blockbot/lang/it/strings.php Normal file
View File

@ -0,0 +1,13 @@
<?php
if(! function_exists("string_plural_select_it")) {
function string_plural_select_it($n){
$n = intval($n);
return ($n != 1);;
}}
;
$a->strings["Save Settings"] = "Salva Impostazioni";
$a->strings["Allow \"good\" crawlers"] = "Permetti crawler \"buoni\"";
$a->strings["Block GabSocial"] = "Blocca GabSocial";
$a->strings["Training mode"] = "Modalità addestramento";
$a->strings["Settings updated."] = "Impostazioni aggiornate.";

14
blockem/blockem.php
View File

@ -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();
}

19
blogger/blogger.php
View File

@ -11,7 +11,6 @@ use Friendica\Content\Text\BBCode;
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 @@ EOT;
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);

12
buffer/buffer.php
View File

@ -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)

5
buglink/buglink.php
View File

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

5
calc/calc.php
View File

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

12
catavatar/catavatar.php
View File

@ -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
*/

454
convert/convert.php
View File

@ -1,229 +1,225 @@
<?php
/**
* Name: Converter App
* Description: Unit converter application
* Version: 1.0
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*/
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'][] = '<div class="app-title"><a href="convert">Units Conversion</a></div>';
}
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 = "<table class=\"framed grayish\" border=\"1\" cellpadding=\"5\" width=\"80%\" align=\"center\"><tr>";
$string .= "<td rowspan=\"$cc\" align=\"center\">$value $from_unit</td>";
$i=0;
foreach ($cells as $cell) {
if ($i==0) {
$string .= "<td class=\"".$cell['class']."\">".$cell['value']."</td>";
$i++;
} else {
$string .= "</tr><tr><td class=\"".$cell['class']."\">".$cell['value']."</td>";
}
}
$string .= "</tr></table>";
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 .= '<h3>Unit Conversions</h3>';
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))."</p>";
} else {
$o .= "<p>Select:</p>";
}
if(isset($_POST['value']))
$value = $_POST['value'];
else
$value = '';
$o .= '<form action="convert" method="post" name="conversion">';
$o .= '<input name="value" type="text" id="value" value="' . $value . '" size="10" maxlength="10" />';
$o .= '<select name="from_unit" size="12">';
reset($list);
while(list($key,$val) = each($list)) {
$o .= "\n\t<optgroup label=\"$key\">";
while(list($ukey,$uval) = each($val)) {
$selected = (($uval == $_POST['from_unit']) ? ' selected="selected" ' : '');
$o .= "\n\t\t<option value=\"$uval\" $selected >$uval</option>";
}
$o .= "\n\t</optgroup>";
}
$o .= '</select>';
$o .= '<input type="submit" name="Submit" value="Submit" /></form>';
return $o;
}
<?php
/**
* Name: Converter App
* Description: Unit converter application
* Version: 1.0
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*/
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'][] = '<div class="app-title"><a href="convert">Units Conversion</a></div>';
}
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 = "<table class=\"framed grayish\" border=\"1\" cellpadding=\"5\" width=\"80%\" align=\"center\"><tr>";
$string .= "<td rowspan=\"$cc\" align=\"center\">$value $from_unit</td>";
$i=0;
foreach ($cells as $cell) {
if ($i==0) {
$string .= "<td class=\"".$cell['class']."\">".$cell['value']."</td>";
$i++;
} else {
$string .= "</tr><tr><td class=\"".$cell['class']."\">".$cell['value']."</td>";
}
}
$string .= "</tr></table>";
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 .= '<h3>Unit Conversions</h3>';
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))."</p>";
} else {
$o .= "<p>Select:</p>";
}
if(isset($_POST['value']))
$value = $_POST['value'];
else
$value = '';
$o .= '<form action="convert" method="post" name="conversion">';
$o .= '<input name="value" type="text" id="value" value="' . $value . '" size="10" maxlength="10" />';
$o .= '<select name="from_unit" size="12">';
reset($list);
while(list($key,$val) = each($list)) {
$o .= "\n\t<optgroup label=\"$key\">";
while(list($ukey,$uval) = each($val)) {
$selected = (($uval == $_POST['from_unit']) ? ' selected="selected" ' : '');
$o .= "\n\t\t<option value=\"$uval\" $selected >$uval</option>";
}
$o .= "\n\t</optgroup>";
}
$o .= '</select>';
$o .= '<input type="submit" name="Submit" value="Submit" /></form>';
return $o;
}

1
cookienotice/cookienotice.php
View File

@ -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.'));
}
}

16
curweather/curweather.php
View File

@ -15,7 +15,6 @@ use Friendica\Core\Hook;
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));
}
}

12
diaspora/diaspora.php
View File

@ -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.'));
}
}
}

123
diaspora/lang/de/messages.po
View File

@ -4,59 +4,114 @@
#
#
# Translators:
# bavatar <tobias.diekershoff@gmx.net>, 2014
# foss <foss@openmailbox.org>, 2020
# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2020
# Ulf Rompe <transifex.com@rompe.org>, 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 <tobias.diekershoff@gmx.net>\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 <tobias.diekershoff@gmx.net>\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 <strong>%s</strong>. "
msgstr "Denke daran: Du kannst Jederzeit über deinen Friendica Account <strong>%s</strong> 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"
" <strong>%s</strong> instead."
msgstr "Du solltest allerdings deinen Diaspora Kontakten deinen Friendica Account <strong>%s</strong> 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 <strong>%s</strong>"
msgstr "Verbunden mit deinem Diaspora-Konto <strong>%s</strong>"
#: 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:163
msgid "Enable Diaspora Post Addon"
msgstr "Veröffentlichungen bei Diaspora erlauben"
#: diaspora.php:110
msgid "Information"
msgstr "Information"
#: diaspora.php:168
msgid "Diaspora username"
msgstr "Diaspora Nutzername"
#: diaspora.php:111
msgid "Error"
msgstr "Fehler"
#: diaspora.php:173
msgid "Diaspora password"
msgstr "Diaspora Passwort"
#: diaspora.php:178
msgid "Diaspora site URL"
msgstr "URL der Diaspora Seite"
#: diaspora.php:183
msgid "Post to Diaspora by default"
msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Diaspora"
#: diaspora.php:189
#: diaspora.php:112
msgid "Save Settings"
msgstr "Einstellungen speichern"
#: diaspora.php:324
msgid "Diaspora post failed. Queued for retry."
msgstr "Veröffentlichung bei Diaspora gescheitert. Wir versuchen es später erneut."
#: diaspora.php:116
msgid "Enable Diaspora Post Addon"
msgstr "Diaspora-Post-Addon aktivieren"
#: diaspora.php:117
msgid "Diaspora handle"
msgstr "Diaspora-Handle"
#: diaspora.php:118
msgid "Diaspora password"
msgstr "Diaspora-Passwort"
#: 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:120
msgid "Post to Diaspora by default"
msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Diaspora"
#: diaspora.php:138
msgid "Diaspora settings updated."
msgstr "Diaspora-Einstellungen aktualisiert."
#: diaspora.php:141
msgid "Diaspora connector disabled."
msgstr "Diaspora-Connector deaktiviert."

27
diaspora/lang/de/strings.php
View File

@ -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 <strong>%s</strong>. "] = "Denke daran: Du kannst Jederzeit über deinen Friendica Account <strong>%s</strong> 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 <strong>%s</strong> instead."] = "Du solltest allerdings deinen Diaspora Kontakten deinen Friendica Account <strong>%s</strong> 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 <strong>%s</strong>"] = "Verbunden mit deinem Diaspora-Konto <strong>%s</strong>";
$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.";

114
diaspora/lang/en-us/messages.po Normal file
View File

@ -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 <andy@hubup.pro>, 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 <strong>%s</strong>. "
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"
" <strong>%s</strong> 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 <strong>%s</strong>"
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 ""

28
diaspora/lang/en-us/strings.php Normal file
View File

@ -0,0 +1,28 @@
<?php
if(! function_exists("string_plural_select_en_us")) {
function string_plural_select_en_us($n){
$n = intval($n);
return ($n != 1);;
}}
;
$a->strings["Post to Diaspora"] = "Post to Diaspora";
$a->strings["Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. "] = "";
$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 <strong>%s</strong> instead."] = "";
$a->strings["All aspects"] = "";
$a->strings["Public"] = "";
$a->strings["Post to aspect:"] = "";
$a->strings["Connected with your Diaspora account <strong>%s</strong>"] = "";
$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."] = "";

115
diaspora/lang/it/messages.po
View File

@ -5,13 +5,14 @@
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
# Sylke Vicious <silkevicious@gmail.com>, 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 <fabrix.xm@gmail.com>\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 <silkevicious@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -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 <strong>%s</strong>. "
msgstr "Ricorda: Puoi sempre essere raggiunto da Diaspora con il tuo indirizzo Friendica <strong>%s</strong>."
#: 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"
" <strong>%s</strong> instead."
msgstr "Comunque, è preferibile che tu comunichi ai tuoi contatti Diaspora il nuovo indirizzo <strong>%s</strong>."
#: 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 <strong>%s</strong>"
msgstr "Connesso con il tuo account Diaspora <strong>%s</strong>"
#: 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
msgid "Enable Diaspora Post Addon"
msgstr "Abilita il componente aggiuntivo di invio a Diaspora"
#: diaspora.php:110
msgid "Information"
msgstr "Informazione"
#: diaspora.php:168
msgid "Diaspora username"
msgstr "Nome utente Diaspora"
#: diaspora.php:111
msgid "Error"
msgstr "Errore"
#: diaspora.php:173
msgid "Diaspora password"
msgstr "Password Diaspora"
#: diaspora.php:178
msgid "Diaspora site URL"
msgstr "Indirizzo sito Diaspora"
#: diaspora.php:183
msgid "Post to Diaspora by default"
msgstr "Invia sempre a Diaspora"
#: diaspora.php:189
#: diaspora.php:112
msgid "Save Settings"
msgstr "Salva Impostazioni"
#: diaspora.php:324
msgid "Diaspora post failed. Queued for retry."
msgstr "Invio a Diaspora fallito. In attesa di riprovare."
#: diaspora.php:116
msgid "Enable Diaspora Post Addon"
msgstr "Abilita il componente aggiuntivo di invio a Diaspora"
#: diaspora.php:117
msgid "Diaspora handle"
msgstr "Indirizzo Diaspora"
#: diaspora.php:118
msgid "Diaspora password"
msgstr "Password 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:120
msgid "Post to Diaspora by default"
msgstr "Invia sempre a Diaspora"
#: diaspora.php:138
msgid "Diaspora settings updated."
msgstr "Impostazioni Diaspora aggiornate."
#: diaspora.php:141
msgid "Diaspora connector disabled."
msgstr "Connettore Diaspora disabilitato."

25
diaspora/lang/it/strings.php
View File

@ -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 <strong>%s</strong>. "] = "Ricorda: Puoi sempre essere raggiunto da Diaspora con il tuo indirizzo Friendica <strong>%s</strong>.";
$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 <strong>%s</strong> instead."] = "Comunque, è preferibile che tu comunichi ai tuoi contatti Diaspora il nuovo indirizzo <strong>%s</strong>.";
$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 <strong>%s</strong>"] = "Connesso con il tuo account Diaspora <strong>%s</strong>";
$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["Enable Diaspora Post Addon"] = "Abilita il componente aggiuntivo di invio a Diaspora";
$a->strings["Diaspora username"] = "Nome utente Diaspora";
$a->strings["Diaspora password"] = "Password Diaspora";
$a->strings["Diaspora site URL"] = "Indirizzo sito Diaspora";
$a->strings["Post to Diaspora by default"] = "Invia sempre a Diaspora";
$a->strings["Information"] = "Informazione";
$a->strings["Error"] = "Errore";
$a->strings["Save Settings"] = "Salva Impostazioni";
$a->strings["Diaspora post failed. Queued for retry."] = "Invio a Diaspora fallito. In attesa di riprovare.";
$a->strings["Enable Diaspora Post Addon"] = "Abilita il componente aggiuntivo di invio a Diaspora";
$a->strings["Diaspora handle"] = "Indirizzo Diaspora";
$a->strings["Diaspora password"] = "Password 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["Diaspora settings updated."] = "Impostazioni Diaspora aggiornate.";
$a->strings["Diaspora connector disabled."] = "Connettore Diaspora disabilitato.";

115
diaspora/lang/nl/messages.po
View File

@ -4,14 +4,15 @@
#
#
# Translators:
# Casper <casper@vrije-mens.org>, 2020
# Jeroen De Meerleer <me@jeroened.be>, 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 <me@jeroened.be>\n"
"POT-Creation-Date: 2020-05-07 00:15-0400\n"
"PO-Revision-Date: 2020-09-04 21:05+0000\n"
"Last-Translator: Casper <casper@vrije-mens.org>\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 <strong>%s</strong>. "
msgstr "Let op: vanuit Diaspora ben je altijd bereikbaar met je Friendica-handvat <strong>%s</strong>. "
#: 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"
" <strong>%s</strong> instead."
msgstr "Het verdient echter de voorkeur dat u uw diaspora contacteert met de nieuwe handle <strong>%s</strong>."
#: 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 <strong>%s</strong>"
msgstr "Verbonden met uw diaspora-account <strong>%s</strong>"
#: 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
msgid "Enable Diaspora Post Addon"
msgstr "Diaspora Post Addon inschakelen"
#: diaspora.php:110
msgid "Information"
msgstr "Informatie"
#: diaspora.php:168
msgid "Diaspora username"
msgstr "Diaspora gebruikersnaam"
#: diaspora.php:111
msgid "Error"
msgstr "Fout"
#: diaspora.php:173
msgid "Diaspora password"
msgstr "Diaspora wachtwoord"
#: diaspora.php:178
msgid "Diaspora site URL"
msgstr "Diaspora pod URL"
#: diaspora.php:183
msgid "Post to Diaspora by default"
msgstr "Plaatsen op Diaspora als standaard instellen "
#: diaspora.php:189
#: diaspora.php:112
msgid "Save Settings"
msgstr "Instellingen opslaan"
#: diaspora.php:324
msgid "Diaspora post failed. Queued for retry."
msgstr "Posten naar Diaspora mislukt. In wachtrij geplaatst om opnieuw te proberen."
#: diaspora.php:116
msgid "Enable Diaspora Post Addon"
msgstr "Diaspora Post Addon inschakelen"
#: diaspora.php:117
msgid "Diaspora handle"
msgstr ""
#: diaspora.php:118
msgid "Diaspora password"
msgstr "Diaspora wachtwoord"
#: 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:120
msgid "Post to Diaspora by default"
msgstr "Plaatsen op Diaspora als standaard instellen "
#: diaspora.php:138
msgid "Diaspora settings updated."
msgstr ""
#: diaspora.php:141
msgid "Diaspora connector disabled."
msgstr ""

24
diaspora/lang/nl/strings.php
View File

@ -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 <strong>%s</strong>. "] = "Let op: vanuit Diaspora ben je altijd bereikbaar met je Friendica-handvat <strong>%s</strong>. ";
$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 <strong>%s</strong> instead."] = "Het verdient echter de voorkeur dat u uw diaspora contacteert met de nieuwe handle <strong>%s</strong>.";
$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 <strong>%s</strong>"] = "Verbonden met uw diaspora-account <strong>%s</strong>";
$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["Enable Diaspora Post Addon"] = "Diaspora Post Addon inschakelen";
$a->strings["Diaspora username"] = "Diaspora gebruikersnaam";
$a->strings["Diaspora password"] = "Diaspora wachtwoord";
$a->strings["Diaspora site URL"] = "Diaspora pod URL";
$a->strings["Post to Diaspora by default"] = "Plaatsen op Diaspora als standaard instellen ";
$a->strings["Information"] = "Informatie";
$a->strings["Error"] = "Fout";
$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["Enable Diaspora Post Addon"] = "Diaspora Post Addon inschakelen";
$a->strings["Diaspora handle"] = "";
$a->strings["Diaspora password"] = "Diaspora wachtwoord";
$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["Diaspora settings updated."] = "";
$a->strings["Diaspora connector disabled."] = "";

18
discourse/discourse.php
View File

@ -7,18 +7,18 @@
* Author: Michael Vogel <http://pirati.ca/profile/heluecht>
*
*/
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'];

12
dwpost/dwpost.php
View File

@ -16,7 +16,6 @@ use Friendica\Database\DBA;
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 @@ EOT;
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);

7
dwpost/lang/it/messages.po
View File

@ -5,13 +5,14 @@
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
# Sylke Vicious <silkevicious@gmail.com>, 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 <fabrix.xm@gmail.com>\n"
"PO-Revision-Date: 2020-09-15 11:15+0000\n"
"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -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"

3
dwpost/lang/it/strings.php
View File

@ -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";

9
forumdirectory/forumdirectory.php
View File

@ -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');

11
fromapp/fromapp.php
View File

@ -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)

12
geocoordinates/geocoordinates.php
View File

@ -5,11 +5,11 @@
* Version: 0.1
* Author: Michael Vogel <https://pirati.ca/profile/heluecht>
*/
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);
}

5
geonames/geonames.php
View File

@ -12,7 +12,6 @@ use Friendica\Core\Logger;
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.'));
}
/**

14
gnot/gnot.php
View File

@ -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);
}

7
googlemaps/googlemaps.php
View File

@ -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)
{

11
gravatar/gravatar.php
View File

@ -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);
}

14
group_text/group_text.php
View File

@ -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);
}

6
highlightjs/highlightjs.php
View File

@ -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') {

11
ifttt/ifttt.php
View File

@ -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";
}

57
ifttt/lang/zh-cn/messages.po Normal file
View File

@ -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 <vicdorke@gmail.com>, 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 <vicdorke@gmail.com>, 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 <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
"three Facebook recipes that are connected with <a "
"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
"Maker\") with the following parameters:"
msgstr ""
"在<a href=\"http://www.ifttt.com\">IFTTT</a>创建一个帐户。创建三个与<a "
"href=\"https://ifttt.com/maker\">Maker</a>(表格为“ 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 "保存设置"

15
ifttt/lang/zh-cn/strings.php Normal file
View File

@ -0,0 +1,15 @@
<?php
if(! function_exists("string_plural_select_zh_cn")) {
function string_plural_select_zh_cn($n){
$n = intval($n);
return 0;;
}}
;
$a->strings["IFTTT Mirror"] = "IFTTT 镜像";
$a->strings["Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:"] = "在<a href=\"http://www.ifttt.com\">IFTTT</a>创建一个帐户。创建三个与<a href=\"https://ifttt.com/maker\">Maker</a>(表格为“ 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"] = "保存设置";

12
ijpost/ijpost.php
View File

@ -14,7 +14,6 @@ use Friendica\Core\Logger;
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 @@ EOT;
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);
}

8
impressum/impressum.php
View File

@ -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/" );

5
infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
View File

@ -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'][] = '<div class="app-title"><a href="infiniteimprobabilitydrive">' . DI::l10n()->t('Infinite Improbability Drive') . '</a></div>';

10
irc/irc.php
View File

@ -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) {

7
irc/lang/it/messages.po
View File

@ -5,13 +5,14 @@
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2014-2015
# Sylke Vicious <silkevicious@gmail.com>, 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 <fabrix.xm@gmail.com>\n"
"PO-Revision-Date: 2020-09-17 11:40+0000\n"
"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -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."

3
irc/lang/it/strings.php
View File

@ -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 @@ $a->strings["Save Settings"] = "Salva Impostazioni";
$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";

20
jappixmini/jappixmini.php
View File

@ -69,7 +69,6 @@ use Friendica\Core\Protocol;
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);

2
js_upload/js_upload.php
View File

@ -1,7 +1,7 @@
<?php
/**
* Name: JS Uploader
* Description: JavaScript photo/image uploader. Uses Valum 'qq' Uploader.
* Description: JavaScript photo/image uploader. Helpful for uploading multiple files at once. Uses Valum 'qq' Uploader.
* Version: 1.1
* Author: Chris Case <http://friendika.openmindspace.org/profile/chris_case>
* Maintainer: Hypolite Petovan <https://friendica.mrpetovan.com/profile/hypolite>

25
krynn/krynn.php
View File

@ -1,7 +1,7 @@
<?php
/**
* Name: Dragonlance Krynn locales
* Description: Set a random locale from the Dragonlance Realm of Krynn when posting. Based on the planets frindica addon by Mike Macgirvin and Tony Baldwin
* Description: Set a random locale from the Dragonlance Realm of Krynn when posting. Based on the planets friendica addon by Mike Macgirvin and Tony Baldwin
* Version: 1.0
* Planets Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
* Planets Author: Tony Baldwin <https://free-haven.org/profile/tony>
@ -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;

10
langfilter/langfilter.php
View File

@ -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.'));
}
}

6
ldapauth/ldapauth.php
View File

@ -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'));

11
leistungsschutzrecht/leistungsschutzrecht.php
View File

@ -5,10 +5,10 @@
* Version: 0.1
* Author: Michael Vogel <https://pirati.ca/profile/heluecht>
*/
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'];

13
libertree/libertree.php
View File

@ -12,7 +12,6 @@ use Friendica\Core\Hook;
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);
}
}

11
libravatar/libravatar.php
View File

@ -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);
}

12
ljpost/ljpost.php
View File

@ -14,7 +14,6 @@ use Friendica\Core\Logger;
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 @@ EOT;
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);
}

5
mahjongg/mahjongg.php
View File

@ -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'][] = '<div class="app-title"><a href="mahjongg">Mahjongg</a></div>';
}

18
mailstream/mailstream.php
View File

@ -12,9 +12,8 @@ use Friendica\Core\Logger;
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),

39
markdown/lang/it/messages.po Normal file
View File

@ -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 <silkevicious@gmail.com>, 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 <silkevicious@gmail.com>, 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"

12
markdown/lang/it/strings.php Normal file
View File

@ -0,0 +1,12 @@
<?php
if(! function_exists("string_plural_select_it")) {
function string_plural_select_it($n){
$n = intval($n);
return ($n != 1);;
}}
;
$a->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";

13
mastodoncustomemojis/mastodoncustomemojis.php
View File

@ -15,7 +15,6 @@ use Friendica\Core\Cache\Duration;
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'] .= <<<HTML
@ -90,7 +79,7 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
$api_url = $api_base_url . '/api/v1/custom_emojis';
$fetchResult = Network::fetchUrlFull($api_url);
$fetchResult = DI::httpRequest()->fetchFull($api_url);
if ($fetchResult->isSuccess()) {
$emojis_array = json_decode($fetchResult->getBody(), true);

12
mathjax/mathjax.php
View File

@ -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'])) {

5
membersince/membersince.php
View File

@ -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') {

12
morechoice/morechoice.php
View File

@ -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');

5
morepokes/morepokes.php
View File

@ -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')];

5
namethingy/namethingy.php
View File

@ -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'][] = '<div class="app-title"><a href="namethingy">NameThingy</a></div>';
}

13
newmemberwidget/lang/it/messages.po
View File

@ -5,13 +5,14 @@
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2014
# Sylke Vicious <silkevicious@gmail.com>, 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 <fabrix.xm@gmail.com>\n"
"PO-Revision-Date: 2020-09-17 11:38+0000\n"
"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -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"

9
newmemberwidget/lang/it/strings.php
View File

@ -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 @@ $a->strings["Local Support Forum"] = "Forum Locale di Supporto";
$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 <em>nickname</em> of the local support group here (i.e. helpers)"] = "Se hai selezionato il box sopra, specifica qui il <em>nome utente</em> del gruppo locale di supporto (e.s. 'supporto')";

5
newmemberwidget/newmemberwidget.php
View File

@ -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'])) {

60
notifyall/lang/ru/messages.po Normal file
View File

@ -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 <ravnina@gmail.com>, 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 <ravnina@gmail.com>, 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 "Отправить"

17
notifyall/lang/ru/strings.php Normal file
View File

@ -0,0 +1,17 @@
<?php
if(! function_exists("string_plural_select_ru")) {
function string_plural_select_ru($n){
$n = intval($n);
return ($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);;
}}
;
$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"] = "Отправить";

12
notifyall/notifyall.php
View File

@ -15,16 +15,6 @@ use Friendica\Core\Logger;
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');
}

7
notimeline/notimeline.php
View File

@ -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)

7
nsfw/lang/it/messages.po
View File

@ -5,13 +5,14 @@
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
# Sylke Vicious <silkevicious@gmail.com>, 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 <fabrix.xm@gmail.com>\n"
"PO-Revision-Date: 2020-09-17 11:25+0000\n"
"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -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"

2
nsfw/lang/it/strings.php
View File

@ -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";

7
nsfw/lang/nl/messages.po
View File

@ -4,14 +4,15 @@
#
#
# Translators:
# Casper <casper@vrije-mens.org>, 2020
# Jeroen De Meerleer <me@jeroened.be>, 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 <me@jeroened.be>\n"
"PO-Revision-Date: 2020-09-04 21:08+0000\n"
"Last-Translator: Casper <casper@vrije-mens.org>\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"

2
nsfw/lang/nl/strings.php
View File

@ -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";

62
nsfw/lang/ru/messages.po Normal file
View File

@ -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 <ravnina@gmail.com>, 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 <ravnina@gmail.com>\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"

27
nsfw/lang/ru/strings.php
View File

@ -1,10 +1,17 @@
<?php
$a->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 - Нажмите для открытия / закрытия";
<?php
if(! function_exists("string_plural_select_ru")) {
function string_plural_select_ru($n){
$n = intval($n);
return ($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);;
}}
;
$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";

9
nsfw/nsfw.php
View File

@ -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);
}
}

11
numfriends/numfriends.php
View File

@ -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);
}

19
openstreetmap/openstreetmap.php
View File

@ -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);
}

42
pageheader/lang/ru/messages.po Normal file
View File

@ -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 <ravnina@gmail.com>, 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 <ravnina@gmail.com>\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 Настройки сохранены."

18
pageheader/lang/ru/strings.php
View File

@ -1,5 +1,13 @@
<?php
$a->strings["\"pageheader\" Settings"] = "";
$a->strings["Submit"] = "Подтвердить";
$a->strings["pageheader Settings saved."] = "";
<?php
if(! function_exists("string_plural_select_ru")) {
function string_plural_select_ru($n){
$n = intval($n);
return ($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);;
}}
;
$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 Настройки сохранены.";

1
pageheader/pageheader.php
View File

@ -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.'));
}
}

11
phpmailer/phpmailer.php
View File

@ -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)));
}
}
}

7
piwik/lang/it/messages.po
View File

@ -5,13 +5,14 @@
#
# Translators:
# fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2019
# Sylke Vicious <silkevicious@gmail.com>, 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 <fabrix.xm@gmail.com>\n"
"PO-Revision-Date: 2020-09-17 11:39+0000\n"
"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -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"

2
piwik/lang/it/strings.php
View File

@ -12,6 +12,6 @@ $a->strings["Save Settings"] = "Salva Impostazioni";
$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.";

8
piwik/piwik.php
View File

@ -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);
}

21
planets/planets.php
View File

@ -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) {
/**

10
public_server/public_server.php
View File

@ -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)

22
pumpio/pumpio.php
View File

@ -23,7 +23,6 @@ use Friendica\Protocol\Activity;
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();
}
/*

19
qcomment/qcomment.css
View File

@ -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;
}

18
qcomment/qcomment.js Normal file
View File

@ -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('&lt;', '<');
ins = ins.replace('&gt;', '>');
ins = ins.replace('&amp;', '&');
ins = ins.replace('&quot;', '"');
$textarea.val($textarea.val() + ins);
$(obj).val('');
}

43
qcomment/qcomment.php
View File

@ -21,16 +21,16 @@ use Friendica\Core\Hook;
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'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/qcomment/qcomment.css' . '" media="all" />' . "\r\n";
$words = DI::pConfig()->get(local_user(), 'qcomment', 'words', DI::l10n()->t(':-)') . "\n" . DI::l10n()->t(':-(') . "\n" . DI::l10n()->t('lol'));
$s .= '<div class="settings-block">';
$s .= '<h3>' . DI::l10n()->t('Quick Comment Settings') . '</h3>';
$s .= '<div id="qcomment-wrapper">';
$s .= '<div id="qcomment-desc">' . DI::l10n()->t("Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.") . '</div>';
$s .= '<label id="qcomment-label" for="qcomment-words">' . DI::l10n()->t('Enter quick comments, one per line') . ' </label>';
$s .= '<textarea id="qcomment-words" type="text" name="qcomment-words" >' . htmlspecialchars(XML::unescape($words)) . '</textarea>';
$s .= '</div><div class="clear"></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="qcomment-submit" name="qcomment-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div>';
$s .= '</div>';
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);
}
}

21
qcomment/templates/settings.tpl Normal file
View File

@ -0,0 +1,21 @@
<span id="settings_qcomment_inflated" class="settings-block fakelink"
style="{{if $postpost}}display: none;{{else}}display: block;{{/if}}"
onclick="openClose('settings_qcomment_expanded'); openClose('settings_qcomment_inflated');">
<h3>{{$header}}</h3>
</span>
<div id="settings_qcomment_expanded" class="settings-block"
style="{{if $postpost}}display: block;{{else}}display: none;{{/if}}">
<span class="fakelink" onclick="openClose('settings_qcomment_expanded'); openClose('settings_qcomment_inflated');">
<h3>{{$header}}</h3>
</span>
<div id="qcomment-wrapper">
<p id="qcomment-desc">{{$description}}</p>
{{include file="field_textarea.tpl" field=$words}}
<div class="settings-submit-wrapper">
<button type="submit" id="qcomment-submit" name="qcomment-submit" class="btn btn-primary settings-submit">{{$save}}</button>
</div>
</div>
</div>

11
randplace/randplace.php
View File

@ -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");
}

8
remote_permissions/remote_permissions.php
View File

@ -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);
}

6
rendertime/rendertime.php
View File

@ -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) {
}

2
securemail/SecureTestEmail.php
View File

@ -54,6 +54,6 @@ class SecureTestEmail extends Email
parent::__construct($sitename, $sender_email, $sender_email, $a->user['email'],
$subject, "<p>{$message}</p>", $message,
'', local_user());
[], local_user());
}
}

Some files were not shown because too many files have changed in this diff Show More