From 53b1c9208acf17878f48ec28fffd3ef08d927eb3 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 18 Nov 2022 15:03:02 +0100 Subject: [PATCH 1/9] SV translation Update THX BBjoessi# --- advancedcontentfilter/lang/sv/messages.po | 37 +++++++++------- advancedcontentfilter/lang/sv/strings.php | 2 + langfilter/lang/sv/messages.po | 51 +++++++++++------------ langfilter/lang/sv/strings.php | 9 ++-- 4 files changed, 53 insertions(+), 46 deletions(-) diff --git a/advancedcontentfilter/lang/sv/messages.po b/advancedcontentfilter/lang/sv/messages.po index b5c586241..4630af728 100644 --- a/advancedcontentfilter/lang/sv/messages.po +++ b/advancedcontentfilter/lang/sv/messages.po @@ -5,15 +5,16 @@ # # Translators: # Bjoessi , 2019 +# Viktor Nilsson, 2022 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-21 19:13-0500\n" +"POT-Creation-Date: 2022-05-11 08:54-0400\n" "PO-Revision-Date: 2018-05-24 06:41+0000\n" -"Last-Translator: Bjoessi , 2019\n" +"Last-Translator: Viktor Nilsson, 2022\n" "Language-Team: Swedish (https://www.transifex.com/Friendica/teams/12172/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -49,6 +50,10 @@ msgid "" "For a complete reference of the available operations and variables, check " "the help page." msgstr "" +"Lägg till och hantera dina personliga regler för innehållsfilter i det här " +"fönstret. Regler har ett namn och ett filteruttryck som jämförs mot " +"inläggets innehåll. Förteckning över alla operander och variabler finns att " +"hitta på hjälpsidan." #: advancedcontentfilter.php:229 msgid "Your rules" @@ -118,42 +123,46 @@ msgstr "Regeluttryck" msgid "Cancel" msgstr "Avbryt" -#: advancedcontentfilter.php:312 advancedcontentfilter.php:323 -#: advancedcontentfilter.php:334 advancedcontentfilter.php:370 -#: advancedcontentfilter.php:401 advancedcontentfilter.php:424 +#: advancedcontentfilter.php:295 +msgid "This addon requires this node having at least one post" +msgstr "Detta tillägg kräver att denna nod har åtminstone ett inlägg" + +#: advancedcontentfilter.php:325 advancedcontentfilter.php:336 +#: advancedcontentfilter.php:347 advancedcontentfilter.php:383 +#: advancedcontentfilter.php:414 advancedcontentfilter.php:437 msgid "You must be logged in to use this method" msgstr "Du måste vara inloggad för att använda den här funktionen" -#: advancedcontentfilter.php:338 advancedcontentfilter.php:374 -#: advancedcontentfilter.php:405 +#: advancedcontentfilter.php:351 advancedcontentfilter.php:387 +#: advancedcontentfilter.php:418 msgid "Invalid form security token, please refresh the page." msgstr "Felaktigt säkerhetsformulärstecken, vänligen uppdatera sidan." -#: advancedcontentfilter.php:350 +#: advancedcontentfilter.php:363 msgid "The rule name and expression are required." msgstr "Regelns namn och uttryck krävs." -#: advancedcontentfilter.php:364 +#: advancedcontentfilter.php:377 msgid "Rule successfully added" msgstr "Regeln kunde läggas till" -#: advancedcontentfilter.php:378 advancedcontentfilter.php:409 +#: advancedcontentfilter.php:391 advancedcontentfilter.php:422 msgid "Rule doesn't exist or doesn't belong to you." msgstr "Regeln finns inte eller tillhör inte dig." -#: advancedcontentfilter.php:395 +#: advancedcontentfilter.php:408 msgid "Rule successfully updated" msgstr "Uppdatering av regel lyckades" -#: advancedcontentfilter.php:418 +#: advancedcontentfilter.php:431 msgid "Rule successfully deleted" msgstr "Borttagning av regel lyckades" -#: advancedcontentfilter.php:428 +#: advancedcontentfilter.php:441 msgid "Missing argument: guid." msgstr "Argument saknas: guid." -#: advancedcontentfilter.php:436 +#: advancedcontentfilter.php:449 #, php-format msgid "Unknown post with guid: %s" msgstr "Okänt inlägg med guid: %s" diff --git a/advancedcontentfilter/lang/sv/strings.php b/advancedcontentfilter/lang/sv/strings.php index 48cf9565d..b50e9aab7 100644 --- a/advancedcontentfilter/lang/sv/strings.php +++ b/advancedcontentfilter/lang/sv/strings.php @@ -10,6 +10,7 @@ $a->strings['Advanced Content Filter'] = 'Avancerat innehållsfiter'; $a->strings['Back to Addon Settings'] = 'TIllbaka till Tilläggsinställningar'; $a->strings['Add a Rule'] = 'Lägg till en regel'; $a->strings['Help'] = 'Hjälp'; +$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'] = 'Lägg till och hantera dina personliga regler för innehållsfilter i det här fönstret. Regler har ett namn och ett filteruttryck som jämförs mot inläggets innehåll. Förteckning över alla operander och variabler finns att hitta på hjälpsidan.'; $a->strings['Your rules'] = 'Dina regler'; $a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Du har inga regler än! Lägg till regler genom att klicka på knappen ovanför, bredvid överskriften.'; $a->strings['Disabled'] = 'Inaktiverad'; @@ -26,6 +27,7 @@ $a->strings['Add new rule'] = 'Lägg till ny regel'; $a->strings['Rule Name'] = 'Regelnamn'; $a->strings['Rule Expression'] = 'Regeluttryck'; $a->strings['Cancel'] = 'Avbryt'; +$a->strings['This addon requires this node having at least one post'] = 'Detta tillägg kräver att denna nod har åtminstone ett inlägg'; $a->strings['You must be logged in to use this method'] = 'Du måste vara inloggad för att använda den här funktionen'; $a->strings['Invalid form security token, please refresh the page.'] = 'Felaktigt säkerhetsformulärstecken, vänligen uppdatera sidan.'; $a->strings['The rule name and expression are required.'] = 'Regelns namn och uttryck krävs.'; diff --git a/langfilter/lang/sv/messages.po b/langfilter/lang/sv/messages.po index af1991f9f..7a1c4bf68 100644 --- a/langfilter/lang/sv/messages.po +++ b/langfilter/lang/sv/messages.po @@ -5,14 +5,15 @@ # # Translators: # Tim Stahel , 2019 -# Torbjörn Andersson , 2019 +# Bjoessi , 2019 +# Viktor Nilsson, 2022 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: 2019-03-21 18:01+0000\n" -"Last-Translator: Torbjörn Andersson \n" +"POT-Creation-Date: 2021-11-21 19:15-0500\n" +"PO-Revision-Date: 2015-07-25 08:05+0000\n" +"Last-Translator: Viktor Nilsson, 2022\n" "Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,62 +21,58 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: langfilter.php:58 -msgid "Language Filter" -msgstr "Språkfilter" - -#: langfilter.php:59 +#: langfilter.php:49 msgid "" "This addon tries to identify the language posts are written in. If it does " "not match any language specified below, posts will be hidden by collapsing " "them." -msgstr "Detta tillägg försöker identifiera vilket språk inlägg är skrivna i. Om det inte matchar ett språk specifierat nedan så göms inlägg genom att kollapsa dem." +msgstr "Detta tillägg försöker identifiera vilket språk inlägg är skrivna i. Om det inte matchar ett språk specificerat nedan så göms inlägget genom att kollapsa det." -#: langfilter.php:60 +#: langfilter.php:50 msgid "Use the language filter" msgstr "Använd språkfiltret" -#: langfilter.php:61 +#: langfilter.php:51 msgid "Able to read" msgstr "Kan läsa" -#: langfilter.php:61 +#: langfilter.php:51 msgid "" -"List of abbreviations (iso2 codes) for languages you speak, comma separated." -" For example \"de,it\"." -msgstr "Lista av förkortningar (iso2 koder) för spåk du pratar, separerade av kommatecken. Exempel: \"de, it\"." +"List of abbreviations (ISO 639-1 codes) for languages you speak, comma " +"separated. For example \"de,it\"." +msgstr "Lista över förkortningar (ISO 639-1-koder) för språk du använder, separerade med kommatecken. Exempel: \"de, it\"." -#: langfilter.php:62 +#: langfilter.php:52 msgid "Minimum confidence in language detection" msgstr "Minsta förtroende i språkigenkänning" -#: langfilter.php:62 +#: langfilter.php:52 msgid "" "Minimum confidence in language detection being correct, from 0 to 100. Posts" " will not be filtered when the confidence of language detection is below " "this percent value." msgstr "Minsta förtroende i att språkigenkänningen är korrekt, från 0 till 100.\nInlägg filtreras inte när förtroendet i språkigenkänningen är under detta procentvärde." -#: langfilter.php:63 +#: langfilter.php:53 msgid "Minimum length of message body" msgstr "Minsta längd på meddelandetext" -#: langfilter.php:63 +#: langfilter.php:53 msgid "" "Minimum number of characters in message body for filter to be used. Posts " "shorter than this will not be filtered. Note: Language detection is " "unreliable for short content (<200 characters)." -msgstr "Minsta antal tecken i meddelande text för att ett filter ska användas. Inlägg kortare än detta kommer inte filtreras. Notera: Språkigenkänning är inte tillförlitligt på korta texter (<200 tecken)." +msgstr "Minsta antal tecken i meddelandetext för att ett filter ska användas. Inlägg kortare än detta kommer inte att filtreras. Notera: Språkigenkänning är inte tillförlitligt på korta texter (<200 tecken)." -#: langfilter.php:64 +#: langfilter.php:58 +msgid "Language Filter" +msgstr "Språkfilter" + +#: langfilter.php:60 msgid "Save Settings" msgstr "Spara inställningar" -#: langfilter.php:105 -msgid "Language Filter Settings saved." -msgstr "Inställningar för språkfilter sparade." - -#: langfilter.php:182 +#: langfilter.php:193 #, php-format msgid "Filtered language: %s" msgstr "Filtrerat språk: %s" diff --git a/langfilter/lang/sv/strings.php b/langfilter/lang/sv/strings.php index f8b7bf7fe..aba684229 100644 --- a/langfilter/lang/sv/strings.php +++ b/langfilter/lang/sv/strings.php @@ -5,16 +5,15 @@ function string_plural_select_sv($n){ $n = intval($n); return intval($n != 1); }} -$a->strings['Language Filter'] = 'Språkfilter'; -$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Detta tillägg försöker identifiera vilket språk inlägg är skrivna i. Om det inte matchar ett språk specifierat nedan så göms inlägg genom att kollapsa dem.'; +$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Detta tillägg försöker identifiera vilket språk inlägg är skrivna i. Om det inte matchar ett språk specificerat nedan så göms inlägget genom att kollapsa det.'; $a->strings['Use the language filter'] = 'Använd språkfiltret'; $a->strings['Able to read'] = 'Kan läsa'; -$a->strings['List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".'] = 'Lista av förkortningar (iso2 koder) för spåk du pratar, separerade av kommatecken. Exempel: "de, it".'; +$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = 'Lista över förkortningar (ISO 639-1-koder) för språk du använder, separerade med kommatecken. Exempel: "de, it".'; $a->strings['Minimum confidence in language detection'] = 'Minsta förtroende i språkigenkänning'; $a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Minsta förtroende i att språkigenkänningen är korrekt, från 0 till 100. Inlägg filtreras inte när förtroendet i språkigenkänningen är under detta procentvärde.'; $a->strings['Minimum length of message body'] = 'Minsta längd på meddelandetext'; -$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Minsta antal tecken i meddelande text för att ett filter ska användas. Inlägg kortare än detta kommer inte filtreras. Notera: Språkigenkänning är inte tillförlitligt på korta texter (<200 tecken).'; +$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Minsta antal tecken i meddelandetext för att ett filter ska användas. Inlägg kortare än detta kommer inte att filtreras. Notera: Språkigenkänning är inte tillförlitligt på korta texter (<200 tecken).'; +$a->strings['Language Filter'] = 'Språkfilter'; $a->strings['Save Settings'] = 'Spara inställningar'; -$a->strings['Language Filter Settings saved.'] = 'Inställningar för språkfilter sparade.'; $a->strings['Filtered language: %s'] = 'Filtrerat språk: %s'; From 91accba3b925e05231ef116b906e03e4772eb38b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 18 Nov 2022 11:57:34 -0500 Subject: [PATCH 2/9] [nsfw] Match regular words with case sensitivity - Update field description --- nsfw/nsfw.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index f252ffc36..31d17f74a 100644 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -64,7 +64,7 @@ function nsfw_addon_settings(App &$a, array &$data) $html = Renderer::replaceMacros($t, [ '$info' => DI::l10n()->t('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.'), '$enabled' => ['nsfw-enable', DI::l10n()->t('Enable Content filter'), $enabled], - '$words' => ['nsfw-words', DI::l10n()->t('Comma separated list of keywords to hide'), $words, DI::l10n()->t('Use /expression/ to provide regular expressions')], + '$words' => ['nsfw-words', DI::l10n()->t('Comma separated list of keywords to hide'), $words, DI::l10n()->t('Use /expression/ to provide regular expressions, #tag to specfically match hashtags (case-insensitive), or regular words (case-sensitive)')], ]); $data = [ @@ -125,7 +125,7 @@ function nsfw_prepare_body_content_filter(App $a, &$hook_data) $found = nsfw_find_word_in_item_tags($hook_data['item']['hashtags'], substr($word, 1)); break; default: - $found = stripos($body, $word) !== false || nsfw_find_word_in_item_tags($hook_data['item']['tags'], $word); + $found = strpos($body, $word) !== false || nsfw_find_word_in_item_tags($hook_data['item']['tags'], $word); break; } From ba6f6f11c582ffc35163d7ebbdaa6f65af686d40 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 18 Nov 2022 11:58:10 -0500 Subject: [PATCH 3/9] [nsfw] Update main translation file after updating a string --- nsfw/lang/C/messages.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nsfw/lang/C/messages.po b/nsfw/lang/C/messages.po index a44f3e950..150b77d3b 100644 --- a/nsfw/lang/C/messages.po +++ b/nsfw/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-21 19:15-0500\n" +"POT-Creation-Date: 2022-11-18 11:57-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,7 +34,9 @@ msgid "Comma separated list of keywords to hide" msgstr "" #: nsfw.php:67 -msgid "Use /expression/ to provide regular expressions" +msgid "" +"Use /expression/ to provide regular expressions, #tag to specfically match " +"hashtags (case-insensitive), or regular words (case-sensitive)" msgstr "" #: nsfw.php:72 From fada3586074cc242fa8e9a9617d7cb9298f84efa Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 18 Nov 2022 12:00:03 -0500 Subject: [PATCH 4/9] [various] Use new centralized admin account retrieval methods --- notifyall/notifyall.php | 12 +++++++----- pumpio/pumpio.php | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php index 270557c4b..ee05407bc 100644 --- a/notifyall/notifyall.php +++ b/notifyall/notifyall.php @@ -40,15 +40,17 @@ function notifyall_post(App $a) return; } + $condition = ['account_removed' => false, 'account_expired' => false]; + // if this is a test, send it only to the admin(s) // admin_email might be a comma separated list, but we need "a@b','c@d','e@f if (intval($_REQUEST['test'])) { - $email = DI::config()->get('config', 'admin_email'); - $email = "'" . str_replace([" ",","], ["","','"], $email) . "'"; - } - $sql_extra = ((intval($_REQUEST['test'])) ? sprintf(" AND `email` in ( %s )", $email) : ''); + $adminEmails = \Friendica\Model\User::getAdminListForEmailing(['email']); - $recipients = DBA::p("SELECT DISTINCT `email` FROM `user` WHERE `verified` AND NOT `account_removed` AND NOT `account_expired` $sql_extra"); + $condition['email'] = array_column($adminEmails, 'email'); + } + + $recipients = DBA::p("SELECT DISTINCT `email` FROM `user`" . DBA::buildCondition($condition)); if (! $recipients) { DI::sysmsg()->addNotice(DI::l10n()->t('No recipients found.')); diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 903450c23..4928b5e4b 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -99,10 +99,10 @@ function pumpio_registerclient(App $a, $host) $application_name = DI::baseUrl()->getHostname(); } - $adminlist = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email'))); + $firstAdmin = User::getFirstAdmin(['email']); $params['type'] = 'client_associate'; - $params['contacts'] = $adminlist[0]; + $params['contacts'] = $firstAdmin['email']; $params['application_type'] = 'native'; $params['application_name'] = $application_name; $params['logo_url'] = DI::baseUrl()->get() . '/images/friendica-256.png'; From f4130a972465486186da7f646e13dc9574ed586b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 19 Nov 2022 19:19:30 -0500 Subject: [PATCH 5/9] [various] Fix PHP 8 deprecation warnings --- diaspora/diaspora.php | 2 +- tumblr/tumblr.php | 3 +-- twitter/twitter.php | 6 +++--- wppost/wppost.php | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index 1fe6fa12a..79c0aba2f 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -145,7 +145,7 @@ function diaspora_hook_fork(App $a, array &$b) $post = $b['data']; if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) || - !strstr($post['postopts'], 'diaspora') || ($post['parent'] != $post['id'])) { + !strstr($post['postopts'] ?? '', 'diaspora') || ($post['parent'] != $post['id'])) { $b['execute'] = false; return; } diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index 281c58ac0..c3a5561f3 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -266,7 +266,7 @@ function tumblr_hook_fork(App $a, array &$b) $post = $b['data']; if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) || - !strstr($post['postopts'], 'tumblr') || ($post['parent'] != $post['id'])) { + !strstr($post['postopts'] ?? '', 'tumblr') || ($post['parent'] != $post['id'])) { $b['execute'] = false; return; } @@ -442,4 +442,3 @@ function tumblr_send(App $a, array &$b) { } } } - diff --git a/twitter/twitter.php b/twitter/twitter.php index 54ccfa1eb..80ac14a6d 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -440,7 +440,7 @@ function twitter_hook_fork(App $a, array &$b) return; } - if (substr($post['app'], 0, 7) == 'Twitter') { + if (substr($post['app'] ?? '', 0, 7) == 'Twitter') { DI::logger()->info('No Twitter app'); $b['execute'] = false; return; @@ -455,7 +455,7 @@ function twitter_hook_fork(App $a, array &$b) } } else { // Comments are never exported when we don't import the twitter timeline - if (!strstr($post['postopts'], 'twitter') || ($post['parent'] != $post['id']) || $post['private']) { + if (!strstr($post['postopts'] ?? '', 'twitter') || ($post['parent'] != $post['id']) || $post['private']) { DI::logger()->info('Comments are never exported when we don\'t import the twitter timeline'); $b['execute'] = false; return; @@ -1582,7 +1582,7 @@ function twitter_auto_follow(int $uid, object $data) // We only probe on Mastodon style URL to reduce the number of unsuccessful probes twitter_add_contact($url->expanded_url, strpos($url->expanded_url, '@'), $uid); } - } + } } /** diff --git a/wppost/wppost.php b/wppost/wppost.php index aa7adf5e9..be2461dd9 100644 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -107,7 +107,7 @@ function wppost_hook_fork(App $a, array &$b) $post = $b['data']; if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) || - !strstr($post['postopts'], 'wppost') || ($post['parent'] != $post['id'])) { + !strstr($post['postopts'] ?? '', 'wppost') || ($post['parent'] != $post['id'])) { $b['execute'] = false; return; } From 5e51a3f0ada7c4306fda2ad00af39d89d37cddd4 Mon Sep 17 00:00:00 2001 From: Ryan Voots Date: Sat, 19 Nov 2022 20:18:12 -0500 Subject: [PATCH 6/9] Fix signature of hooks to work with modern friendica --- saml/saml.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/saml/saml.php b/saml/saml.php index 52d36d99f..2f9e437ed 100755 --- a/saml/saml.php +++ b/saml/saml.php @@ -108,7 +108,7 @@ function saml_is_configured() DI::config()->get('saml', 'idp_cert'); } -function saml_sso_initiate(App $a, array &$b) +function saml_sso_initiate(App $a, string &$body) { if (!saml_is_configured()) { Logger::warning('SAML SSO tried to trigger, but the SAML addon is not configured yet!'); @@ -173,7 +173,7 @@ function saml_sso_reply(App $a) } } -function saml_slo_initiate(App $a, array &$b) +function saml_slo_initiate(App $a, string &$body) { if (!saml_is_configured()) { Logger::warning('SAML SLO tried to trigger, but the SAML addon is not configured yet!'); From a09dd573916835390db88baff045023f50c1ef27 Mon Sep 17 00:00:00 2001 From: Ryan Voots Date: Sat, 19 Nov 2022 21:41:07 -0500 Subject: [PATCH 7/9] SLO takes no params apparently --- saml/saml.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/saml/saml.php b/saml/saml.php index 2f9e437ed..95f751aa3 100755 --- a/saml/saml.php +++ b/saml/saml.php @@ -173,7 +173,7 @@ function saml_sso_reply(App $a) } } -function saml_slo_initiate(App $a, string &$body) +function saml_slo_initiate(App $a) { if (!saml_is_configured()) { Logger::warning('SAML SLO tried to trigger, but the SAML addon is not configured yet!'); From 46d4d0b51ee0d08b40edc8389c847f35a317dc01 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 20 Nov 2022 11:43:42 -0500 Subject: [PATCH 8/9] [various] Remove config/addon.config.php in favor of per-addon configuration file --- geonames/README.md | 10 +++-- geonames/config/geonames.config.php | 2 +- gravatar/README.md | 12 +++--- gravatar/config/gravatar.config.php | 2 +- impressum/README.md | 22 +++++----- impressum/config/impressum.config.php | 2 +- ldapauth/README.md | 36 +---------------- ldapauth/config/ldapauth.config.php | 2 +- ldapauth/ldapauth.php | 27 +------------ leistungsschutzrecht/README.md | 17 ++++---- libravatar/README.md | 10 +++-- libravatar/config/libravatar.config.php | 2 +- mathjax/README.md | 10 +++-- openstreetmap/README.md | 18 +++++---- openstreetmap/config/openstreetmap.config.php | 2 +- phpmailer/README.md | 40 +------------------ phpmailer/config/phpmailer.config.php | 2 +- piwik/README.md | 16 ++++---- piwik/config/piwik.config.php | 2 +- piwik/piwik.php | 17 ++++---- public_server/README.md | 30 +++++++------- public_server/config/public_server.config.php | 2 +- pumpio/README.md | 18 +++++---- pumpio/config/pumpio.config.php | 2 +- testdrive/README.md | 12 +++--- testdrive/config/testdrive.config.php | 2 +- twitter/README.md | 12 +++--- twitter/config/twitter.config.php | 2 +- twitter/twitter.php | 12 +++--- 29 files changed, 137 insertions(+), 206 deletions(-) diff --git a/geonames/README.md b/geonames/README.md index 16b85b371..7673840d3 100644 --- a/geonames/README.md +++ b/geonames/README.md @@ -7,10 +7,12 @@ Use [Geonames service](https://www.geonames.org) to resolve nearest populated lo ## Installation -Pre-requisite: Register a username at https://www.geonames.org/login and set it in `config/addon.config.php` +Pre-requisite: Register a username at https://www.geonames.org/login and set it in `config/geonames.config.php`: - 'geonames' => [ - 'username' => 'your_username' - ], + return [ + 'geonames' => [ + 'username' => 'your_username' + ], + ]; Also visit https://geonames.org/manageaccount and enable access to the free web services. diff --git a/geonames/config/geonames.config.php b/geonames/config/geonames.config.php index 6af3634e0..179fb56c0 100644 --- a/geonames/config/geonames.config.php +++ b/geonames/config/geonames.config.php @@ -1,7 +1,7 @@ [ diff --git a/gravatar/README.md b/gravatar/README.md index 02b9bfd26..1a71a4d34 100644 --- a/gravatar/README.md +++ b/gravatar/README.md @@ -38,11 +38,13 @@ Open the `config/local.config.php` file and add "gravatar" to the list of activa ... ] -You can add two configuration variables for the addon to the `config/addon.config.php` file: +You can add two configuration variables for the addon to the `config/gravatar.config.php` file: - 'gravatar' => [ - 'default_avatar' => 'identicon', - 'rating' => 'g', - ], + return [ + 'gravatar' => [ + 'default_avatar' => 'identicon', + 'rating' => 'g', + ], + ]; [1]: http://www.gravatar.com/site/implement/images/ "See documentation at Gravatar for more information" diff --git a/gravatar/config/gravatar.config.php b/gravatar/config/gravatar.config.php index 75bab4fc4..2a399d938 100644 --- a/gravatar/config/gravatar.config.php +++ b/gravatar/config/gravatar.config.php @@ -1,7 +1,7 @@ [ diff --git a/impressum/README.md b/impressum/README.md index ca78d9a0a..520340080 100644 --- a/impressum/README.md +++ b/impressum/README.md @@ -16,14 +16,16 @@ Simply fill in the fields in the impressium settings page in the addons area of Manual Configuration -------------------- -If you for any reason you prefer to use a configuration file instead, you can set the following variables in the `config/addon.config.php` file +If you for any reason you prefer to use a configuration file instead, you can set the following variables in the `config/impressum.config.php` file - 'impressum' => [ - 'owner' => '', This is the Name of the Operator - 'ownerprofile' => '', This is an optional Friendica account where the above owner name will link to - 'email' => '', A contact email address (optional) - Will be displayed slightly obfuscated as name(at)example(dot)com - 'postal' => '', Should contain a postal address where you can be reached at (optional) - 'notes' => '', Additional informations that should be displayed in the Impressum block - 'footer_text' => '', Text that will be displayed at the bottom of the pages. - ], + return [ + 'impressum' => [ + 'owner' => '', // This is the Name of the Operator + 'ownerprofile' => '', // This is an optional Friendica account where the above owner name will link to + 'email' => '', // A contact email address (optional) + // Will be displayed slightly obfuscated as name(at)example(dot)com + 'postal' => '', // Should contain a postal address where you can be reached at (optional) + 'notes' => '', // Additional informations that should be displayed in the Impressum block + 'footer_text' => '', // Text that will be displayed at the bottom of the pages. + ], + ]; diff --git a/impressum/config/impressum.config.php b/impressum/config/impressum.config.php index 9fe672fcd..b4de4f37d 100644 --- a/impressum/config/impressum.config.php +++ b/impressum/config/impressum.config.php @@ -1,7 +1,7 @@ [ diff --git a/ldapauth/README.md b/ldapauth/README.md index f37bb9d50..dc0b49c7c 100644 --- a/ldapauth/README.md +++ b/ldapauth/README.md @@ -12,38 +12,4 @@ However, it's possible with an option to automate the creation of a Friendica ba Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site ldap.conf file to the signing cert for your LDAP server. -The configuration options for this module may be set in the `config/addon.config.php` file -e.g.: - - 'ldapauth' => [ - // ldap hostname server - required - 'ldap_server' => '', - - // admin dn - optional - only if ldap server dont have anonymous access - 'ldap_binddn' => '', - - // admin password - optional - only if ldap server dont have anonymous access - 'ldap_bindpw' => '', - - // dn to search users - required - 'ldap_searchdn' => '', - - // attribute to find username - required - 'ldap_userattr' => '', - - // DN of the group whose member can auth on Friendica - optional - 'ldap_group' => '', - - // To create Friendica account if user exists in ldap - // Requires an email and a simple (beautiful) nickname on user ldap object - // active account creation - optional - default true - 'ldap_autocreateaccount' => true, - - // attribute to get email - optional - default : 'mail' - 'ldap_autocreateaccount_emailattribute' => 'mail', - - // attribute to get nickname - optional - default : 'givenName' - 'ldap_autocreateaccount_nameattribute' => 'givenName', - ], - -...etc. +The configuration options for this module are described in the `config/ldapauth.config.php` file. diff --git a/ldapauth/config/ldapauth.config.php b/ldapauth/config/ldapauth.config.php index e89a2b55e..2a79b34c1 100644 --- a/ldapauth/config/ldapauth.config.php +++ b/ldapauth/config/ldapauth.config.php @@ -1,7 +1,7 @@ [ diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php index 72e140e7a..2935c74aa 100644 --- a/ldapauth/ldapauth.php +++ b/ldapauth/ldapauth.php @@ -26,32 +26,7 @@ * Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site * ldap.conf file to the signing cert for your LDAP server. * - * The configuration options for this module may be set in the config/addon.config.php file - * e.g.: - * - * [ldapauth] - * ; ldap hostname server - required - * ldap_server = host.example.com - * ; dn to search users - required - * ldap_searchdn = ou=users,dc=example,dc=com - * ; attribute to find username - required - * ldap_userattr = uid - * - * ; admin dn - optional - only if ldap server dont have anonymous access - * ldap_binddn = cn=admin,dc=example,dc=com - * ; admin password - optional - only if ldap server dont have anonymous access - * ldap_bindpw = password - * - * ; for create Friendica account if user exist in ldap - * ; required an email and a simple (beautiful) nickname on user ldap object - * ; active account creation - optional - default none - * ldap_autocreateaccount = true - * ; attribute to get email - optional - default : 'mail' - * ldap_autocreateaccount_emailattribute = mail - * ; attribute to get nickname - optional - default : 'givenName' - * ldap_autocreateaccount_nameattribute = cn - * - * ...etc. + * The configuration options for this module are described in the config/ldapauth.config.php file */ use Friendica\App; diff --git a/leistungsschutzrecht/README.md b/leistungsschutzrecht/README.md index 7026af53a..18bc9c4ff 100644 --- a/leistungsschutzrecht/README.md +++ b/leistungsschutzrecht/README.md @@ -1,16 +1,17 @@ Leistungsschutzrecht Addon ========================== -Main author Michael Vogel +Main author: Michael Vogel This addon handles legal problems with the German link tax, named "Leistungsschutzrecht" by shortening preview texts. -Additionally it is possibly to suppress preview pictures completely to avoid any legal problems. +Additionally, it is possibly to suppress preview pictures completely to avoid any legal problems. -## configuration +## Configuration -If you want to suppress pictures in previews, add this to your global `config/addon.config.php`: - - 'leistungsschutzrecht' => [ - 'suppress_photos' => true, - ], +If you want to suppress pictures in previews, add this to your global `config/leistungsschutzrecht.config.php`: + return [ + 'leistungsschutzrecht' => [ + 'suppress_photos' => true, + ], + ]; diff --git a/libravatar/README.md b/libravatar/README.md index bcc0f8243..fc06feabc 100644 --- a/libravatar/README.md +++ b/libravatar/README.md @@ -31,10 +31,12 @@ Open the `config/local.config.php` file and add "libravatar" to the list of acti ... ] -You can add one configuration variables for the addon to the `config/addon.config.php` file: +You can add one configuration variables for the addon to the `config/libravatar.config.php` file: - 'libravatar' => [ - 'default_avatar' => 'identicon', - ], + return [ + 'libravatar' => [ + 'default_avatar' => 'identicon', + ], + ]; [1]: http://wiki.libravatar.org/api/ "See API documentation at Libravatar for more information" diff --git a/libravatar/config/libravatar.config.php b/libravatar/config/libravatar.config.php index 7f4f50f64..a59a74ec3 100644 --- a/libravatar/config/libravatar.config.php +++ b/libravatar/config/libravatar.config.php @@ -1,7 +1,7 @@ [ diff --git a/mathjax/README.md b/mathjax/README.md index f5a0388fe..e907fadfc 100644 --- a/mathjax/README.md +++ b/mathjax/README.md @@ -29,11 +29,13 @@ the addon by adding _mathjax_ to the list in your `config/local.config.php` file ... ] -and then providing the base URL after that in the `config/addon.config.php` file +and then providing the base URL after that in the `config/mathjax.config.php` file - 'mathjax' => [ - 'baseurl' => '[the URL to your MathJax installation]', - ], + return [ + 'mathjax' => [ + 'baseurl' => '[the URL to your MathJax installation]', + ], + ]; Usage ===== diff --git a/openstreetmap/README.md b/openstreetmap/README.md index d8709a181..78c748004 100644 --- a/openstreetmap/README.md +++ b/openstreetmap/README.md @@ -42,18 +42,20 @@ Open the `config/local.config.php` file and add "openstreetmap" to the list of a ... ] -You can set configuration variables for the addon in the `config/addon.config.php` file: +You can set configuration variables for the addon in the `config/openstreetmap.config.php` file: - 'openstreetmap' => [ - 'tmsserver' => 'https://www.openstreetmap.org', - 'nomserver' => 'https://nominatim.openstreetmap.org/search.php', - 'zoom' => 16, - 'marker' => 0, - ], + return [ + 'openstreetmap' => [ + 'tmsserver' => 'https://www.openstreetmap.org', + 'nomserver' => 'https://nominatim.openstreetmap.org/search.php', + 'zoom' => 16, + 'marker' => 0, + ], + ]; The *tmsserver* points to the tile server you want to use. Use the full URL, with protocol (http/s) and trailing slash. You can configure the default zoom level on the map with *zoom*. 1 will show the whole world and 18 is the highest zoom level available. -Please see provided `config/openstreetmap.php` file for explanation on the additional configuration keys. \ No newline at end of file +Please see provided `config/openstreetmap.php` file for explanation on the additional configuration keys. diff --git a/openstreetmap/config/openstreetmap.config.php b/openstreetmap/config/openstreetmap.config.php index e9252ca58..c649da5f3 100644 --- a/openstreetmap/config/openstreetmap.config.php +++ b/openstreetmap/config/openstreetmap.config.php @@ -1,7 +1,7 @@ [ diff --git a/phpmailer/README.md b/phpmailer/README.md index c51405f48..23ce75c07 100644 --- a/phpmailer/README.md +++ b/phpmailer/README.md @@ -8,45 +8,7 @@ This addon replaces the default `mail()` function by the `PHPMailer` library, al Configuration ------------- -You can override the default value of the following config keys in your base Friendica install `config/addon.config.php` file: - - 'phpmailer' => [ - // smtp (Boolean) - // Enables SMTP relaying for outbound emails - 'smtp' => false, - - // smtp_server (String) - // SMTP server host name - 'smtp_server' => 'smtp.example.com', - - // smtp_port (Integer) - // SMTP server port number - 'smtp_port' => 25, - - // smtp_secure (String) - // What kind of encryption to use on the SMTP connection. - // Options: '', 'ssl' or 'tls'. - 'smtp_secure' => '', - - // smtp_port_s (Integer) - // Secure SMTP server port number - 'smtp_port_s' => 465, - - // smtp_username (String) - // SMTP server authentication user name - // Empty string disables authentication - 'smtp_username' => '', - - // smtp_password (String) - // SMTP server authentication password - // Empty string disables authentication - 'smtp_password' => '', - - // smtp_from (String) - // From address used when using the SMTP server - // Example: no-reply@example.com - 'smtp_from' => '', - ], +The configuration options for this module are described in the `config/phpmailer.config.php` file. License ======= diff --git a/phpmailer/config/phpmailer.config.php b/phpmailer/config/phpmailer.config.php index b2916471a..4b084da78 100644 --- a/phpmailer/config/phpmailer.config.php +++ b/phpmailer/config/phpmailer.config.php @@ -1,7 +1,7 @@ [ diff --git a/piwik/README.md b/piwik/README.md index 0878394ed..c336fc79c 100644 --- a/piwik/README.md +++ b/piwik/README.md @@ -30,14 +30,16 @@ Open the `config/local.config.php` file and add "piwik" to the list of activated ... ] -You can change 4 more configuration variables for the addon in the `config/addon.config.php` file: +You can change 4 more configuration variables for the addon in the `config/piwik.config.php` file: - 'piwik' => [ - 'baseurl' => 'example.com/piwik/', - 'sideid' => 1, - 'optout' => true, - 'async' => false, - ], + return [ + 'piwik' => [ + 'baseurl' => 'example.com/piwik/', + 'sideid' => 1, + 'optout' => true, + 'async' => false, + ], + ]; Configuration fields --------------------- diff --git a/piwik/config/piwik.config.php b/piwik/config/piwik.config.php index 7543097c6..ba59b63d5 100644 --- a/piwik/config/piwik.config.php +++ b/piwik/config/piwik.config.php @@ -1,7 +1,7 @@ [ diff --git a/piwik/piwik.php b/piwik/piwik.php index a73ee96b8..047e41a39 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -16,14 +16,17 @@ * * Configuration: * Use the administration panel to configure the Piwik tracking addon, or - * in case you don't use this add the following lines to your config/addon.config.php + * in case you don't use this, add the following lines to your config/piwik.config.php * file: * - * [piwik] - * baseurl = example.com/piwik/ - * sideid = 1 - * optout = true ;set to false to disable - * async = false ;set to true to enable + * return [ + * 'piwik' => [ + * 'baseurl' => '', + * 'sideid' => '', + * 'optout' => true, + * 'async' => false, + * ], + * ]; * * Change the siteid to the ID that the Piwik tracker for your Friendica * installation has. Alter the baseurl to fit your needs, don't care @@ -60,7 +63,7 @@ function piwik_analytics(App $a, string &$b) DI::page()['htmlhead'] .= ''; /* - * Get the configuration variables from the config/addon.config.php file. + * Get the configuration values. */ $baseurl = DI::config()->get('piwik', 'baseurl'); $siteid = DI::config()->get('piwik', 'siteid'); diff --git a/public_server/README.md b/public_server/README.md index fecc38ba8..082379c33 100644 --- a/public_server/README.md +++ b/public_server/README.md @@ -6,21 +6,23 @@ Public Server is a Friendica addon which implements automatic account & post exp This is a modified version of the testdrive addon, DO NOT ACTIVATE AT THE SAME TIME AS THE TESTDRIVE ADDON. - 'public_server' => [ - // When an account is created on the site, it is given a hard expiration date of. 0 to disable. - 'expiredays' => 0, - // Set the default days for posts to expire here. 0 to disable. - 'expireposts' => 0, - // Remove users who have never logged in after nologin days. 0 to disable. - 'nologin' => 0, - // Remove users who last logged in over flagusers days ago. 0 to disable. - 'flagusers' => 0, - // For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire. 0 to disable. - 'flagposts' => 0, - 'flagpostsexpire' => 0, - ], + return [ + 'public_server' => [ + // When an account is created on the site, it is given a hard expiration date of. 0 to disable. + 'expiredays' => 0, + // Set the default days for posts to expire here. 0 to disable. + 'expireposts' => 0, + // Remove users who have never logged in after nologin days. 0 to disable. + 'nologin' => 0, + // Remove users who last logged in over flagusers days ago. 0 to disable. + 'flagusers' => 0, + // For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire. 0 to disable. + 'flagposts' => 0, + 'flagpostsexpire' => 0, + ], + ]; -Set these in your `config/addon.config.php` file. By default nothing is defined in case the addon is activated accidentally. +Set these in your `config/public_server.config.php` file. By default, nothing is defined in case the addon is activated accidentally. They can be ommitted or set to 0 to disable each option. The default values are those used by friendica.eu, change these as desired. diff --git a/public_server/config/public_server.config.php b/public_server/config/public_server.config.php index 47ad4107a..6315cc93d 100644 --- a/public_server/config/public_server.config.php +++ b/public_server/config/public_server.config.php @@ -1,7 +1,7 @@ [ diff --git a/pumpio/README.md b/pumpio/README.md index 33137984c..ab53a3001 100644 --- a/pumpio/README.md +++ b/pumpio/README.md @@ -1,11 +1,13 @@ -To let the connector work properly you should define an application name in `config/addon.config.php`: +To let the connector work properly you should define an application name in `config/pumpio.config.php`: - 'pumpio' => [ - 'application_name' => '', - // Displays forwarded posts like "wall-to-wall" posts. - 'wall-to-wall_share' => false, - // Given in minutes - 'poll_interval' => 5, - ], + return [ + 'pumpio' => [ + 'application_name' => '', + // Displays forwarded posts like "wall-to-wall" posts. + 'wall-to-wall_share' => false, + // Given in minutes + 'poll_interval' => 5, + ], + ]; This name appears at pump.io and is important for not mirroring back posts that came from Friendica. diff --git a/pumpio/config/pumpio.config.php b/pumpio/config/pumpio.config.php index 4f3dc460d..e2c5b7261 100644 --- a/pumpio/config/pumpio.config.php +++ b/pumpio/config/pumpio.config.php @@ -1,7 +1,7 @@ [ diff --git a/testdrive/README.md b/testdrive/README.md index 59512aefd..675f64e29 100644 --- a/testdrive/README.md +++ b/testdrive/README.md @@ -6,12 +6,14 @@ Testdrive is a Friendica addon which implements automatic account expiration so When an account is created on the site, it is given a hard expiration date of - 'testdrive' => [ - 'expiredays' => 30, - ], + return [ + 'testdrive' => [ + 'expiredays' => 30, + ], + ]; -Set this in your `config/addon.config.php` file to allow a 30 day test drive period. -By default no expiration period is defined in case the addon is activated accidentally. +Set this in your `config/testdrive.config.php` file to allow a 30-day test drive period. +By default, no expiration period is defined in case the addon is activated accidentally. There is no opportunity to extend an expired account using this addon. Expiration is final. diff --git a/testdrive/config/testdrive.config.php b/testdrive/config/testdrive.config.php index c10acf825..f4b1dc0f9 100644 --- a/testdrive/config/testdrive.config.php +++ b/testdrive/config/testdrive.config.php @@ -1,7 +1,7 @@ [ diff --git a/twitter/README.md b/twitter/README.md index f1f875415..2efdddcad 100644 --- a/twitter/README.md +++ b/twitter/README.md @@ -24,12 +24,14 @@ Open the `config/local.config.php` file and add "twitter" to the list of activat ... ] -Add your key pair to your global `config/addon.config.php`. +Add your key pair to your `config/twitter.config.php` file. - 'twitter' => [ - 'consumerkey' => 'your consumer_key here', - 'consumersecret' => 'your consumer_secret here', - ], + return [ + 'twitter' => [ + 'consumerkey' => 'your consumer_key here', + 'consumersecret' => 'your consumer_secret here', + ], + ]; After this, users can configure their Twitter account settings from "Settings -> Addon Settings". diff --git a/twitter/config/twitter.config.php b/twitter/config/twitter.config.php index e39de2f9a..8895814d3 100644 --- a/twitter/config/twitter.config.php +++ b/twitter/config/twitter.config.php @@ -1,7 +1,7 @@ [ diff --git a/twitter/twitter.php b/twitter/twitter.php index 80ac14a6d..99985d97a 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -48,12 +48,14 @@ * we do not need "Twitter as login". When you've registered the app you get the * OAuth Consumer key and secret pair for your application/site. * - * Add this key pair to your global config/addon.config.php or use the admin panel. + * Add this key pair to your config/twitter.config.php file or use the admin panel. * - * 'twitter' => [ - * 'consumerkey' => '', - * 'consumersecret' => '', - * ], + * return [ + * 'twitter' => [ + * 'consumerkey' => '', + * 'consumersecret' => '', + * ], + * ]; * * To activate the addon itself add it to the system.addon * setting. After this, your user can configure their Twitter account settings From 2fc7356cf43a52ac91fa451f0e8a49f83bccf6df Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 20 Nov 2022 12:44:53 -0500 Subject: [PATCH 9/9] [various] Set config loaded from default values to SOURCE_STATIC - This prevents from clobbering values loaded from base `config/` folder --- geonames/geonames.php | 2 +- gravatar/gravatar.php | 2 +- impressum/impressum.php | 2 +- ldapauth/ldapauth.php | 2 +- libravatar/libravatar.php | 2 +- openstreetmap/openstreetmap.php | 2 +- phpmailer/phpmailer.php | 2 +- piwik/piwik.php | 2 +- public_server/public_server.php | 2 +- pumpio/pumpio.php | 2 +- testdrive/testdrive.php | 2 +- twitter/twitter.php | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/geonames/geonames.php b/geonames/geonames.php index 2ae845e5c..2eb78fbd2 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -35,7 +35,7 @@ function geonames_install() function geonames_load_config(App $a, ConfigFileLoader $loader) { - $a->getConfigCache()->load($loader->loadAddonConfig('geonames')); + $a->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); } function geonames_post_hook(App $a, array &$item) diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php index 27e550025..d53e8ef83 100644 --- a/gravatar/gravatar.php +++ b/gravatar/gravatar.php @@ -28,7 +28,7 @@ function gravatar_install() { function gravatar_load_config(App $a, ConfigFileLoader $loader) { - $a->getConfigCache()->load($loader->loadAddonConfig('gravatar')); + $a->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); } /** diff --git a/impressum/impressum.php b/impressum/impressum.php index 69beba599..6842f6fc5 100644 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -56,7 +56,7 @@ function impressum_footer(App $a, string &$body) function impressum_load_config(App $a, ConfigFileLoader $loader) { - $a->getConfigCache()->load($loader->loadAddonConfig('impressum')); + $a->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); } function impressum_show(App $a, string &$body) diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php index 2935c74aa..04ac00db7 100644 --- a/ldapauth/ldapauth.php +++ b/ldapauth/ldapauth.php @@ -45,7 +45,7 @@ function ldapauth_install() function ldapauth_load_config(App $a, ConfigFileLoader $loader) { - $a->getConfigCache()->load($loader->loadAddonConfig('ldapauth')); + $a->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); } function ldapauth_hook_authenticate(App $a, array &$b) diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php index 1ddeccd42..f2a49ac83 100644 --- a/libravatar/libravatar.php +++ b/libravatar/libravatar.php @@ -26,7 +26,7 @@ function libravatar_install() function libravatar_load_config(App $a, ConfigFileLoader $loader) { - $a->getConfigCache()->load($loader->loadAddonConfig('libravatar')); + $a->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); } /** diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php index fe6ff9ae6..e83e02c27 100644 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -37,7 +37,7 @@ function openstreetmap_install() function openstreetmap_load_config(App $a, ConfigFileLoader $loader) { - $a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap')); + $a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); } function openstreetmap_alterheader(App $a, &$navHtml) diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php index 72113e0ac..30f10ff81 100644 --- a/phpmailer/phpmailer.php +++ b/phpmailer/phpmailer.php @@ -25,7 +25,7 @@ function phpmailer_install() function phpmailer_load_config(App $a, ConfigFileLoader $loader) { - $a->getConfigCache()->load($loader->loadAddonConfig('phpmailer')); + $a->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); } /** diff --git a/piwik/piwik.php b/piwik/piwik.php index 047e41a39..370121d74 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -50,7 +50,7 @@ function piwik_install() { function piwik_load_config(App $a, ConfigFileLoader $loader) { - $a->getConfigCache()->load($loader->loadAddonConfig('piwik')); + $a->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); } function piwik_analytics(App $a, string &$b) diff --git a/public_server/public_server.php b/public_server/public_server.php index cc85ba60b..95e1e8dd3 100644 --- a/public_server/public_server.php +++ b/public_server/public_server.php @@ -29,7 +29,7 @@ function public_server_install() function public_server_load_config(App $a, ConfigFileLoader $loader) { - $a->getConfigCache()->load($loader->loadAddonConfig('public_server')); + $a->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); } function public_server_register_account(App $a, $b) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 4928b5e4b..f5c2b14ec 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -320,7 +320,7 @@ function pumpio_settings_post(App $a, array &$b) function pumpio_load_config(App $a, ConfigFileLoader $loader) { - $a->getConfigCache()->load($loader->loadAddonConfig('pumpio')); + $a->getConfigCache()->load($loader->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); } function pumpio_hook_fork(App $a, array &$b) diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php index 94e63dda2..903f80b11 100644 --- a/testdrive/testdrive.php +++ b/testdrive/testdrive.php @@ -27,7 +27,7 @@ function testdrive_install() function testdrive_load_config(App $a, ConfigFileLoader $loader) { - $a->getConfigCache()->load($loader->loadAddonConfig('testdrive')); + $a->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); } function testdrive_globaldir_update(App $a, array &$b) diff --git a/twitter/twitter.php b/twitter/twitter.php index 99985d97a..39e5b4479 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -125,7 +125,7 @@ function twitter_install() function twitter_load_config(App $a, ConfigFileLoader $loader) { - $a->getConfigCache()->load($loader->loadAddonConfig('twitter')); + $a->getConfigCache()->load($loader->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); } function twitter_check_item_notification(App $a, array &$notification_data)