{{$setrandomize}}
+' . DI::l10n()->t('Blockem') . '
'; - $s .= ''; - $s .= ''; - - return; + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/blockem/'); + $html = Renderer::replaceMacros($t, [ + '$info' => DI::l10n()->t("Hides user's content by collapsing posts. Also replaces their avatar with generic image."), + '$words' => ['blockem-words', DI::l10n()->t('Comma separated profile URLS:'), $words], + ]); + $data = [ + 'addon' => 'blockem', + 'title' => DI::l10n()->t('Blockem'), + 'html' => $html, + ]; } function blockem_addon_settings_post(App $a, array &$b) diff --git a/blockem/lang/C/messages.po b/blockem/lang/C/messages.po index 1d9ed121..64bb3fc4 100644 --- a/blockem/lang/C/messages.po +++ b/blockem/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:13-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME{{$setrandomize}}
+{{$header}}
- - +{{if $noappidtext}} +{{$noappidtext}}
+{{/if}} +{{include file="field_input.tpl" field=$curweather_loc}} +{{include file="field_select.tpl" field=$curweather_units}} +{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/diaspora/diaspora.css b/diaspora/diaspora.css deleted file mode 100644 index 21ef9bc5..00000000 --- a/diaspora/diaspora.css +++ /dev/null @@ -1,16 +0,0 @@ - -#diaspora-enable-label, #diaspora-username-label, #diaspora-password-label, #diaspora-bydefault-label, #diaspora-aspect-label { - float: left; - width: 200px; - margin-top: 10px; -} - -#diaspora-checkbox, #diaspora-username, #diaspora-password, #diaspora-bydefault, #diaspora-aspect { - float: left; - margin-top: 10px; -} - -#diaspora-submit { - margin-top: 15px; -} - diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index e47f03b1..82042fc9 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -48,22 +48,20 @@ function diaspora_jot_nets(App $a, array &$jotnets_fields) } } -function diaspora_settings(App $a, &$s) +function diaspora_settings(App $a, array &$data) { - if (! local_user()) { + if (!local_user()) { return; } - /* Get the current state of our config variables */ + $enabled = DI::pConfig()->get(local_user(), 'diaspora', 'post', false); + $def_enabled = DI::pConfig()->get(local_user(), 'diaspora', 'post_by_default'); - $enabled = DI::pConfig()->get(local_user(),'diaspora','post'); - $def_enabled = DI::pConfig()->get(local_user(),'diaspora','post_by_default'); - - $handle = DI::pConfig()->get(local_user(), 'diaspora', 'handle'); + $handle = DI::pConfig()->get(local_user(), 'diaspora', 'handle'); $password = DI::pConfig()->get(local_user(), 'diaspora', 'password'); - $aspect = DI::pConfig()->get(local_user(),'diaspora','aspect'); + $aspect = DI::pConfig()->get(local_user(), 'diaspora', 'aspect'); - $info = ''; + $info = ''; $error = ''; if (Session::get('my_address')) { $info = DI::l10n()->t('Please remember: You can always be reached from Diaspora with your Friendica handle %s. ', Session::get('my_address')); @@ -79,37 +77,44 @@ function diaspora_settings(App $a, &$s) if ($rawAspects) { $availableAspects = [ 'all_aspects' => DI::l10n()->t('All aspects'), - 'public' => DI::l10n()->t('Public'), + 'public' => DI::l10n()->t('Public'), ]; foreach ($rawAspects as $rawAspect) { $availableAspects[$rawAspect->id] = $rawAspect->name; } $aspect_select = ['aspect', DI::l10n()->t('Post to aspect:'), $aspect, '', $availableAspects]; - $info = DI::l10n()->t('Connected with your Diaspora account %s', $handle); + $info = DI::l10n()->t('Connected with your Diaspora account %s', $handle); } else { - $info = ''; + $info = ''; $error = DI::l10n()->t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."); } } - DI::page()->registerStylesheet('addon/diaspora/diaspora.css'); + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/diaspora/'); + $html = Renderer::replaceMacros($t, [ + '$l10n' => [ + 'info_header' => DI::l10n()->t('Information'), + 'error_header' => DI::l10n()->t('Error'), + ], - $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/diaspora/'); - $s .= Renderer::replaceMacros($t, [ - '$header' => DI::l10n()->t('Diaspora Export'), - '$info_header' => DI::l10n()->t('Information'), - '$error_header' => DI::l10n()->t('Error'), - '$submit' => DI::l10n()->t('Save Settings'), - '$info' => $info, - '$error' => $error, - '$enabled' => $enabled, - '$enabled_checkbox' => ['enabled', DI::l10n()->t('Enable Diaspora Post Addon'), $enabled], - '$handle' => ['handle', DI::l10n()->t('Diaspora handle'), $handle, null, null, 'placeholder="user@domain.tld"'], - '$password' => ['password', DI::l10n()->t('Diaspora password'), '', DI::l10n()->t('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.')], - '$aspect_select' => $aspect_select, - '$post_by_default' => ['post_by_default', DI::l10n()->t('Post to Diaspora by default'), $def_enabled], + '$info' => $info, + '$error' => $error, + + '$enabled' => ['enabled', DI::l10n()->t('Enable Diaspora Post Addon'), $enabled], + '$handle' => ['handle', DI::l10n()->t('Diaspora handle'), $handle, null, null, 'placeholder="user@domain.tld"'], + '$password' => ['password', DI::l10n()->t('Diaspora password'), '', DI::l10n()->t('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.')], + '$aspect_select' => $aspect_select, + '$post_by_default' => ['post_by_default', DI::l10n()->t('Post to Diaspora by default'), $def_enabled], ]); + + $data = [ + 'connector' => 'diaspora', + 'title' => DI::l10n()->t('Diaspora Export'), + 'image' => 'images/diaspora-logo.png', + 'enabled' => $enabled, + 'html' => $html, + ]; } diff --git a/diaspora/lang/C/messages.po b/diaspora/lang/C/messages.po index 749d3f25..262e4cd8 100644 --- a/diaspora/lang/C/messages.po +++ b/diaspora/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME
+
+{{/if}}
+{{if $error}}
+
+
+ {{$l10n.info_header}}
++ {{$info nofilter}} +
+
+
+{{/if}}
+
+ {{include file="field_checkbox.tpl" field=$enabled}}
+
+{{if $aspect_select}}
+ {{include file="field_select.tpl" field=$aspect_select}}
+
+ {{include file="field_checkbox.tpl" field=$post_by_default}}
+{{else}}
+ {{include file="field_input.tpl" field=$handle}}
+
+ {{include file="field_password.tpl" field=$password}}
+{{/if}}
diff --git a/diaspora/templates/settings.tpl b/diaspora/templates/settings.tpl
deleted file mode 100644
index dadebe44..00000000
--- a/diaspora/templates/settings.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
+
+ {{$l10n.error_header}}
++ {{$error nofilter}} +
+
- {{$header}}
- - \ No newline at end of file diff --git a/discourse/discourse.php b/discourse/discourse.php index 35ec9be5..3d085d92 100644 --- a/discourse/discourse.php +++ b/discourse/discourse.php @@ -36,7 +36,7 @@ function discourse_install() Hook::register('connector_settings_post', __FILE__, 'discourse_settings_post'); } -function discourse_settings(App $a, &$s) +function discourse_settings(App $a, array &$data) { if (!local_user()) { return; @@ -44,12 +44,18 @@ function discourse_settings(App $a, &$s) $enabled = intval(DI::pConfig()->get(local_user(), 'discourse', 'enabled')); - $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/discourse/'); - $s .= Renderer::replaceMacros($t, [ - '$title' => DI::l10n()->t('Discourse'), + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/discourse/'); + $html = Renderer::replaceMacros($t, [ '$enabled' => ['enabled', DI::l10n()->t('Enable processing of Discourse mailing list mails'), $enabled, DI::l10n()->t('If enabled, incoming mails from Discourse will be improved so they look much better. To make it work, you have to configure the e-mail settings in Friendica. You also have to enable the mailing list mode in Discourse. Then you have to add the Discourse mail account as contact.')], - '$submit' => DI::l10n()->t('Save Settings'), ]); + + $data = [ + 'connector' => 'discourse', + 'title' => DI::l10n()->t('Discourse'), + 'image' => 'images/discourse.png', + 'enabled' => $enabled, + 'html' => $html, + ]; } function discourse_settings_post(App $a) diff --git a/discourse/lang/C/messages.po b/discourse/lang/C/messages.po new file mode 100644 index 00000000..ba0809ee --- /dev/null +++ b/discourse/lang/C/messages.po @@ -0,0 +1,34 @@ +# ADDON discourse +# Copyright (C) +# This file is distributed under the same license as the Friendica discourse addon package. +# +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME
{{$title}}
- - diff --git a/dwpost/dwpost.css b/dwpost/dwpost.css deleted file mode 100644 index 3b0ee32a..00000000 --- a/dwpost/dwpost.css +++ /dev/null @@ -1,15 +0,0 @@ - -#dwpost-enable-label, #dwpost-username-label, #dwpost-password-label, #dwpost-bydefault-label { -float: left; -width: 200px; -margin-top: 10px; -} - -#dwpost-checkbox, #dwpost-username, #dwpost-password, #dwpost-bydefault { -float: left; -margin-top: 10px; -} - -#dwpost-submit { -margin-top: 15px; -} diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php index 397dc88f..286d8012 100644 --- a/dwpost/dwpost.php +++ b/dwpost/dwpost.php @@ -12,7 +12,7 @@ use Friendica\App; use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\Logger; -use Friendica\Database\DBA; +use Friendica\Core\Renderer; use Friendica\DI; use Friendica\Model\Post; use Friendica\Model\Tag; @@ -48,58 +48,31 @@ function dwpost_jot_nets(App $a, array &$jotnets_fields) } -function dwpost_settings(App $a, &$s) +function dwpost_settings(App $a, array &$data) { if (!local_user()) { return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variables */ - $enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post'); - - $checked = (($enabled) ? ' checked="checked" ' : ''); - + $enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post', false); + $dw_username = DI::pConfig()->get(local_user(), 'dwpost', 'dw_username'); $def_enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post_by_default'); - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/dwpost/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['dwpost', DI::l10n()->t('Enable Dreamwidth Post Addon'), $enabled], + '$username' => ['dw_username', DI::l10n()->t('Dreamwidth username'), $dw_username], + '$password' => ['dw_password', DI::l10n()->t('Dreamwidth password')], + '$bydefault' => ['dw_bydefault', DI::l10n()->t('Post to Dreamwidth by default'), $def_enabled], + ]); - $dw_username = DI::pConfig()->get(local_user(), 'dwpost', 'dw_username'); - $dw_password = DI::pConfig()->get(local_user(), 'dwpost', 'dw_password'); - - /* Add some HTML to the existing form */ - $s .= ''; - $s .= '
'. DI::l10n()->t("Dreamwidth Export").'
'; - $s .= ''; - $s .= ''; + $data = [ + 'connector' => 'dwpost', + 'title' => DI::l10n()->t('Dreamwidth Export'), + 'image' => 'images/dreamwidth.png', + 'enabled' => $enabled, + 'html' => $html, + ]; } diff --git a/dwpost/lang/C/messages.po b/dwpost/lang/C/messages.po index 3787f75b..0b27a70c 100644 --- a/dwpost/lang/C/messages.po +++ b/dwpost/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME' . DI::l10n()->t('FromApp Settings') . '
'; - $s .= ''; - $s .= ''; + $data = [ + 'addon' => 'fromapp', + 'title' => DI::l10n()->t('FromApp Settings'), + 'html' => $html, + ]; } function fromapp_post_hook(&$a, &$item) diff --git a/fromapp/lang/C/messages.po b/fromapp/lang/C/messages.po index 195d6178..ce4a7827 100644 --- a/fromapp/lang/C/messages.po +++ b/fromapp/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME{{$title}}
- - - \ No newline at end of file +{{$info}}
+{{include file="field_checkbox.tpl" field=$enable}} diff --git a/gnot/gnot.css b/gnot/gnot.css deleted file mode 100644 index ccafdafb..00000000 --- a/gnot/gnot.css +++ /dev/null @@ -1,16 +0,0 @@ - -#gnot-desc { - margin-bottom: 10px; -} - -#gnot-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#gnot { - float: left; -} - - diff --git a/gnot/gnot.php b/gnot/gnot.php index 8b37fb1c..7acf8465 100644 --- a/gnot/gnot.php +++ b/gnot/gnot.php @@ -8,6 +8,7 @@ * */ +use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Renderer; @@ -49,31 +50,25 @@ function gnot_settings_post($a,$post) { -function gnot_settings(&$a,&$s) { - - if(! local_user()) +function gnot_settings(App &$a, array &$data) +{ + if (!local_user()) { return; + } - /* Add our stylesheet to the page so we can make our settings look nice */ + $gnot = intval(DI::pConfig()->get(local_user(), 'gnot', 'enable')); - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variable */ - - $gnot = intval(DI::pConfig()->get(local_user(),'gnot','enable')); - - $gnot_checked = (($gnot) ? ' checked="checked" ' : '' ); - - $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/gnot/'); - /* Add some HTML to the existing form */ - - $s .= Renderer::replaceMacros($t, [ - '$title' => DI::l10n()->t('Gnot Settings') , - '$submit' => DI::l10n()->t('Save Settings'), - '$enable' => DI::l10n()->t('Enable this addon?'), - '$enabled' => $gnot_checked, - '$text' => DI::l10n()->t("Allows threading of email comment notifications on Gmail and anonymising the subject line.") + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/gnot/'); + $html = Renderer::replaceMacros($t, [ + '$text' => DI::l10n()->t("Allows threading of email comment notifications on Gmail and anonymising the subject line."), + '$enabled' => ['gnot', DI::l10n()->t('Enable this addon?'), $gnot], ]); + + $data = [ + 'addon' => 'gnot', + 'title' => DI::l10n()->t('Gnot Settings'), + 'html' => $html, + ]; } diff --git a/gnot/lang/C/messages.po b/gnot/lang/C/messages.po index 11b67cfb..8ca06d33 100644 --- a/gnot/lang/C/messages.po +++ b/gnot/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME{{$title}}
- - +{{$text}}
+{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/group_text/group_text.css b/group_text/group_text.css deleted file mode 100644 index 4122b67e..00000000 --- a/group_text/group_text.css +++ /dev/null @@ -1,14 +0,0 @@ - - - -#group_text-enable-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#group_text-checkbox { - float: left; -} - - diff --git a/group_text/group_text.php b/group_text/group_text.php index aa644588..cb2c5eee 100644 --- a/group_text/group_text.php +++ b/group_text/group_text.php @@ -5,8 +5,11 @@ * Version: 1.0 * Author: Thomas Willingham';
- $s .= '
';
+ $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/group_text/');
+ $html = Renderer::replaceMacros($t, [
+ '$enabled' => ['group_text', DI::l10n()->t('Use a text only (non-image) group selector in the "group edit" menu'), $enabled],
+ ]);
+ $data = [
+ 'addon' => 'group_text',
+ 'title' => DI::l10n()->t('Group Text'),
+ 'html' => $html,
+ ];
}
diff --git a/group_text/lang/C/messages.po b/group_text/lang/C/messages.po
index 87b94b86..0b7ce62e 100644
--- a/group_text/lang/C/messages.po
+++ b/group_text/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME ' . DI::l10n()->t('Group Text') . '
'; - $s .= '';
- $s .= '';
- $s .= '';
- $s .= '
';
-
- /* provide a submit button */
-
- $s .= '
' . DI::l10n()->t('IFTTT Mirror') . '
'; - $s .= ''; - $s .= ''; + $data = [ + 'connector' => 'ifttt', + 'title' => DI::l10n()->t('IFTTT Mirror'), + 'image' => 'addon/ifttt/ifttt.png', + 'html' => $html, + 'submit' => DI::l10n()->t('Generate new key'), + ]; } function ifttt_settings_post() { - if (!empty($_POST['ifttt-submit']) && isset($_POST['ifttt-rekey'])) { + if (!empty($_POST['ifttt-submit'])) { DI::pConfig()->delete(local_user(), 'ifttt', 'key'); } } diff --git a/ifttt/lang/C/messages.po b/ifttt/lang/C/messages.po index f8f88f70..077328b0 100644 --- a/ifttt/lang/C/messages.po +++ b/ifttt/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-25 13:17+0000\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME-
+
- {{$l10n.url}} +
- {{$url}} +
- {{$l10n.method}} +
- POST +
- {{$l10n.content_type}} +
- application/x-www-form-urlencoded +
- {{$l10n.new_status_message_body}} +
{{$new_status_message_body}}
+ - {{$l10n.new_photo_upload_body}} +
{{$new_photo_upload_body}}
+ - {{$l10n.new_link_post_body}} +
{{$new_link_post_body}}
+
'. DI::l10n()->t("InsaneJournal Export").'
'; - $s .= ''; - $s .= ''; + $data = [ + 'connector' => 'ijpost', + 'title' => DI::l10n()->t('InsaneJournal Export'), + 'image' => 'images/insanejournal.gif', + 'enabled' => $enabled, + 'html' => $html, + ]; } function ijpost_settings_post(&$a, &$b) diff --git a/ijpost/lang/C/messages.po b/ijpost/lang/C/messages.po index 1abb7870..cfcd7f39 100644 --- a/ijpost/lang/C/messages.po +++ b/ijpost/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME{{$header}}
- - +{{$info}}
+{{include file="field_input.tpl" field=$autochans}} +{{include file="field_input.tpl" field=$sitechats}} diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php index e67d2ff0..72653d55 100644 --- a/js_upload/js_upload.php +++ b/js_upload/js_upload.php @@ -29,8 +29,8 @@ function js_upload_form(App $a, array &$b) { $b['default_upload'] = false; - DI::page()->registerStylesheet('addon/js_upload/file-uploader/client/fileuploader.css'); - DI::page()->registerFooterScript('addon/js_upload/file-uploader/client/fileuploader.js'); + DI::page()->registerStylesheet(__DIR__ . '/file-uploader/client/fileuploader.css'); + DI::page()->registerFooterScript(__DIR__ . '/file-uploader/client/fileuploader.js'); $tpl = Renderer::getMarkupTemplate('js_upload.tpl', 'addon/js_upload'); $b['addon_text'] .= Renderer::replaceMacros($tpl, [ diff --git a/krynn/krynn.css b/krynn/krynn.css deleted file mode 100644 index 466a3ecd..00000000 --- a/krynn/krynn.css +++ /dev/null @@ -1,14 +0,0 @@ - - - -#krynn-enable-label { - float: left; - width: 200px; - margin-bottom: 25px; -} - -#krynn-checkbox { - float: left; -} - - diff --git a/krynn/krynn.php b/krynn/krynn.php index 66cdf573..3cb7206d 100644 --- a/krynn/krynn.php +++ b/krynn/krynn.php @@ -9,8 +9,11 @@ * *"My body was my sacrifice... for my magic. This damage is permanent." - Raistlin Majere */ + +use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\Core\Renderer; use Friendica\DI; function krynn_install() { @@ -111,42 +114,24 @@ function krynn_settings_post($a,$post) { -function krynn_settings(&$a,&$s) { - - if(! local_user()) +function krynn_settings(App &$a, array &$data) +{ + if(! local_user()) { return; - - /* Add our stylesheet to the page so we can make our settings look nice */ - - DI::page()['htmlhead'] .= '' . "\r\n"; - - /* Get the current state of our config variable */ + } $enabled = DI::pConfig()->get(local_user(),'krynn','enable'); - $checked = (($enabled) ? ' checked="checked" ' : ''); - - /* Add some HTML to the existing form */ - - $s .= ''; - $s .= '' . DI::l10n()->t('Krynn') . '
'; - $s .= ''; - $s .= ''; + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/krynn/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['krynn', DI::l10n()->t('Enable Krynn Addon'), $enabled], + ]); + $data = [ + 'addon' => 'krynn', + 'title' => DI::l10n()->t('Krynn Settings'), + 'html' => $html, + ]; } diff --git a/krynn/lang/C/messages.po b/krynn/lang/C/messages.po index 429271bd..266044b1 100644 --- a/krynn/lang/C/messages.po +++ b/krynn/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:14-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME{{$title}}
- - +{{$intro}}
+{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_input.tpl" field=$languages}} +{{include file="field/range_percent.tpl" field=$minconfidence}} +{{include file="field_input.tpl" field=$minlength}} diff --git a/libertree/lang/C/messages.po b/libertree/lang/C/messages.po index 47054070..6feeef8d 100644 --- a/libertree/lang/C/messages.po +++ b/libertree/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME
'. DI::l10n()->t('libertree Export').'
'; - $s .= ''; - $s .= ''; + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/libertree/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['libertree', DI::l10n()->t('Enable Libertree Post Addon'), $enabled], + '$ltree_url' => ['libertree_url', DI::l10n()->t('Libertree site URL'), $ltree_url], + '$ltree_api_token' => ['libertree_api_token', DI::l10n()->t('Libertree API token'), $ltree_api_token], + '$bydefault' => ['ij_bydefault', DI::l10n()->t('Post to Libertree by default'), $def_enabled], + ]); + $data = [ + 'connector' => 'libertree', + 'title' => DI::l10n()->t('Libertree Export'), + 'image' => 'images/libertree.png', + 'enabled' => $enabled, + 'html' => $html, + ]; } diff --git a/libertree/templates/connector_settings.tpl b/libertree/templates/connector_settings.tpl new file mode 100644 index 00000000..63aa52fc --- /dev/null +++ b/libertree/templates/connector_settings.tpl @@ -0,0 +1,4 @@ +{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_input.tpl" field=$ltree_url}} +{{include file="field_input.tpl" field=$ltree_api_token}} +{{include file="field_checkbox.tpl" field=$bydefault}} diff --git a/ljpost/lang/C/messages.po b/ljpost/lang/C/messages.po index 6ee7e27c..7f5417b7 100644 --- a/ljpost/lang/C/messages.po +++ b/ljpost/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME';
- $s .= '
';
+ $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ljpost/');
+ $html = Renderer::replaceMacros($t, [
+ '$enabled' => ['ljpost', DI::l10n()->t('Enable LiveJournal Post Addon'), $enabled],
+ '$username' => ['ij_username', DI::l10n()->t('LiveJournal username'), $ij_username],
+ '$password' => ['ij_password', DI::l10n()->t('LiveJournal password')],
+ '$bydefault' => ['ij_bydefault', DI::l10n()->t('Post to LiveJournal by default'), $def_enabled],
+ ]);
+ $data = [
+ 'connector' => 'ljpost',
+ 'title' => DI::l10n()->t('LiveJournal Export'),
+ 'image' => 'addon/ljpost/livejournal.png',
+ 'enabled' => $enabled,
+ 'html' => $html,
+ ];
}
diff --git a/ljpost/templates/connector_settings.tpl b/ljpost/templates/connector_settings.tpl
new file mode 100644
index 00000000..0abcd24e
--- /dev/null
+++ b/ljpost/templates/connector_settings.tpl
@@ -0,0 +1,4 @@
+{{include file="field_checkbox.tpl" field=$enabled}}
+{{include file="field_input.tpl" field=$username}}
+{{include file="field_password.tpl" field=$password}}
+{{include file="field_checkbox.tpl" field=$bydefault}}
diff --git a/mailstream/lang/C/messages.po b/mailstream/lang/C/messages.po
index 1a5e293c..5115d8cb 100644
--- a/mailstream/lang/C/messages.po
+++ b/mailstream/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2021-11-21 19:15-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME ' . DI::l10n()->t('LiveJournal Post Settings') . '
'; - $s .= '';
- $s .= '';
- $s .= '';
- $s .= '
';
-
- $s .= '';
- $s .= '';
- $s .= '';
- $s .= '
';
-
- $s .= '';
- $s .= '';
- $s .= '';
- $s .= '
';
-
- $s .= '';
- $s .= '';
- $s .= '';
- $s .= '
';
-
- /* provide a submit button */
-
- $s .= '{{$title}}
- - +{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_input.tpl" field=$address}} +{{include file="field_checkbox.tpl" field=$nolikes}} +{{include file="field_checkbox.tpl" field=$attachimg}} diff --git a/markdown/lang/C/messages.po b/markdown/lang/C/messages.po index c8b8219c..33175204 100644 --- a/markdown/lang/C/messages.po +++ b/markdown/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:15-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME{{$title}}
- - +{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/mathjax/lang/C/messages.po b/mathjax/lang/C/messages.po index 96d5e2c3..7063a192 100644 --- a/mathjax/lang/C/messages.po +++ b/mathjax/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:15-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME{{$title}}
- - \ No newline at end of file +{{$description}}
+{{include file="field_checkbox.tpl" field=$mathjax_use}} diff --git a/notimeline/templates/settings.tpl b/notimeline/templates/settings.tpl new file mode 100644 index 00000000..2f3f4ce7 --- /dev/null +++ b/notimeline/templates/settings.tpl @@ -0,0 +1 @@ +{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/nsfw/lang/C/messages.po b/nsfw/lang/C/messages.po index 77297a3a..a44f3e95 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-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:15-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME' . DI::l10n()->t('Content Filter (NSFW and more)') . '
'; - $s .= ''; - $s .= ''; - return; + $data = [ + 'addon' => 'nsfw', + 'title' => DI::l10n()->t('Content Filter (NSFW and more)'), + 'html' => $html, + ]; } function nsfw_addon_settings_post(&$a, &$b) @@ -100,7 +88,7 @@ function nsfw_addon_settings_post(&$a, &$b) } } -function nsfw_prepare_body_content_filter(\Friendica\App $a, &$hook_data) +function nsfw_prepare_body_content_filter(App $a, &$hook_data) { $words = null; if (DI::pConfig()->get(local_user(), 'nsfw', 'disable')) { diff --git a/nsfw/templates/settings.tpl b/nsfw/templates/settings.tpl new file mode 100644 index 00000000..1e3a2cbe --- /dev/null +++ b/nsfw/templates/settings.tpl @@ -0,0 +1,3 @@ +{{$info}}
+{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_textarea.tpl" field=$words}} diff --git a/numfriends/lang/C/messages.po b/numfriends/lang/C/messages.po index 7036f840..40b8146e 100644 --- a/numfriends/lang/C/messages.po +++ b/numfriends/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:15-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME';
- $s .= '
';
+ $data = [
+ 'addon' => 'numfriends',
+ 'title' => DI::l10n()->t('Numfriends Settings'),
+ 'html' => $html,
+ ];
}
diff --git a/numfriends/templates/settings.tpl b/numfriends/templates/settings.tpl
new file mode 100644
index 00000000..c8221bb4
--- /dev/null
+++ b/numfriends/templates/settings.tpl
@@ -0,0 +1 @@
+{{include file="field_input.tpl" field=$numfriends}}
diff --git a/opmlexport/lang/C/messages.po b/opmlexport/lang/C/messages.po
new file mode 100644
index 00000000..fe485540
--- /dev/null
+++ b/opmlexport/lang/C/messages.po
@@ -0,0 +1,26 @@
+# ADDON opmlexport
+# Copyright (C)
+# This file is distributed under the same license as the Friendica opmlexport addon package.
+#
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-21 19:15-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME ' . DI::l10n()->t('Numfriends Settings') . '
'; - $s .= '';
- $s .= '';
- $s .= '';
- $s .= '
';
-
- /* provide a submit button */
-
- $s .= '{{$title}}
- - diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php index ce3b2684..9dfe3c02 100644 --- a/pageheader/pageheader.php +++ b/pageheader/pageheader.php @@ -23,9 +23,7 @@ function pageheader_addon_admin(App &$a, &$s) return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - $stylesheetPath = __DIR__ . '/pageheader.css'; - DI::page()->registerStylesheet($stylesheetPath); + DI::page()->registerStylesheet(__DIR__ . '/pageheader.css'); $words = DI::config()->get('pageheader','text'); if(! $words) @@ -62,8 +60,7 @@ function pageheader_fetch(App $a, &$b) $s = DI::config()->get('pageheader', 'text'); } - $stylesheetPath = __DIR__ .'/pageheader.css'; - DI::page()->registerStylesheet($stylesheetPath); + DI::page()->registerStylesheet(__DIR__ .'/pageheader.css'); if ($s) { $b .= '' . $s . '
';
diff --git a/planets/lang/C/messages.po b/planets/lang/C/messages.po
index f69141db..e09be45a 100644
--- a/planets/lang/C/messages.po
+++ b/planets/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2021-11-21 19:15-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME ' . DI::l10n()->t('Planets') . '
'; - $s .= ''; - $s .= ''; + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/planets/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['planets', DI::l10n()->t('Enable Planets Addon'), $enabled], + ]); + $data = [ + 'addon' => 'planets', + 'title' => DI::l10n()->t('Planets Settings'), + 'html' => $html, + ]; } diff --git a/planets/templates/settings.tpl b/planets/templates/settings.tpl new file mode 100644 index 00000000..2f3f4ce7 --- /dev/null +++ b/planets/templates/settings.tpl @@ -0,0 +1 @@ +{{include file="field_checkbox.tpl" field=$enabled}} diff --git a/pumpio/lang/C/messages.po b/pumpio/lang/C/messages.po index a0d0a55d..baac56e6 100644 --- a/pumpio/lang/C/messages.po +++ b/pumpio/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-25 13:16+0000\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME
'. DI::l10n()->t('Pump.io Import/Export/Mirror').'
'; - $s .= ''; - $s .= ''; + $data = [ + 'connector' => 'pumpio', + 'title' => DI::l10n()->t('Pump.io Import/Export/Mirror'), + 'image' => 'images/pumpio.png', + 'enabled' => $enabled, + 'html' => $html, + 'submit' => $submit, + ]; } function pumpio_settings_post(App $a, array &$b) { - if (!empty($_POST['pumpio-submit'])) { - if (!empty($_POST['pumpio_delete'])) { - DI::pConfig()->set(local_user(), 'pumpio', 'consumer_key' , ''); - DI::pConfig()->set(local_user(), 'pumpio', 'consumer_secret' , ''); - DI::pConfig()->set(local_user(), 'pumpio', 'oauth_token' , ''); - DI::pConfig()->set(local_user(), 'pumpio', 'oauth_token_secret', ''); - DI::pConfig()->set(local_user(), 'pumpio', 'post' , false); - DI::pConfig()->set(local_user(), 'pumpio', 'import' , false); - DI::pConfig()->set(local_user(), 'pumpio', 'host' , ''); - DI::pConfig()->set(local_user(), 'pumpio', 'user' , ''); - DI::pConfig()->set(local_user(), 'pumpio', 'public' , false); - DI::pConfig()->set(local_user(), 'pumpio', 'mirror' , false); - DI::pConfig()->set(local_user(), 'pumpio', 'post_by_default' , false); - DI::pConfig()->set(local_user(), 'pumpio', 'lastdate' , 0); - DI::pConfig()->set(local_user(), 'pumpio', 'last_id' , ''); - } else { - // filtering the username if it is filled wrong - $user = $_POST['pumpio_user']; - if (strstr($user, "@")) { - $pos = strpos($user, "@"); + if (!empty($_POST['pumpio_delete'])) { + DI::pConfig()->set(local_user(), 'pumpio', 'consumer_key' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'consumer_secret' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'oauth_token' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'oauth_token_secret', ''); + DI::pConfig()->set(local_user(), 'pumpio', 'post' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'import' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'host' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'user' , ''); + DI::pConfig()->set(local_user(), 'pumpio', 'public' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'mirror' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'post_by_default' , false); + DI::pConfig()->set(local_user(), 'pumpio', 'lastdate' , 0); + DI::pConfig()->set(local_user(), 'pumpio', 'last_id' , ''); + } elseif (!empty($_POST['pumpio-submit'])) { + // filtering the username if it is filled wrong + $user = $_POST['pumpio_user']; + if (strstr($user, "@")) { + $pos = strpos($user, "@"); - if ($pos > 0) { - $user = substr($user, 0, $pos); - } + if ($pos > 0) { + $user = substr($user, 0, $pos); } + } - // Filtering the hostname if someone is entering it with "http" - $host = $_POST['pumpio_host']; - $host = trim($host); - $host = str_replace(["https://", "http://"], ["", ""], $host); + // Filtering the hostname if someone is entering it with "http" + $host = $_POST['pumpio_host']; + $host = trim($host); + $host = str_replace(["https://", "http://"], ["", ""], $host); - DI::pConfig()->set(local_user(), 'pumpio', 'post' , $_POST['pumpio'] ?? false); - DI::pConfig()->set(local_user(), 'pumpio', 'import' , $_POST['pumpio_import'] ?? false); - DI::pConfig()->set(local_user(), 'pumpio', 'host' , $host); - DI::pConfig()->set(local_user(), 'pumpio', 'user' , $user); - DI::pConfig()->set(local_user(), 'pumpio', 'public' , $_POST['pumpio_public'] ?? false); - DI::pConfig()->set(local_user(), 'pumpio', 'mirror' , $_POST['pumpio_mirror'] ?? false); - DI::pConfig()->set(local_user(), 'pumpio', 'post_by_default', $_POST['pumpio_bydefault'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'post' , $_POST['pumpio'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'import' , $_POST['pumpio_import'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'host' , $host); + DI::pConfig()->set(local_user(), 'pumpio', 'user' , $user); + DI::pConfig()->set(local_user(), 'pumpio', 'public' , $_POST['pumpio_public'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'mirror' , $_POST['pumpio_mirror'] ?? false); + DI::pConfig()->set(local_user(), 'pumpio', 'post_by_default', $_POST['pumpio_bydefault'] ?? false); - if (!empty($_POST['pumpio_mirror'])) { - DI::pConfig()->delete(local_user(), 'pumpio', 'lastdate'); - } + if (!empty($_POST['pumpio_mirror'])) { + DI::pConfig()->delete(local_user(), 'pumpio', 'lastdate'); } } } diff --git a/pumpio/templates/connector_settings.tpl b/pumpio/templates/connector_settings.tpl new file mode 100644 index 00000000..6c688ad4 --- /dev/null +++ b/pumpio/templates/connector_settings.tpl @@ -0,0 +1,13 @@ +{{include file="field_input.tpl" field=$servername}} +{{include file="field_input.tpl" field=$username}} + +{{if $oauth_token && $oauth_token_secret}} + {{include file="field_checkbox.tpl" field=$enabled}} + {{include file="field_checkbox.tpl" field=$bydefault}} + {{include file="field_checkbox.tpl" field=$public}} + {{include file="field_checkbox.tpl" field=$mirror}} +{{elseif $pumpio_host && $pumpio_user}} + +{{/if}} diff --git a/qcomment/lang/C/messages.po b/qcomment/lang/C/messages.po index a76eea1f..2c9ba17a 100644 --- a/qcomment/lang/C/messages.po +++ b/qcomment/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME{{$description}}
+{{include file="field_textarea.tpl" field=$words}} diff --git a/randplace/lang/C/messages.po b/randplace/lang/C/messages.po index 419123e4..e1a95548 100644 --- a/randplace/lang/C/messages.po +++ b/randplace/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME';
- $s .= '
';
+ $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/randplace/');
+ $html = Renderer::replaceMacros($t, [
+ '$enabled' => ['randplace', DI::l10n()->t('Enable Randplace Addon'), $enabled],
+ ]);
+ $data = [
+ 'addon' => 'randplace',
+ 'title' => DI::l10n()->t('Randplace Settings'),
+ 'html' => $html,
+ ];
}
diff --git a/randplace/templates/settings.tpl b/randplace/templates/settings.tpl
new file mode 100644
index 00000000..2f3f4ce7
--- /dev/null
+++ b/randplace/templates/settings.tpl
@@ -0,0 +1 @@
+{{include file="field_checkbox.tpl" field=$enabled}}
diff --git a/securemail/lang/C/messages.po b/securemail/lang/C/messages.po
index 7cb81e20..b985ae83 100644
--- a/securemail/lang/C/messages.po
+++ b/securemail/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2021-11-21 19:16-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME ' . DI::l10n()->t('Randplace Settings') . '
'; - $s .= '';
- $s .= '';
- $s .= '';
- $s .= '
';
-
- /* provide a submit button */
-
- $s .= '{{$title}}
- - diff --git a/securemail/templates/settings.tpl b/securemail/templates/settings.tpl new file mode 100644 index 00000000..110a3a7d --- /dev/null +++ b/securemail/templates/settings.tpl @@ -0,0 +1,2 @@ +{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_textarea.tpl" field=$publickey}} diff --git a/showmore/lang/C/messages.po b/showmore/lang/C/messages.po index 2060eb1a..17b9b17c 100644 --- a/showmore/lang/C/messages.po +++ b/showmore/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME' . DI::l10n()->t('"Show more" Settings').'
'; - $s .= ''; - $s .= ''; - - return; + $data = [ + 'addon' => 'showmore', + 'title' => DI::l10n()->t('"Show more" Settings'), + 'html' => $html, + ]; } function showmore_addon_settings_post(&$a, &$b) @@ -103,7 +93,7 @@ function get_body_length($body) return strlen($string); } -function showmore_prepare_body(\Friendica\App $a, &$hook_data) +function showmore_prepare_body(App $a, &$hook_data) { // No combination with content filters if (!empty($hook_data['filter_reasons'])) { diff --git a/showmore/templates/settings.tpl b/showmore/templates/settings.tpl new file mode 100644 index 00000000..b1887d62 --- /dev/null +++ b/showmore/templates/settings.tpl @@ -0,0 +1,3 @@ +{{$info}}
+{{include file="field_checkbox.tpl" field=$enabled}} +{{include file="field_input.tpl" field=$chars}} diff --git a/showmore_dyn/lang/C/messages.po b/showmore_dyn/lang/C/messages.po index 4bf4c94f..81dec184 100644 --- a/showmore_dyn/lang/C/messages.po +++ b/showmore_dyn/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME{{$header}}
- - +{{include file="field_input.tpl" field=$limitHeight}} diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php index f01a6201..1a1f1d63 100644 --- a/smileybutton/smileybutton.php +++ b/smileybutton/smileybutton.php @@ -97,9 +97,9 @@ function smileybutton_jot_tool(Friendica\App $a, &$b) $s .= ''; //Add css to header - $css_file = 'addon/smileybutton/view/' . $a->getCurrentTheme() . '.css'; + $css_file = __DIR__ . '/view/' . $a->getCurrentTheme() . '.css'; if (!file_exists($css_file)) { - $css_file = 'addon/smileybutton/view/default.css'; + $css_file = __DIR__ . '/view/default.css'; } DI::page()->registerStylesheet($css_file); diff --git a/startpage/lang/C/messages.po b/startpage/lang/C/messages.po index 1636361e..8a011403 100644 --- a/startpage/lang/C/messages.po +++ b/startpage/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME' . DI::l10n()->t('Startpage') . '
'; - $s .= ''; - $s .= ''; + $data = [ + 'addon' => 'startpage', + 'title' => DI::l10n()->t('Startpage'), + 'html' => $html, + ]; } diff --git a/startpage/templates/settings.tpl b/startpage/templates/settings.tpl new file mode 100644 index 00000000..7078a83a --- /dev/null +++ b/startpage/templates/settings.tpl @@ -0,0 +1 @@ +{{include file="field_input.tpl" field=$startpage}} diff --git a/statusnet/lang/C/messages.po b/statusnet/lang/C/messages.po index d5bce141..04d481be 100644 --- a/statusnet/lang/C/messages.po +++ b/statusnet/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-01 18:15+0100\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAMEThe provided API URL is not " "valid." msgstr "" -#: statusnet.php:175 +#: statusnet.php:176 msgid "We could not contact the GNU Social API with the Path you entered." msgstr "" -#: statusnet.php:248 statusnet.php:252 -msgid "GNU Social Import/Export/Mirror" -msgstr "" - -#: statusnet.php:267 -msgid "Globally Available GNU Social OAuthKeys" -msgstr "" - -#: statusnet.php:268 -msgid "" -"There are preconfigured OAuth key pairs for some GNU Social servers " -"available. If you are using one of them, please use these credentials. If " -"not feel free to connect to any other GNU Social instance (see below)." -msgstr "" - -#: statusnet.php:274 statusnet.php:291 statusnet.php:318 statusnet.php:325 -#: statusnet.php:372 statusnet.php:698 +#: statusnet.php:243 statusnet.php:656 msgid "Save Settings" msgstr "" -#: statusnet.php:276 -msgid "Provide your own OAuth Credentials" +#: statusnet.php:255 +#, php-format +msgid "Currently connected to: %s" msgstr "" -#: statusnet.php:277 -msgid "" -"No consumer key pair for GNU Social found. Register your Friendica Account " -"as an desktop client on your GNU Social account, copy the consumer key pair " -"here and enter the API base root.
Before you register your own OAuth " -"key pair ask the administrator if there is already a key pair for this " -"Friendica installation at your favorited GNU Social installation." -msgstr "" - -#: statusnet.php:279 -msgid "OAuth Consumer Key" -msgstr "" - -#: statusnet.php:282 -msgid "OAuth Consumer Secret" -msgstr "" - -#: statusnet.php:285 statusnet.php:678 statusnet.php:690 -msgid "Base API Path (remember the trailing /)" -msgstr "" - -#: statusnet.php:310 -msgid "" -"To connect to your GNU Social account click the button below to get a " -"security code from GNU Social which you have to copy into the input box " -"below and submit the form. Only your public posts will be " -"posted to GNU Social." -msgstr "" - -#: statusnet.php:311 -msgid "Log in with GNU Social" -msgstr "" - -#: statusnet.php:313 -msgid "Copy the security code from GNU Social here" -msgstr "" - -#: statusnet.php:319 -msgid "Cancel Connection Process" -msgstr "" - -#: statusnet.php:321 -msgid "Current GNU Social API is" -msgstr "" - -#: statusnet.php:322 -msgid "Cancel GNU Social Connection" -msgstr "" - -#: statusnet.php:334 -msgid "Currently connected to: " -msgstr "" - -#: statusnet.php:336 -msgid "" -"If enabled all your public postings can be posted to the " -"associated GNU Social account. You can choose to do so by default (here) or " -"for every posting separately in the posting options when writing the entry." -msgstr "" - -#: statusnet.php:338 +#: statusnet.php:260 msgid "" "Note: Due your privacy settings (Hide your profile " "details from unknown viewers?) the link potentially included in public " @@ -123,47 +48,126 @@ msgid "" "informing the visitor that the access to your profile has been restricted." msgstr "" -#: statusnet.php:341 -msgid "Allow posting to GNU Social" -msgstr "" - -#: statusnet.php:344 -msgid "Send public postings to GNU Social by default" -msgstr "" - -#: statusnet.php:348 -msgid "" -"Mirror all posts from GNU Social that are no replies or repeated messages" -msgstr "" - -#: statusnet.php:354 -msgid "Import the remote timeline" -msgstr "" - -#: statusnet.php:358 -msgid "Disabled" -msgstr "" - -#: statusnet.php:359 -msgid "Full Timeline" -msgstr "" - -#: statusnet.php:360 -msgid "Only Mentions" -msgstr "" - -#: statusnet.php:369 +#: statusnet.php:263 msgid "Clear OAuth configuration" msgstr "" -#: statusnet.php:689 +#: statusnet.php:275 +msgid "Cancel GNU Social Connection" +msgstr "" + +#: statusnet.php:283 +msgid "Globally Available GNU Social OAuthKeys" +msgstr "" + +#: statusnet.php:284 +msgid "" +"There are preconfigured OAuth key pairs for some GNU Social servers " +"available. If you are using one of them, please use these credentials. If " +"not feel free to connect to any other GNU Social instance (see below)." +msgstr "" + +#: statusnet.php:285 +msgid "Provide your own OAuth Credentials" +msgstr "" + +#: statusnet.php:286 +msgid "" +"No consumer key pair for GNU Social found. Register your Friendica Account " +"as a desktop application on your GNU Social account, copy the consumer key " +"pair here and enter the API base root.
Before you register your own " +"OAuth key pair ask the administrator if there is already a key pair for this " +"Friendica installation at your favorite GNU Social installation." +msgstr "" + +#: statusnet.php:287 +msgid "" +"To connect to your GNU Social account click the button below to get a " +"security code from GNU Social which you have to copy into the input box " +"below and submit the form. Only your public posts will be " +"posted to GNU Social." +msgstr "" + +#: statusnet.php:288 +msgid "Log in with GNU Social" +msgstr "" + +#: statusnet.php:289 +msgid "Cancel Connection Process" +msgstr "" + +#: statusnet.php:290 +#, php-format +msgid "Current GNU Social API is: %s" +msgstr "" + +#: statusnet.php:307 +msgid "OAuth Consumer Key" +msgstr "" + +#: statusnet.php:308 +msgid "OAuth Consumer Secret" +msgstr "" + +#: statusnet.php:310 statusnet.php:636 statusnet.php:648 +msgid "Base API Path (remember the trailing /)" +msgstr "" + +#: statusnet.php:311 +msgid "Copy the security code from GNU Social here" +msgstr "" + +#: statusnet.php:313 +msgid "Allow posting to GNU Social" +msgstr "" + +#: statusnet.php:313 +msgid "" +"If enabled all your public postings can be posted to the " +"associated GNU Social account. You can choose to do so by default (here) or " +"for every posting separately in the posting options when writing the entry." +msgstr "" + +#: statusnet.php:314 +msgid "Post to GNU Social by default" +msgstr "" + +#: statusnet.php:315 +msgid "Mirror all public posts" +msgstr "" + +#: statusnet.php:316 +msgid "Automatically create contacts" +msgstr "" + +#: statusnet.php:317 +msgid "Import the remote timeline" +msgstr "" + +#: statusnet.php:318 +msgid "Disabled" +msgstr "" + +#: statusnet.php:319 +msgid "Full Timeline" +msgstr "" + +#: statusnet.php:320 +msgid "Only Mentions" +msgstr "" + +#: statusnet.php:326 +msgid "GNU Social Import/Export/Mirror" +msgstr "" + +#: statusnet.php:647 msgid "Site name" msgstr "" -#: statusnet.php:691 +#: statusnet.php:649 msgid "Consumer Secret" msgstr "" -#: statusnet.php:692 +#: statusnet.php:650 msgid "Consumer Key" msgstr "" diff --git a/statusnet/statusnet.css b/statusnet/statusnet.css index f50d9c05..21f4733f 100644 --- a/statusnet/statusnet.css +++ b/statusnet/statusnet.css @@ -10,62 +10,3 @@ height: 52px; vertical-align: middle; } -#statusnet-disconnect-label { - float: left; - width: 250px; - margin-bottom: 25px; -} -#statusnet-disconnect { - float: left; -} - -#statusnet-default-label, -#statusnet-applicationname-label, -#statusnet-sendtaglinks-label, -#statusnet-shortening-label, -#statusnet-mirror-label, -#statusnet-import-label, -#statusnet-create_user-label, -#statusnet-pin-label, -#statusnet-enable-label { - float: left; - width: 250px; - margin-bottom: 5px; -} - -#statusnet-checkbox { - float: left; -} - -#statusnet-pin { - float: left; -} - - -#statusnet-consumerkey-label { - float: left; - width: 250px; - margin-bottom: 8px; -} -#statusnet-consumerkey { - float: left; - margin-bottom: 8px; -} -#statusnet-consumersecret-label { - float: left; - width: 250px; - margin-bottom: 8px; -} -#statusnet-consumersecret { - float: left; - margin-bottom: 8px; -} -#statusnet-baseapi-label { - float: left; - width: 250px; - margin-bottom: 25px; -} -#statusnet-baseapi { - float: left; - margin-bottom: 8px; -} diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 75e44151..b2582b86 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -107,13 +107,13 @@ function statusnet_settings_post(App $a, $post) return; } // don't check GNU Social settings if GNU Social submit button is not clicked - if (empty($_POST['statusnet-submit'])) { + if (empty($_POST['statusnet-submit']) && empty($_POST['statusnet-disconnect'])) { return; } - if (isset($_POST['statusnet-disconnect'])) { + if (!empty($_POST['statusnet-disconnect'])) { /* * * - * if the GNU Social-disconnect checkbox is set, clear the GNU Social configuration + * if the GNU Social-disconnect button is clicked, clear the GNU Social configuration */ DI::pConfig()->delete(local_user(), 'statusnet', 'consumerkey'); DI::pConfig()->delete(local_user(), 'statusnet', 'consumersecret'); @@ -149,7 +149,6 @@ function statusnet_settings_post(App $a, $post) } } } - DI::baseUrl()->redirect('settings/connectors'); } else { if (isset($_POST['statusnet-consumersecret'])) { // check if we can reach the API of the GNU Social server @@ -177,7 +176,6 @@ function statusnet_settings_post(App $a, $post) notice(DI::l10n()->t('We could not contact the GNU Social API with the Path you entered.') . EOL); } } - DI::baseUrl()->redirect('settings/connectors'); } else { if (isset($_POST['statusnet-pin'])) { // if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen @@ -195,7 +193,6 @@ function statusnet_settings_post(App $a, $post) DI::pConfig()->set(local_user(), 'statusnet', 'post', 1); DI::pConfig()->set(local_user(), 'statusnet', 'post_taglinks', 1); // reload the Addon Settings page, if we don't do it see Bug #42 - DI::baseUrl()->redirect('settings/connectors'); } else { // if no PIN is supplied in the POST variables, the user has changed the setting // to post a dent for every new __public__ posting to the wall @@ -213,171 +210,125 @@ function statusnet_settings_post(App $a, $post) } } -function statusnet_settings(App $a, &$s) +function statusnet_settings(App $a, array &$data) { if (!local_user()) { return; } - $user = User::getById(local_user()); + DI::page()->registerStylesheet(__DIR__ . '/statusnet.css', 'all'); - DI::page()['htmlhead'] .= '' . "\r\n"; /* * * * 1) Check that we have a base api url and a consumer key & secret * 2) If no OAuthtoken & stuff is present, generate button to get some * allow the user to cancel the connection process at this step * 3) Checkbox for "Send public notices (respect size limitation) */ - $api = DI::pConfig()->get(local_user(), 'statusnet', 'baseapi'); - $ckey = DI::pConfig()->get(local_user(), 'statusnet', 'consumerkey'); - $csecret = DI::pConfig()->get(local_user(), 'statusnet', 'consumersecret'); - $otoken = DI::pConfig()->get(local_user(), 'statusnet', 'oauthtoken'); - $osecret = DI::pConfig()->get(local_user(), 'statusnet', 'oauthsecret'); - $enabled = DI::pConfig()->get(local_user(), 'statusnet', 'post'); - $checked = (($enabled) ? ' checked="checked" ' : ''); - $defenabled = DI::pConfig()->get(local_user(), 'statusnet', 'post_by_default'); - $defchecked = (($defenabled) ? ' checked="checked" ' : ''); - $mirrorenabled = DI::pConfig()->get(local_user(), 'statusnet', 'mirror_posts'); - $mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : ''); - $import = DI::pConfig()->get(local_user(), 'statusnet', 'import'); - $importselected = ["", "", ""]; - $importselected[$import] = ' selected="selected"'; - //$importenabled = DI::pConfig()->get(local_user(),'statusnet','import'); - //$importchecked = (($importenabled) ? ' checked="checked" ' : ''); - $create_userenabled = DI::pConfig()->get(local_user(), 'statusnet', 'create_user'); - $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : ''); + $baseapi = DI::pConfig()->get(local_user(), 'statusnet', 'baseapi'); + $ckey = DI::pConfig()->get(local_user(), 'statusnet', 'consumerkey'); + $csecret = DI::pConfig()->get(local_user(), 'statusnet', 'consumersecret'); + $otoken = DI::pConfig()->get(local_user(), 'statusnet', 'oauthtoken'); + $osecret = DI::pConfig()->get(local_user(), 'statusnet', 'oauthsecret'); + $enabled = DI::pConfig()->get(local_user(), 'statusnet', 'post', false); + $def_enabled = DI::pConfig()->get(local_user(), 'statusnet', 'post_by_default', false); + $mirror_enabled = DI::pConfig()->get(local_user(), 'statusnet', 'mirror_posts', false); + $createuser_enabled = DI::pConfig()->get(local_user(), 'statusnet', 'create_user', false); + $import = DI::pConfig()->get(local_user(), 'statusnet', 'import'); - $css = (($enabled) ? '' : '-disabled'); + // Radio button list to select existing application credentials + $sites = array_map(function ($site) { + return ['statusnet-preconf-apiurl', $site['sitename'], $site['apiurl']]; + }, DI::config()->get('statusnet', 'sites', [])); - $s .= ''; - $s .= '
' . DI::l10n()->t('GNU Social Import/Export/Mirror') . '
'; - $s .= ''; - $s .= ''; + + + $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/statusnet/'); + $html = Renderer::replaceMacros($t, [ + '$l10n' => [ + 'global_title' => DI::l10n()->t('Globally Available GNU Social OAuthKeys'), + 'global_info' => DI::l10n()->t(DI::l10n()->t('There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below).')), + 'credentials_title' => DI::l10n()->t('Provide your own OAuth Credentials'), + 'credentials_info' => DI::l10n()->t('No consumer key pair for GNU Social found. Register your Friendica Account as a desktop application on your GNU Social account, copy the consumer key pair here and enter the API base root.Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorite GNU Social installation.'), + 'oauth_info' => DI::l10n()->t('To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your public posts will be posted to GNU Social.'), + 'oauth_alt' => DI::l10n()->t('Log in with GNU Social'), + 'oauth_cancel' => DI::l10n()->t('Cancel Connection Process'), + 'oauth_api' => DI::l10n()->t('Current GNU Social API is: %s', $baseapi), + 'connected_account' => $connected_account ?? '', + 'privacy_warning' => $privacy_warning ?? '', + ], + + '$ckey' => $ckey, + '$csecret' => $csecret, + '$otoken' => $otoken, + '$osecret' => $osecret, + '$sites' => $sites, + + '$authorize_url' => $authorize_url ?? '', + '$request_token' => $request_token ?? null, + '$account' => $account ?? null, + + '$authenticate_url' => DI::baseUrl()->get() . '/statusnet/connect', + + '$consumerkey' => ['statusnet-consumerkey', DI::l10n()->t('OAuth Consumer Key'), '', '', false, ' size="35'], + '$consumersecret' => ['statusnet-consumersecret', DI::l10n()->t('OAuth Consumer Secret'), '', '', false, ' size="35'], + + '$baseapi' => ['statusnet-baseapi', DI::l10n()->t('Base API Path (remember the trailing /)'), '', '', false, ' size="35'], + '$pin' => ['statusnet-pin', DI::l10n()->t('Copy the security code from GNU Social here')], + + '$enable' => ['statusnet-enabled', DI::l10n()->t('Allow posting to GNU Social'), $enabled, DI::l10n()->t('If enabled all your public postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.')], + '$default' => ['statusnet-default', DI::l10n()->t('Post to GNU Social by default'), $def_enabled], + '$mirror' => ['statusnet-mirror', DI::l10n()->t('Mirror all public posts'), $mirror_enabled], + '$create_user' => ['statusnet-create_user', DI::l10n()->t('Automatically create contacts'), $createuser_enabled], + '$import' => ['statusnet-import', DI::l10n()->t('Import the remote timeline'), $import, '', [ + 0 => DI::l10n()->t('Disabled'), + 1 => DI::l10n()->t('Full Timeline'), + 2 => DI::l10n()->t('Only Mentions'), + ]], + ]); + + $data = [ + 'connector' => 'statusnet', + 'title' => DI::l10n()->t('GNU Social Import/Export/Mirror'), + 'image' => 'images/gnusocial.png', + 'enabled' => $enabled, + 'html' => $html, + 'submit' => $submit, + ]; } function statusnet_hook_fork(App $a, array &$b) diff --git a/statusnet/templates/connector_settings.tpl b/statusnet/templates/connector_settings.tpl new file mode 100644 index 00000000..b5a497a8 --- /dev/null +++ b/statusnet/templates/connector_settings.tpl @@ -0,0 +1,50 @@ +{{if $ckey && $csecret}} + {{if $otoken && $osecret}} + {{if $account}} +
+ 
+
+ {{/if}}
+ {{include file="field_checkbox.tpl" field=$enable}}
+
+ {{$l10n.connected_account nofilter}}
+ {{$account->description}}
+
{{$l10n.connected_public nofilter}}
+ {{if $l10n.privacy_warning}} +{{$l10n.privacy_warning nofilter}}
+ {{/if}} + + {{include file="field_checkbox.tpl" field=$default}} + {{include file="field_checkbox.tpl" field=$mirror}} + {{include file="field_checkbox.tpl" field=$import}} + {{*include file="field_checkbox.tpl" field=$create_user*}} + {{else}} +{{$l10n.oauth_info}}
+
+
+
+
+ {{include file="field_input.tpl" field=$pin}}
+
+
+ {{$l10n.oauth_api}}
+ {{/if}} +{{else}} + {{if $sites}} +{{$l10n.global_title}}
+{{$l10n.global_info}}
+
+ {{foreach $sites as $site}}
+ {{include file="field_radio.tpl" field=$site}}
+ {{/foreach}}
+
+ {{/if}}
+ {{$l10n.credentials_title}}
+{{$l10n.credentials_info nofilter}}
+
+ {{include file="field_input.tpl" field=$consumerkey}}
+ {{include file="field_input.tpl" field=$consumersecret}}
+ {{include file="field_input.tpl" field=$baseapi}}
+
+{{/if}}
\ No newline at end of file
diff --git a/superblock/lang/C/messages.po b/superblock/lang/C/messages.po
index 50f07868..6c09db62 100644
--- a/superblock/lang/C/messages.po
+++ b/superblock/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2021-11-21 19:16-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME ' . DI::l10n()->t('Superblock') . '
'; - $s .= ''; - $s .= ''; - - return; + $data = [ + 'addon' => 'superblock', + 'title' => DI::l10n()->t('Superblock'), + 'html' => $html, + ]; } function superblock_addon_settings_post(&$a, &$b) diff --git a/superblock/templates/settings.tpl b/superblock/templates/settings.tpl new file mode 100644 index 00000000..113588e3 --- /dev/null +++ b/superblock/templates/settings.tpl @@ -0,0 +1 @@ +{{include file="field_textarea.tpl" field=$urls}} diff --git a/tumblr/lang/C/messages.po b/tumblr/lang/C/messages.po index 22292f37..83434406 100644 --- a/tumblr/lang/C/messages.po +++ b/tumblr/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-25 13:15+0000\n" +"POT-Creation-Date: 2021-11-21 19:17-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME
'. DI::l10n()->t('Tumblr Export').'
'; - $s .= ''; - $s .= ''; + '$authenticate_url' => DI::baseUrl()->get() . '/tumblr/connect', + + '$enable' => ['tumblr', DI::l10n()->t('Enable Tumblr Post Addon'), $enabled], + '$bydefault' => ['tumblr_bydefault', DI::l10n()->t('Post to Tumblr by default'), $def_enabled], + '$page_select' => $page_select ?? '', + ]); + + $data = [ + 'connector' => 'tumblr', + 'title' => DI::l10n()->t('Tumblr Export'), + 'image' => 'images/tumblr.png', + 'enabled' => $enabled, + 'html' => $html, + ]; } function tumblr_settings_post(App $a, array &$b) diff --git a/twitter/lang/C/messages.po b/twitter/lang/C/messages.po index d943b4f1..1154c1c9 100644 --- a/twitter/lang/C/messages.po +++ b/twitter/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-11-23 18:33-0500\n" +"POT-Creation-Date: 2021-11-27 10:25-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME
+{{if $l10n.connected}}
+
+
+
+
+{{include file="field_checkbox.tpl" field=$enable}}
+{{if $l10n.privacy_warning}}
+ {{$l10n.connected nofilter}}
+
+
+ {{$account->description}}
+
{{$l10n.invalid}}
+ +{{/if}} +{{$l10n.privacy_warning nofilter}}
+{{/if}} +{{include file="field_checkbox.tpl" field=$default}} +{{include file="field_checkbox.tpl" field=$mirror}} +{{include file="field_checkbox.tpl" field=$import}} +{{include file="field_checkbox.tpl" field=$create_user}} diff --git a/twitter/twitter.css b/twitter/twitter.css index 99ee0bef..480ce28d 100644 --- a/twitter/twitter.css +++ b/twitter/twitter.css @@ -10,34 +10,3 @@ height: 52px; vertical-align: middle; } -#twitter-disconnect-label { - float: left; - width: 250px; - margin-bottom: 25px; -} - -#twitter-disconnect { - float: left; -} -#twitter-default-label, -#twitter-sendtaglinks-label, -#twitter-enable-label, -#twitter-shortening-label, -#twitter-mirror-label, -#twitter-import-label, -#twitter-create_user-label, -#twitter-pin-label { - float: left; - width: 250px; - margin-bottom: 10px; -} - -#twitter-checkbox { - float: left; -} - -#twitter-pin { - float: left; -} - - diff --git a/twitter/twitter.php b/twitter/twitter.php index e3e664f3..33af5663 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -269,8 +269,6 @@ function twitter_settings_post(App $a) } catch(TwitterOAuthException $e) { notice($e->getMessage()); } - // reload the Addon Settings page, if we don't do it see Bug #42 - DI::baseUrl()->redirect('settings/connectors'); } else { // if no PIN is supplied in the POST variables, the user has changed the setting // to post a tweet for every new __public__ posting to the wall @@ -287,7 +285,7 @@ function twitter_settings_post(App $a) } } -function twitter_settings(App $a, &$s) +function twitter_settings(App $a, array &$data) { if (!local_user()) { return; @@ -295,7 +293,8 @@ function twitter_settings(App $a, &$s) $user = User::getById(local_user()); - DI::page()['htmlhead'] .= '' . "\r\n"; + DI::page()->registerStylesheet(__DIR__ . '/twitter.css', 'all'); + /* * * * 1) Check that we have global consumer key & secret * 2) If no OAuthtoken & stuff is present, generate button to get some @@ -312,21 +311,14 @@ function twitter_settings(App $a, &$s) $importenabled = intval(DI::pConfig()->get(local_user(), 'twitter', 'import')); $create_userenabled = intval(DI::pConfig()->get(local_user(), 'twitter', 'create_user')); - $css = (($enabled) ? '' : '-disabled'); - - $s .= ''; - $s .= '
' . DI::l10n()->t('Twitter Import/Export/Mirror') . '
'; - $s .= ''; - $s .= ''; + + $data = [ + 'connector' => 'twitter', + 'title' => DI::l10n()->t('Twitter Import/Export/Mirror'), + 'enabled' => $enabled, + 'image' => 'images/twitter.png', + 'html' => $html, + 'submit' => $submit ?? null, + ]; } function twitter_hook_fork(App $a, array &$b) diff --git a/windowsphonepush/lang/C/messages.po b/windowsphonepush/lang/C/messages.po index 0e0cf1f2..819735ce 100644 --- a/windowsphonepush/lang/C/messages.po +++ b/windowsphonepush/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-07-25 13:16+0000\n" +"POT-Creation-Date: 2021-11-21 19:16-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME
';
- $s .= '
';
-
- return;
+ $data = [
+ 'addon' => 'windowsphonepush',
+ 'title' => DI::l10n()->t('WindowsPhonePush Settings'),
+ 'html' => $html,
+ ];
}
/* Cron function used to regularly check all users on the server with active windowsphonepushaddon and send
diff --git a/wppost/lang/C/messages.po b/wppost/lang/C/messages.po
index cc3ed548..fea16eee 100644
--- a/wppost/lang/C/messages.po
+++ b/wppost/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
+"POT-Creation-Date: 2021-11-21 19:18-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME ' . DI::l10n()->t('WindowsPhonePush Settings') . '
'; + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/windowsphonepush/'); + $html = Renderer::replaceMacros($t, [ + '$enabled' => ['windowsphonepush', DI::l10n()->t('Enable WindowsPhonePush Addon'), $enabled], + '$senditemtext' => ['windowsphonepush-senditemtext', DI::l10n()->t('Push text of new item'), $senditemtext], + '$device_url' => ['', DI::l10n()->t('Device URL'), $device_url, '', false, ' readonly'], + ]); - $s .= '';
- $s .= '';
- $s .= '';
- $s .= '
';
-
- $s .= '';
- $s .= '';
- $s .= '';
- $s .= '
';
-
- /* provide a submit button - enable und senditemtext can be changed by the user */
- $s .= '';
-
- /* provide further read-only information concerning the addon (useful for */
- $s .= '';
- $s .= '';
- $s .= '';
- $s .= '
