Merge pull request #1210 from MrPetovan/task/10978-settings-keyboard-actionable

[various] Convert connector/addon_settings hook functions to the new data format
This commit is contained in:
Michael Vogel 2021-11-30 06:45:55 +01:00 committed by GitHub
commit d8c393b57a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
147 changed files with 1747 additions and 2690 deletions

View File

@ -159,19 +159,17 @@ function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data)
} }
function advancedcontentfilter_addon_settings(App $a, &$s) function advancedcontentfilter_addon_settings(App $a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
} }
$advancedcontentfilter = DI::l10n()->t('Advanced Content Filter'); $data = [
'addon' => 'advancedcontentfilter',
$s .= <<<HTML 'title' => DI::l10n()->t('Advanced Content Filter'),
<span class="settings-block fakelink" style="display: block;"><h3><a href="advancedcontentfilter">$advancedcontentfilter <i class="glyphicon glyphicon-share"></i></a></h3></span> 'href' => 'advancedcontentfilter',
HTML; ];
return;
} }
/* /*

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-25 13:15+0000\n" "POT-Creation-Date: 2021-11-21 19:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,28 +17,28 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: advancedcontentfilter.php:153 #: advancedcontentfilter.php:154
#, php-format #, php-format
msgid "Filtered by rule: %s" msgid "Filtered by rule: %s"
msgstr "" msgstr ""
#: advancedcontentfilter.php:167 advancedcontentfilter.php:224 #: advancedcontentfilter.php:170 advancedcontentfilter.php:225
msgid "Advanced Content Filter" msgid "Advanced Content Filter"
msgstr "" msgstr ""
#: advancedcontentfilter.php:223 #: advancedcontentfilter.php:224
msgid "Back to Addon Settings" msgid "Back to Addon Settings"
msgstr "" msgstr ""
#: advancedcontentfilter.php:225 #: advancedcontentfilter.php:226
msgid "Add a Rule" msgid "Add a Rule"
msgstr "" msgstr ""
#: advancedcontentfilter.php:226 #: advancedcontentfilter.php:227
msgid "Help" msgid "Help"
msgstr "" msgstr ""
#: advancedcontentfilter.php:227 #: advancedcontentfilter.php:228
msgid "" msgid ""
"Add and manage your personal content filter rules in this screen. Rules have " "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. " "a name and an arbitrary expression that will be matched against post data. "
@ -46,108 +46,108 @@ msgid ""
"the help page." "the help page."
msgstr "" msgstr ""
#: advancedcontentfilter.php:228 #: advancedcontentfilter.php:229
msgid "Your rules" msgid "Your rules"
msgstr "" msgstr ""
#: advancedcontentfilter.php:229 #: advancedcontentfilter.php:230
msgid "" msgid ""
"You have no rules yet! Start adding one by clicking on the button above next " "You have no rules yet! Start adding one by clicking on the button above next "
"to the title." "to the title."
msgstr "" msgstr ""
#: advancedcontentfilter.php:230 #: advancedcontentfilter.php:231
msgid "Disabled" msgid "Disabled"
msgstr "" msgstr ""
#: advancedcontentfilter.php:231 #: advancedcontentfilter.php:232
msgid "Enabled" msgid "Enabled"
msgstr "" msgstr ""
#: advancedcontentfilter.php:232 #: advancedcontentfilter.php:233
msgid "Disable this rule" msgid "Disable this rule"
msgstr "" msgstr ""
#: advancedcontentfilter.php:233 #: advancedcontentfilter.php:234
msgid "Enable this rule" msgid "Enable this rule"
msgstr "" msgstr ""
#: advancedcontentfilter.php:234 #: advancedcontentfilter.php:235
msgid "Edit this rule" msgid "Edit this rule"
msgstr "" msgstr ""
#: advancedcontentfilter.php:235 #: advancedcontentfilter.php:236
msgid "Edit the rule" msgid "Edit the rule"
msgstr "" msgstr ""
#: advancedcontentfilter.php:236 #: advancedcontentfilter.php:237
msgid "Save this rule" msgid "Save this rule"
msgstr "" msgstr ""
#: advancedcontentfilter.php:237 #: advancedcontentfilter.php:238
msgid "Delete this rule" msgid "Delete this rule"
msgstr "" msgstr ""
#: advancedcontentfilter.php:238 #: advancedcontentfilter.php:239
msgid "Rule" msgid "Rule"
msgstr "" msgstr ""
#: advancedcontentfilter.php:239 #: advancedcontentfilter.php:240
msgid "Close" msgid "Close"
msgstr "" msgstr ""
#: advancedcontentfilter.php:240 #: advancedcontentfilter.php:241
msgid "Add new rule" msgid "Add new rule"
msgstr "" msgstr ""
#: advancedcontentfilter.php:241 #: advancedcontentfilter.php:242
msgid "Rule Name" msgid "Rule Name"
msgstr "" msgstr ""
#: advancedcontentfilter.php:242 #: advancedcontentfilter.php:243
msgid "Rule Expression" msgid "Rule Expression"
msgstr "" msgstr ""
#: advancedcontentfilter.php:243 #: advancedcontentfilter.php:244
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: advancedcontentfilter.php:310 advancedcontentfilter.php:321 #: advancedcontentfilter.php:312 advancedcontentfilter.php:323
#: advancedcontentfilter.php:332 advancedcontentfilter.php:366 #: advancedcontentfilter.php:334 advancedcontentfilter.php:370
#: advancedcontentfilter.php:395 advancedcontentfilter.php:416 #: advancedcontentfilter.php:401 advancedcontentfilter.php:424
msgid "You must be logged in to use this method" msgid "You must be logged in to use this method"
msgstr "" msgstr ""
#: advancedcontentfilter.php:336 advancedcontentfilter.php:370 #: advancedcontentfilter.php:338 advancedcontentfilter.php:374
#: advancedcontentfilter.php:399 #: advancedcontentfilter.php:405
msgid "Invalid form security token, please refresh the page." msgid "Invalid form security token, please refresh the page."
msgstr "" msgstr ""
#: advancedcontentfilter.php:348 #: advancedcontentfilter.php:350
msgid "The rule name and expression are required." msgid "The rule name and expression are required."
msgstr "" msgstr ""
#: advancedcontentfilter.php:360 #: advancedcontentfilter.php:364
msgid "Rule successfully added" msgid "Rule successfully added"
msgstr "" msgstr ""
#: advancedcontentfilter.php:374 advancedcontentfilter.php:403 #: advancedcontentfilter.php:378 advancedcontentfilter.php:409
msgid "Rule doesn't exist or doesn't belong to you." msgid "Rule doesn't exist or doesn't belong to you."
msgstr "" msgstr ""
#: advancedcontentfilter.php:389 #: advancedcontentfilter.php:395
msgid "Rule successfully updated" msgid "Rule successfully updated"
msgstr "" msgstr ""
#: advancedcontentfilter.php:410 #: advancedcontentfilter.php:418
msgid "Rule successfully deleted" msgid "Rule successfully deleted"
msgstr "" msgstr ""
#: advancedcontentfilter.php:420 #: advancedcontentfilter.php:428
msgid "Missing argument: guid." msgid "Missing argument: guid."
msgstr "" msgstr ""
#: advancedcontentfilter.php:428 #: advancedcontentfilter.php:436
#, php-format #, php-format
msgid "Unknown post with guid: %s" msgid "Unknown post with guid: %s"
msgstr "" msgstr ""

View File

@ -24,9 +24,9 @@ define("BIRDAVATAR_SIZE", 256);
*/ */
function birdavatar_install() function birdavatar_install()
{ {
Hook::register('avatar_lookup', 'addon/birdavatar/birdavatar.php', 'birdavatar_lookup'); Hook::register('avatar_lookup', __FILE__, 'birdavatar_lookup');
Hook::register('addon_settings', 'addon/birdavatar/birdavatar.php', 'birdavatar_addon_settings'); Hook::register('addon_settings', __FILE__, 'birdavatar_addon_settings');
Hook::register('addon_settings_post', 'addon/birdavatar/birdavatar.php', 'birdavatar_addon_settings_post'); Hook::register('addon_settings_post', __FILE__, 'birdavatar_addon_settings_post');
Logger::log('registered birdavatar'); Logger::log('registered birdavatar');
} }
@ -34,24 +34,29 @@ function birdavatar_install()
/** /**
* Bird avatar user settings page * Bird avatar user settings page
*/ */
function birdavatar_addon_settings(App $a, &$s) function birdavatar_addon_settings(App $a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
} }
$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/birdavatar/'); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/birdavatar/');
$s .= Renderer::replaceMacros($t, [ $html = Renderer::replaceMacros($t, [
'$postpost' => !empty($_POST['birdavatar-morebird']) || !empty($_POST['birdavatar-emailbird']),
'$uncache' => time(), '$uncache' => time(),
'$uid' => local_user(), '$uid' => local_user(),
'$usebird' => DI::l10n()->t('Use Bird as Avatar'),
'$morebird' => DI::l10n()->t('More Random Bird!'),
'$emailbird' => DI::l10n()->t('Reset to email Bird'),
'$seed' => DI::pConfig()->get(local_user(), 'birdavatar', 'seed', false),
'$header' => DI::l10n()->t('Bird Avatar Settings'),
'$setrandomize' => DI::l10n()->t('Set default profile avatar or randomize the bird.'), '$setrandomize' => DI::l10n()->t('Set default profile avatar or randomize the bird.'),
]); ]);
$data = [
'addon' => 'birdavar',
'title' => DI::l10n()->t('Bird Avatar Settings'),
'html' => $html,
'submit' => [
'birdavatar-usebird' => DI::l10n()->t('Use Bird as Avatar'),
'birdavatar-morebird' => DI::l10n()->t('More Random Bird!'),
'birdavatar-emailbird' => DI::pConfig()->get(local_user(), 'birdavatar', 'seed', false) ? DI::l10n()->t('Reset to email Bird') : null,
],
];
} }
/** /**

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-24 12:04+0100\n" "POT-Creation-Date: 2021-11-24 08:50-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,38 +17,38 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: birdavatar.php:49 #: birdavatar.php:47
msgid "Use Bird as Avatar"
msgstr ""
#: birdavatar.php:50
msgid "More Random Bird!"
msgstr ""
#: birdavatar.php:51
msgid "Reset to email Bird"
msgstr ""
#: birdavatar.php:53
msgid "Bird Avatar Settings"
msgstr ""
#: birdavatar.php:54
msgid "Set default profile avatar or randomize the bird." msgid "Set default profile avatar or randomize the bird."
msgstr "" msgstr ""
#: birdavatar.php:72 #: birdavatar.php:52
msgid "Bird Avatar Settings"
msgstr ""
#: birdavatar.php:55
msgid "Use Bird as Avatar"
msgstr ""
#: birdavatar.php:56
msgid "More Random Bird!"
msgstr ""
#: birdavatar.php:57
msgid "Reset to email Bird"
msgstr ""
#: birdavatar.php:76
msgid "The bird has not found itself." msgid "The bird has not found itself."
msgstr "" msgstr ""
#: birdavatar.php:81 #: birdavatar.php:85
msgid "There was an error, the bird flew away." msgid "There was an error, the bird flew away."
msgstr "" msgstr ""
#: birdavatar.php:87 #: birdavatar.php:91
msgid "Profile Photos" msgid "Profile Photos"
msgstr "" msgstr ""
#: birdavatar.php:97 #: birdavatar.php:101
msgid "Meow!" msgid "Meow!"
msgstr "" msgstr ""

View File

@ -1,24 +1,2 @@
<span id="settings_birdavatar_inflated" class="settings-block fakelink" <p>{{$setrandomize}}</p>
style="{{if $postpost}}display: none;{{else}}display: block;{{/if}}" <p><img src="{{$basepath}}/birdavatar/{{$uid}}?{{$uncache}}"></p>
onclick="openClose('settings_birdavatar_expanded'); openClose('settings_birdavatar_inflated');">
<h3>{{$header}}</h3>
</span>
<div id="settings_birdavatar_expanded" class="settings-block"
style="{{if $postpost}}display: block;{{else}}display: none;{{/if}}">
<span class="fakelink" onclick="openClose('settings_birdavatar_expanded'); openClose('settings_birdavatar_inflated');">
<h3>{{$header}}</h3>
</span>
<img src="{{$basepath}}/birdavatar/{{$uid}}?{{$uncache}}">
<p>{{$setrandomize}}</p>
<div class="settings-submit-wrapper" >
<button type="submit" name="birdavatar-usebird"
class="btn btn-primary settings-submit" value="{{$usebird}}">{{$usebird}}</button>
<div class="btn-group" role="group" aria-label="...">
<button type="submit" name="birdavatar-morebird"
class="btn btn-default settings-submit" value="{{$morebird}}">{{$morebird}}</button>
<button type="submit" name="birdavatar-emailbird" {{if !$seed}}disabled{{/if}}
class="btn btn-default settings-submit" value="{{$emailbird}}">{{$emailbird}}</button>
</div>
</div>
</div>

View File

@ -1,18 +0,0 @@
#blockem-label {
float: left;
width: 300px;
margin-top: 10px;
}
#blockem-words {
float: left;
margin-top: 10px;
width: 400px;
height: 150px;
}
#blockem-submit {
margin-top: 15px;
}

View File

@ -9,6 +9,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Util\Strings; use Friendica\Util\Strings;
@ -25,39 +26,25 @@ function blockem_install()
Hook::register('enotify_store' , 'addon/blockem/blockem.php', 'blockem_enotify_store'); Hook::register('enotify_store' , 'addon/blockem/blockem.php', 'blockem_enotify_store');
} }
function blockem_addon_settings (App $a, &$s) function blockem_addon_settings(App $a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
} }
/* Add our stylesheet to the page so we can make our settings look nice */ $words = DI::pConfig()->get(local_user(), 'blockem', 'words', '');
DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/blockem/blockem.css' . '" media="all" />' . "\r\n";
$words = DI::pConfig()->get(local_user(), 'blockem', 'words'); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/blockem/');
$html = Renderer::replaceMacros($t, [
if (!$words) { '$info' => DI::l10n()->t("Hides user's content by collapsing posts. Also replaces their avatar with generic image."),
$words = ''; '$words' => ['blockem-words', DI::l10n()->t('Comma separated profile URLS:'), $words],
} ]);
$s .= '<span id="settings_blockem_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">';
$s .= '<h3>' . DI::l10n()->t('Blockem') . '</h3>';
$s .= '</span>';
$s .= '<div id="settings_blockem_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">';
$s .= '<h3>' . DI::l10n()->t('Blockem') . '</h3>';
$s .= '</span>';
$s .= '<div id="blockem-wrapper">';
$s .= '<div id="blockem-desc">'. DI::l10n()->t("Hides user's content by collapsing posts. Also replaces their avatar with generic image.") . ' </div>';
$s .= '<label id="blockem-label" for="blockem-words">' . DI::l10n()->t('Comma separated profile URLS:') . ' </label>';
$s .= '<textarea id="blockem-words" type="text" name="blockem-words" >' . htmlspecialchars($words) . '</textarea>';
$s .= '</div><div class="clear"></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="blockem-submit" name="blockem-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
return;
$data = [
'addon' => 'blockem',
'title' => DI::l10n()->t('Blockem'),
'html' => $html,
];
} }
function blockem_addon_settings_post(App $a, array &$b) function blockem_addon_settings_post(App $a, array &$b)

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,33 +17,29 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: blockem.php:42 blockem.php:46 #: blockem.php:39
msgid "Blockem"
msgstr ""
#: blockem.php:50
msgid "" msgid ""
"Hides user's content by collapsing posts. Also replaces their avatar with " "Hides user's content by collapsing posts. Also replaces their avatar with "
"generic image." "generic image."
msgstr "" msgstr ""
#: blockem.php:51 #: blockem.php:40
msgid "Comma separated profile URLS:" msgid "Comma separated profile URLS:"
msgstr "" msgstr ""
#: blockem.php:55 #: blockem.php:45
msgid "Save Settings" msgid "Blockem"
msgstr "" msgstr ""
#: blockem.php:131 #: blockem.php:120
#, php-format #, php-format
msgid "Filtered user: %s" msgid "Filtered user: %s"
msgstr "" msgstr ""
#: blockem.php:190 #: blockem.php:183
msgid "Unblock Author" msgid "Unblock Author"
msgstr "" msgstr ""
#: blockem.php:192 #: blockem.php:185
msgid "Block Author" msgid "Block Author"
msgstr "" msgstr ""

View File

@ -0,0 +1 @@
{{include file="field_textarea.tpl" field=$words}}

View File

@ -25,9 +25,9 @@ define("CATAVATAR_SIZE", 256);
*/ */
function catavatar_install() function catavatar_install()
{ {
Hook::register('avatar_lookup', 'addon/catavatar/catavatar.php', 'catavatar_lookup'); Hook::register('avatar_lookup', __FILE__, 'catavatar_lookup');
Hook::register('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings'); Hook::register('addon_settings', __FILE__, 'catavatar_addon_settings');
Hook::register('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post'); Hook::register('addon_settings_post', __FILE__, 'catavatar_addon_settings_post');
Logger::notice('registered catavatar'); Logger::notice('registered catavatar');
} }
@ -35,24 +35,29 @@ function catavatar_install()
/** /**
* Cat avatar user settings page * Cat avatar user settings page
*/ */
function catavatar_addon_settings(App $a, &$s) function catavatar_addon_settings(App $a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
} }
$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/catavatar/'); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/catavatar/');
$s .= Renderer::replaceMacros($t, [ $html = Renderer::replaceMacros($t, [
'$postpost' => !empty($_POST['catavatar-morecat']) || !empty($_POST['catavatar-emailcat']),
'$uncache' => time(), '$uncache' => time(),
'$uid' => local_user(), '$uid' => local_user(),
'$usecat' => DI::l10n()->t('Use Cat as Avatar'),
'$morecat' => DI::l10n()->t('More Random Cat!'),
'$emailcat' => DI::l10n()->t('Reset to email Cat'),
'$seed' => DI::pConfig()->get(local_user(), 'catavatar', 'seed', false),
'$header' => DI::l10n()->t('Cat Avatar Settings'),
'$setrandomize' => DI::l10n()->t('Set default profile avatar or randomize the cat.'), '$setrandomize' => DI::l10n()->t('Set default profile avatar or randomize the cat.'),
]); ]);
$data = [
'addon' => 'catavar',
'title' => DI::l10n()->t('Cat Avatar Settings'),
'html' => $html,
'submit' => [
'catavatar-usecat' => DI::l10n()->t('Use Cat as Avatar'),
'catavatar-morecat' => DI::l10n()->t('Another random Cat!'),
'catavatar-emailcat' => DI::pConfig()->get(local_user(), 'catavatar', 'seed', false) ? DI::l10n()->t('Reset to email Cat') : null,
],
];
} }
/** /**

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-07-25 13:16+0000\n" "POT-Creation-Date: 2021-11-21 19:14-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,38 +17,38 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: catavatar.php:49 #: catavatar.php:48
msgid "Use Cat as Avatar" msgid "Set default profile avatar or randomize the cat."
msgstr ""
#: catavatar.php:50
msgid "More Random Cat!"
msgstr ""
#: catavatar.php:51
msgid "Reset to email Cat"
msgstr "" msgstr ""
#: catavatar.php:53 #: catavatar.php:53
msgid "Cat Avatar Settings" msgid "Cat Avatar Settings"
msgstr "" msgstr ""
#: catavatar.php:54 #: catavatar.php:56
msgid "Set default profile avatar or randomize the cat." msgid "Use Cat as Avatar"
msgstr "" msgstr ""
#: catavatar.php:72 #: catavatar.php:57
msgid "Another random Cat!"
msgstr ""
#: catavatar.php:58
msgid "Reset to email Cat"
msgstr ""
#: catavatar.php:77
msgid "The cat hadn't found itself." msgid "The cat hadn't found itself."
msgstr "" msgstr ""
#: catavatar.php:81 #: catavatar.php:86
msgid "There was an error, the cat ran away." msgid "There was an error, the cat ran away."
msgstr "" msgstr ""
#: catavatar.php:87 #: catavatar.php:92
msgid "Profile Photos" msgid "Profile Photos"
msgstr "" msgstr ""
#: catavatar.php:97 #: catavatar.php:102
msgid "Meow!" msgid "Meow!"
msgstr "" msgstr ""

View File

@ -1,24 +1,2 @@
<span id="settings_catavatar_inflated" class="settings-block fakelink" <p>{{$setrandomize}}</p>
style="{{if $postpost}}display: none;{{else}}display: block;{{/if}}" <p><img src="{{$basepath}}/catavatar/{{$uid}}?{{$uncache}}"></p>
onclick="openClose('settings_catavatar_expanded'); openClose('settings_catavatar_inflated');">
<h3>{{$header}}</h3>
</span>
<div id="settings_catavatar_expanded" class="settings-block"
style="{{if $postpost}}display: block;{{else}}display: none;{{/if}}">
<span class="fakelink" onclick="openClose('settings_catavatar_expanded'); openClose('settings_catavatar_inflated');">
<h3>{{$header}}</h3>
</span>
<img src="{{$basepath}}/catavatar/{{$uid}}?{{$uncache}}">
<p>{{$setrandomize}}</p>
<div class="settings-submit-wrapper" >
<button type="submit" name="catavatar-usecat"
class="btn btn-primary settings-submit" value="{{$usecat}}">{{$usecat}}</button>
<div class="btn-group" role="group" aria-label="...">
<button type="submit" name="catavatar-morecat"
class="btn btn-default settings-submit" value="{{$morecat}}">{{$morecat}}</button>
<button type="submit" name="catavatar-emailcat" {{if !$seed}}disabled{{/if}}
class="btn btn-default settings-submit" value="{{$emailcat}}">{{$emailcat}}</button>
</div>
</div>
</div>

View File

@ -85,11 +85,8 @@ function cookienotice_addon_admin_post(App $a)
*/ */
function cookienotice_page_content_top(App $a, &$b) function cookienotice_page_content_top(App $a, &$b)
{ {
$stylesheetPath = __DIR__ . '/cookienotice.css'; DI::page()->registerStylesheet(__DIR__ . '/cookienotice.css');
$footerscriptPath = __DIR__ . '/cookienotice.js'; DI::page()->registerFooterScript(__DIR__ . '/cookienotice.js');
DI::page()->registerStylesheet($stylesheetPath);
DI::page()->registerFooterScript($footerscriptPath);
} }
/** /**

View File

@ -164,40 +164,38 @@ function curweather_addon_settings_post(App $a, $post)
DI::pConfig()->set(local_user(), 'curweather', 'curweather_units' , trim($_POST['curweather_units'])); DI::pConfig()->set(local_user(), 'curweather', 'curweather_units' , trim($_POST['curweather_units']));
} }
function curweather_addon_settings(App $a, &$s) function curweather_addon_settings(App $a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
} }
/* Get the current state of our config variable */
$curweather_loc = DI::pConfig()->get(local_user(), 'curweather', 'curweather_loc'); $curweather_loc = DI::pConfig()->get(local_user(), 'curweather', 'curweather_loc');
$curweather_units = DI::pConfig()->get(local_user(), 'curweather', 'curweather_units'); $curweather_units = DI::pConfig()->get(local_user(), 'curweather', 'curweather_units');
$appid = DI::config()->get('curweather', 'appid'); $appid = DI::config()->get('curweather', 'appid');
if ($appid == "") { if ($appid == '') {
$noappidtext = DI::l10n()->t('No APPID found, please contact your admin to obtain one.'); $noappidtext = DI::l10n()->t('No APPID found, please contact your admin to obtain one.');
} else { } else {
$noappidtext = ''; $noappidtext = '';
} }
$enable = intval(DI::pConfig()->get(local_user(), 'curweather', 'curweather_enable')); $enabled = intval(DI::pConfig()->get(local_user(), 'curweather', 'curweather_enable'));
$enable_checked = (($enable) ? ' checked="checked" ' : '');
// load template and replace the macros $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/curweather/');
$t = Renderer::getMarkupTemplate("settings.tpl", "addon/curweather/" ); $html = Renderer::replaceMacros($t, [
$s = Renderer::replaceMacros($t, [
'$submit' => DI::l10n()->t('Save Settings'),
'$header' => DI::l10n()->t('Current Weather').' '.DI::l10n()->t('Settings'),
'$noappidtext' => $noappidtext, '$noappidtext' => $noappidtext,
'$info' => DI::l10n()->t('Enter either the name of your location or the zip code.'), '$info' => DI::l10n()->t('Enter either the name of your location or the zip code.'),
'$curweather_loc' => [ 'curweather_loc', DI::l10n()->t('Your Location'), $curweather_loc, DI::l10n()->t('Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.') ], '$curweather_loc' => ['curweather_loc', DI::l10n()->t('Your Location'), $curweather_loc, DI::l10n()->t('Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.')],
'$curweather_units' => [ 'curweather_units', DI::l10n()->t('Units'), $curweather_units, DI::l10n()->t('select if the temperature should be displayed in &deg;C or &deg;F'), ['metric'=>'°C', 'imperial'=>'°F']], '$curweather_units' => ['curweather_units', DI::l10n()->t('Units'), $curweather_units, DI::l10n()->t('select if the temperature should be displayed in &deg;C or &deg;F'), ['metric' => '°C', 'imperial' => '°F']],
'$enabled' => [ 'curweather_enable', DI::l10n()->t('Show weather data'), $enable, ''] '$enabled' => ['curweather_enable', DI::l10n()->t('Show weather data'), $enabled, ''],
]); ]);
return; $data = [
'addon' => 'curweather',
'title' => DI::l10n()->t('Current Weather Settings'),
'html' => $html,
];
} }
// Config stuff for the admin panel to let the admin of the node set a APPID // Config stuff for the admin panel to let the admin of the node set a APPID

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -21,7 +21,7 @@ msgstr ""
msgid "Error fetching weather data. Error was: " msgid "Error fetching weather data. Error was: "
msgstr "" msgstr ""
#: curweather.php:130 curweather.php:192 #: curweather.php:130
msgid "Current Weather" msgid "Current Weather"
msgstr "" msgstr ""
@ -57,66 +57,66 @@ msgstr ""
msgid "at OpenWeatherMap" msgid "at OpenWeatherMap"
msgstr "" msgstr ""
#: curweather.php:179 #: curweather.php:178
msgid "No APPID found, please contact your admin to obtain one." msgid "No APPID found, please contact your admin to obtain one."
msgstr "" msgstr ""
#: curweather.php:191 curweather.php:229 #: curweather.php:188
msgid "Save Settings"
msgstr ""
#: curweather.php:192
msgid "Settings"
msgstr ""
#: curweather.php:194
msgid "Enter either the name of your location or the zip code." msgid "Enter either the name of your location or the zip code."
msgstr "" msgstr ""
#: curweather.php:195 #: curweather.php:189
msgid "Your Location" msgid "Your Location"
msgstr "" msgstr ""
#: curweather.php:195 #: curweather.php:189
msgid "" msgid ""
"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or " "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
"<em>14476,DE</em>." "<em>14476,DE</em>."
msgstr "" msgstr ""
#: curweather.php:196 #: curweather.php:190
msgid "Units" msgid "Units"
msgstr "" msgstr ""
#: curweather.php:196 #: curweather.php:190
msgid "select if the temperature should be displayed in &deg;C or &deg;F" msgid "select if the temperature should be displayed in &deg;C or &deg;F"
msgstr "" msgstr ""
#: curweather.php:197 #: curweather.php:191
msgid "Show weather data" msgid "Show weather data"
msgstr "" msgstr ""
#: curweather.php:232 #: curweather.php:196
msgid "Current Weather Settings"
msgstr ""
#: curweather.php:227
msgid "Save Settings"
msgstr ""
#: curweather.php:230
msgid "Caching Interval" msgid "Caching Interval"
msgstr "" msgstr ""
#: curweather.php:234 #: curweather.php:232
msgid "" msgid ""
"For how long should the weather data be cached? Choose according your " "For how long should the weather data be cached? Choose according your "
"OpenWeatherMap account type." "OpenWeatherMap account type."
msgstr "" msgstr ""
#: curweather.php:235 #: curweather.php:233
msgid "no cache" msgid "no cache"
msgstr "" msgstr ""
#: curweather.php:236 curweather.php:237 curweather.php:238 curweather.php:239 #: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
msgid "minutes" msgid "minutes"
msgstr "" msgstr ""
#: curweather.php:242 #: curweather.php:240
msgid "Your APPID" msgid "Your APPID"
msgstr "" msgstr ""
#: curweather.php:242 #: curweather.php:240
msgid "Your API key provided by OpenWeatherMap" msgid "Your API key provided by OpenWeatherMap"
msgstr "" msgstr ""

View File

@ -1,15 +1,6 @@
<span id="settings_curweather_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_curweather_expanded'); openClose('settings_curweather_inflated');"> {{if $noappidtext}}
<h3>{{$header}}</h3> <p style="color: red; font-weight: bold;">{{$noappidtext}}</p>
</span> {{/if}}
<div id="settings_curweather_expanded" class="settings-block" style="display: none;"> {{include file="field_input.tpl" field=$curweather_loc}}
<span class="fakelink" onclick="openClose('settings_curweather_expanded'); openClose('settings_curweather_inflated');"> {{include file="field_select.tpl" field=$curweather_units}}
<h3>{{$header}}</h3> {{include file="field_checkbox.tpl" field=$enabled}}
</span>
<div style="color: red; font-weight: bold;">{{$noappidtext}}</div>
{{include file="field_input.tpl" field=$curweather_loc}}
{{include file="field_select.tpl" field=$curweather_units}}
{{include file="field_checkbox.tpl" field=$enabled}}
<div class="settings-submit-wrapper" >
<input type="submit" id="curweather-settings-submit" name="curweather-settings-submit" class="settings-submit" value="{{$submit}}" />
</div>
</div>

View File

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

View File

@ -48,20 +48,18 @@ 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; 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'); $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 = ''; $error = '';
@ -93,23 +91,30 @@ function diaspora_settings(App $a, &$s)
} }
} }
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, '$info' => $info,
'$error' => $error, '$error' => $error,
'$enabled' => $enabled,
'$enabled_checkbox' => ['enabled', DI::l10n()->t('Enable Diaspora Post Addon'), $enabled], '$enabled' => ['enabled', DI::l10n()->t('Enable Diaspora Post Addon'), $enabled],
'$handle' => ['handle', DI::l10n()->t('Diaspora handle'), $handle, null, null, 'placeholder="user@domain.tld"'], '$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.')], '$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, '$aspect_select' => $aspect_select,
'$post_by_default' => ['post_by_default', DI::l10n()->t('Post to Diaspora by default'), $def_enabled], '$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,
];
} }

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,88 +17,84 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: diaspora.php:43 #: diaspora.php:44
msgid "Post to Diaspora" msgid "Post to Diaspora"
msgstr "" msgstr ""
#: diaspora.php:68 #: diaspora.php:67
#, php-format #, php-format
msgid "" msgid ""
"Please remember: You can always be reached from Diaspora with your Friendica " "Please remember: You can always be reached from Diaspora with your Friendica "
"handle <strong>%s</strong>. " "handle <strong>%s</strong>. "
msgstr "" msgstr ""
#: diaspora.php:69 #: diaspora.php:68
msgid "" msgid ""
"This connector is only meant if you still want to use your old Diaspora " "This connector is only meant if you still want to use your old Diaspora "
"account for some time. " "account for some time. "
msgstr "" msgstr ""
#: diaspora.php:70 #: diaspora.php:69
#, php-format #, php-format
msgid "" msgid ""
"However, it is preferred that you tell your Diaspora contacts the new handle " "However, it is preferred that you tell your Diaspora contacts the new handle "
"<strong>%s</strong> instead." "<strong>%s</strong> instead."
msgstr "" msgstr ""
#: diaspora.php:80 #: diaspora.php:79
msgid "All aspects" msgid "All aspects"
msgstr "" msgstr ""
#: diaspora.php:81 #: diaspora.php:80
msgid "Public" msgid "Public"
msgstr "" msgstr ""
#: diaspora.php:87 #: diaspora.php:86
msgid "Post to aspect:" msgid "Post to aspect:"
msgstr "" msgstr ""
#: diaspora.php:88 #: diaspora.php:87
#, php-format #, php-format
msgid "Connected with your Diaspora account <strong>%s</strong>" msgid "Connected with your Diaspora account <strong>%s</strong>"
msgstr "" msgstr ""
#: diaspora.php:91 #: diaspora.php:90
msgid "" msgid ""
"Can't login to your Diaspora account. Please check handle (in the format " "Can't login to your Diaspora account. Please check handle (in the format "
"user@domain.tld) and password." "user@domain.tld) and password."
msgstr "" msgstr ""
#: diaspora.php:99 #: diaspora.php:97
msgid "Diaspora Export"
msgstr ""
#: diaspora.php:100
msgid "Information" msgid "Information"
msgstr "" msgstr ""
#: diaspora.php:101 #: diaspora.php:98
msgid "Error" msgid "Error"
msgstr "" msgstr ""
#: diaspora.php:102 #: diaspora.php:104
msgid "Save Settings"
msgstr ""
#: diaspora.php:106
msgid "Enable Diaspora Post Addon" msgid "Enable Diaspora Post Addon"
msgstr "" msgstr ""
#: diaspora.php:107 #: diaspora.php:105
msgid "Diaspora handle" msgid "Diaspora handle"
msgstr "" msgstr ""
#: diaspora.php:108 #: diaspora.php:106
msgid "Diaspora password" msgid "Diaspora password"
msgstr "" msgstr ""
#: diaspora.php:108 #: diaspora.php:106
msgid "" msgid ""
"Privacy notice: Your Diaspora password will be stored unencrypted to " "Privacy notice: Your Diaspora password will be stored unencrypted to "
"authenticate you with your Diaspora pod. This means your Friendica node " "authenticate you with your Diaspora pod. This means your Friendica node "
"administrator can have access to it." "administrator can have access to it."
msgstr "" msgstr ""
#: diaspora.php:110 #: diaspora.php:108
msgid "Post to Diaspora by default" msgid "Post to Diaspora by default"
msgstr "" msgstr ""
#: diaspora.php:113
msgid "Diaspora Export"
msgstr ""

View File

@ -0,0 +1,32 @@
{{if $info}}
<div class="panel panel-info">
<div class="panel-heading">
<h4 class="panel-title">{{$l10n.info_header}}</h4>
</div>
<p class="panel-body">
{{$info nofilter}}
</p>
</div>
{{/if}}
{{if $error}}
<div class="panel panel-danger">
<div class="panel-heading">
<h4 class="panel-title">{{$l10n.error_header}}</h4>
</div>
<p class="panel-body">
{{$error nofilter}}
</p>
</div>
{{/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}}

View File

@ -1,47 +0,0 @@
<span id="settings_diaspora_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_diaspora_expanded'); openClose('settings_diaspora_inflated');">
<img class="connector{{if !$enabled}}-disabled{{/if}}" src="images/diaspora-logo.png">
<h3 class="connector">{{$header}}</h3>
</span>
<div id="settings_diaspora_expanded" class="settings-block" style="display: none;">
<span class="fakelink" onclick="openClose('settings_diaspora_expanded'); openClose('settings_diaspora_inflated');">
<img class="connector{{if !$enabled}}-disabled{{/if}}" src="images/diaspora-logo.png">
<h3 class="connector">{{$header}}</h3>
</span>
{{if $info}}
<div class="panel panel-info">
<div class="panel-heading">
<h4 class="panel-title">{{$info_header}}</h4>
</div>
<p class="panel-body">
{{$info nofilter}}
</p>
</div>
{{/if}}
{{if $error}}
<div class="panel panel-danger">
<div class="panel-heading">
<h4 class="panel-title">{{$error_header}}</h4>
</div>
<p class="panel-body">
{{$error nofilter}}
</p>
</div>
{{/if}}
{{include file="field_checkbox.tpl" field=$enabled_checkbox}}
{{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}}
<div class="settings-submit-wrapper">
<button type="submit" class="btn btn-primary settings-submit" id="diaspora-submit" name="diaspora-submit" value="diaspora-submit">{{$submit}}</button>
</div>
</div>

View File

@ -36,7 +36,7 @@ function discourse_install()
Hook::register('connector_settings_post', __FILE__, 'discourse_settings_post'); 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()) { if (!local_user()) {
return; return;
@ -44,12 +44,18 @@ function discourse_settings(App $a, &$s)
$enabled = intval(DI::pConfig()->get(local_user(), 'discourse', 'enabled')); $enabled = intval(DI::pConfig()->get(local_user(), 'discourse', 'enabled'));
$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/discourse/'); $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/discourse/');
$s .= Renderer::replaceMacros($t, [ $html = Renderer::replaceMacros($t, [
'$title' => DI::l10n()->t('Discourse'),
'$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.')], '$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) function discourse_settings_post(App $a)

View File

@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: discourse.php:49
msgid "Enable processing of Discourse mailing list mails"
msgstr ""
#: discourse.php:49
msgid ""
"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."
msgstr ""
#: discourse.php:54
msgid "Discourse"
msgstr ""

View File

@ -0,0 +1 @@
{{include file="field_checkbox.tpl" field=$enabled}}

View File

@ -1,15 +0,0 @@
<span id="settings_discourse_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_discourse_expanded'); openClose('settings_discourse_inflated');">
<img class="connector{{if ! $enabled.2}}-disabled{{/if}}" src="images/discourse.png" /><h3 class="connector">{{$title}}</h3>
</span>
<div id="settings_discourse_expanded" class="settings-block" style="display: none;">
<span class="fakelink" onclick="openClose('settings_discourse_expanded'); openClose('settings_discourse_inflated');">
<img class="connector{{if ! $enabled.2}}-disabled{{/if}}" src="images/discourse.png" /><h3 class="connector">{{$title}}</h3>
</span>
<div id="discourse-wrapper">
{{include file="field_checkbox.tpl" field=$enabled}}
</div>
<div class="settings-submit-wrapper" >
<input type="submit" id="discourse-submit" name="discourse-submit" class="settings-submit" value="{{$submit}}" />
</div>
</div>

View File

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

View File

@ -12,7 +12,7 @@ use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Database\DBA; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\Tag; 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()) { if (!local_user()) {
return; return;
} }
/* Add our stylesheet to the page so we can make our settings look nice */ $enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post', false);
DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/dwpost/dwpost.css' . '" media="all" />' . "\r\n"; $dw_username = DI::pConfig()->get(local_user(), 'dwpost', 'dw_username');
/* Get the current state of our config variables */
$enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
$def_enabled = DI::pConfig()->get(local_user(), 'dwpost', 'post_by_default'); $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'); $data = [
$dw_password = DI::pConfig()->get(local_user(), 'dwpost', 'dw_password'); 'connector' => 'dwpost',
'title' => DI::l10n()->t('Dreamwidth Export'),
/* Add some HTML to the existing form */ 'image' => 'images/dreamwidth.png',
$s .= '<span id="settings_dwpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">'; 'enabled' => $enabled,
$s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. DI::l10n()->t("Dreamwidth Export").'</h3>'; 'html' => $html,
$s .= '</span>'; ];
$s .= '<div id="settings_dwpost_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
$s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. DI::l10n()->t("Dreamwidth Export").'</h3>';
$s .= '</span>';
$s .= '<div id="dwpost-enable-wrapper">';
$s .= '<label id="dwpost-enable-label" for="dwpost-checkbox">' . DI::l10n()->t('Enable dreamwidth Post Addon') . '</label>';
$s .= '<input id="dwpost-checkbox" type="checkbox" name="dwpost" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="dwpost-username-wrapper">';
$s .= '<label id="dwpost-username-label" for="dwpost-username">' . DI::l10n()->t('dreamwidth username') . '</label>';
$s .= '<input id="dwpost-username" type="text" name="dw_username" value="' . $dw_username . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="dwpost-password-wrapper">';
$s .= '<label id="dwpost-password-label" for="dwpost-password">' . DI::l10n()->t('dreamwidth password') . '</label>';
$s .= '<input id="dwpost-password" type="password" name="dw_password" value="' . $dw_password . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="dwpost-bydefault-wrapper">';
$s .= '<label id="dwpost-bydefault-label" for="dwpost-bydefault">' . DI::l10n()->t('Post to dreamwidth by default') . '</label>';
$s .= '<input id="dwpost-bydefault" type="checkbox" name="dw_bydefault" value="1" ' . $def_checked . '/>';
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
} }

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,30 +17,26 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: dwpost.php:41 #: dwpost.php:43
msgid "Post to Dreamwidth" msgid "Post to Dreamwidth"
msgstr "" msgstr ""
#: dwpost.php:72 dwpost.php:76 #: dwpost.php:63
msgid "Enable Dreamwidth Post Addon"
msgstr ""
#: dwpost.php:64
msgid "Dreamwidth username"
msgstr ""
#: dwpost.php:65
msgid "Dreamwidth password"
msgstr ""
#: dwpost.php:66
msgid "Post to Dreamwidth by default"
msgstr ""
#: dwpost.php:71
msgid "Dreamwidth Export" msgid "Dreamwidth Export"
msgstr "" msgstr ""
#: dwpost.php:80
msgid "Enable dreamwidth Post Addon"
msgstr ""
#: dwpost.php:85
msgid "dreamwidth username"
msgstr ""
#: dwpost.php:90
msgid "dreamwidth password"
msgstr ""
#: dwpost.php:95
msgid "Post to dreamwidth by default"
msgstr ""
#: dwpost.php:100
msgid "Save Settings"
msgstr ""

View File

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

View File

@ -1,14 +0,0 @@
#fromapp-label, #fromapp-force-label {
float: left;
width: 200px;
margin-bottom: 25px;
}
#fromapp-input, #fromapp-force {
float: left;
}

View File

@ -6,8 +6,11 @@
* Author: Commander Zot * Author: Commander Zot
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
function fromapp_install() function fromapp_install()
@ -28,47 +31,26 @@ function fromapp_settings_post($a, $post)
DI::pConfig()->set(local_user(), 'fromapp', 'force', intval($_POST['fromapp-force'])); DI::pConfig()->set(local_user(), 'fromapp', 'force', intval($_POST['fromapp-force']));
} }
function fromapp_settings(&$a, &$s) function fromapp_settings(App &$a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
} }
/* Add our stylesheet to the page so we can make our settings look nice */
DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/fromapp/fromapp.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */
$fromapp = DI::pConfig()->get(local_user(), 'fromapp', 'app', ''); $fromapp = DI::pConfig()->get(local_user(), 'fromapp', 'app', '');
$force = intval(DI::pConfig()->get(local_user(), 'fromapp', 'force')); $force = intval(DI::pConfig()->get(local_user(), 'fromapp', 'force'));
$force_enabled = (($force) ? ' checked="checked" ' : ''); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/fromapp/');
$html = Renderer::replaceMacros($t, [
'$fromapp' => ['fromapp-input', DI::l10n()->t('The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.'), $fromapp],
'$force' => ['fromapp-force', DI::l10n()->t('Use this application name even if another application was used.'), $force],
]);
$data = [
/* Add some HTML to the existing form */ 'addon' => 'fromapp',
'title' => DI::l10n()->t('FromApp Settings'),
$s .= '<span id="settings_fromapp_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromapp_expanded\'); openClose(\'settings_fromapp_inflated\');">'; 'html' => $html,
$s .= '<h3>' . DI::l10n()->t('FromApp Settings') . '</h3>'; ];
$s .= '</span>';
$s .= '<div id="settings_fromapp_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_fromapp_expanded\'); openClose(\'settings_fromapp_inflated\');">';
$s .= '<h3>' . DI::l10n()->t('FromApp Settings') . '</h3>';
$s .= '</span>';
$s .= '<div id="fromapp-wrapper">';
$s .= '<label id="fromapp-label" for="fromapp-input">' . DI::l10n()->t('The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.') . '</label>';
$s .= '<input id="fromapp-input" type="text" name="fromapp-input" value="' . $fromapp . '" ' . '/>';
$s .= '<div class="clear"></div>';
$s .= '<label id="fromapp-force-label" for="fromapp-force">' . DI::l10n()->t('Use this application name even if another application was used.') . '</label>';
$s .= '<input id="fromapp-force" type="checkbox" name="fromapp-force" value="1" ' . $force_enabled . '/>';
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="fromapp-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
} }
function fromapp_post_hook(&$a, &$item) function fromapp_post_hook(&$a, &$item)

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,21 +17,17 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: fromapp.php:53 fromapp.php:57 #: fromapp.php:45
msgid "FromApp Settings"
msgstr ""
#: fromapp.php:60
msgid "" msgid ""
"The application name you would like to show your posts originating from. " "The application name you would like to show your posts originating from. "
"Separate different app names with a comma. A random one will then be " "Separate different app names with a comma. A random one will then be "
"selected for every posting." "selected for every posting."
msgstr "" msgstr ""
#: fromapp.php:64 #: fromapp.php:46
msgid "Use this application name even if another application was used." msgid "Use this application name even if another application was used."
msgstr "" msgstr ""
#: fromapp.php:71 #: fromapp.php:51
msgid "Save Settings" msgid "FromApp Settings"
msgstr "" msgstr ""

View File

@ -0,0 +1,2 @@
{{include file="field_input.tpl" field=$fromapp}}
{{include file="field_checkbox.tpl" field=$force}}

View File

@ -1,14 +0,0 @@
#geonames-enable-label {
float: left;
width: 200px;
margin-bottom: 25px;
}
#geonames-checkbox {
float: left;
}

View File

@ -114,33 +114,31 @@ function geonames_addon_settings_post(App $a, array $post)
* Add our own settings info to the page. * Add our own settings info to the page.
* *
* @param App $a * @param App $a
* @param string $s * @param array $data
* @throws Exception * @throws Exception
*/ */
function geonames_addon_settings(App $a, &$s) function geonames_addon_settings(App $a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
} }
$geo_account = DI::config()->get('geonames', 'username'); $geo_account = DI::config()->get('geonames', 'username');
if (!$geo_account) { if (!$geo_account) {
return; return;
} }
/* Add our stylesheet to the page so we can make our settings look nice */
$stylesheetPath = __DIR__ . '/geonames.css';
DI::page()->registerStylesheet($stylesheetPath);
/* Get the current state of our config variable */
$enabled = intval(DI::pConfig()->get(local_user(), 'geonames', 'enable')); $enabled = intval(DI::pConfig()->get(local_user(), 'geonames', 'enable'));
$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/geonames/'); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/geonames/');
$s .= Renderer::replaceMacros($t, [ $html = Renderer::replaceMacros($t, [
'$title' => DI::l10n()->t('Geonames Settings'), '$info' => DI::l10n()->t('Replace numerical coordinates by the nearest populated location name in your posts.'),
'$description' => DI::l10n()->t('Replace numerical coordinates by the nearest populated location name in your posts.'),
'$enable' => ['geonames-enable', DI::l10n()->t('Enable Geonames Addon'), $enabled], '$enable' => ['geonames-enable', DI::l10n()->t('Enable Geonames Addon'), $enabled],
'$submit' => DI::l10n()->t('Save Settings')
]); ]);
$data = [
'addon' => 'geonames',
'title' => DI::l10n()->t('Geonames Settings'),
'html' => $html,
];
} }

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,20 +17,16 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: geonames.php:141 #: geonames.php:135
msgid "Geonames Settings"
msgstr ""
#: geonames.php:142
msgid "" msgid ""
"Replace numerical coordinates by the nearest populated location name in your " "Replace numerical coordinates by the nearest populated location name in your "
"posts." "posts."
msgstr "" msgstr ""
#: geonames.php:143 #: geonames.php:136
msgid "Enable Geonames Addon" msgid "Enable Geonames Addon"
msgstr "" msgstr ""
#: geonames.php:144 #: geonames.php:141
msgid "Save Settings" msgid "Geonames Settings"
msgstr "" msgstr ""

View File

@ -1,14 +1,2 @@
<span id="settings_geonames_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_geonames_expanded'); openClose('settings_geonames_inflated');"> <p>{{$info}}</p>
<h3>{{$title}}</h3> {{include file="field_checkbox.tpl" field=$enable}}
</span>
<div id="settings_geonames_expanded" class="settings-block" style="display: none;">
<span class="fakelink" onclick="openClose('settings_geonames_expanded'); openClose('settings_geonames_inflated');">
<h3>{{$title}}</h3>
</span>
<p>{{$description nofilter}}</p>
{{include file="field_checkbox.tpl" field=$enable}}
<div class="settings-submit-wrapper" >
<input type="submit" id="geonames-submit" name="geonames-submit" class="settings-submit" value="{{$submit}}" />
</div>
</div>
<div class="clear"></div>

View File

@ -1,16 +0,0 @@
#gnot-desc {
margin-bottom: 10px;
}
#gnot-label {
float: left;
width: 200px;
margin-bottom: 25px;
}
#gnot {
float: left;
}

View File

@ -8,6 +8,7 @@
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
@ -49,31 +50,25 @@ function gnot_settings_post($a,$post) {
function gnot_settings(&$a,&$s) { function gnot_settings(App &$a, array &$data)
{
if(! local_user()) if (!local_user()) {
return; 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'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/gnot/gnot.css' . '" media="all" />' . "\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/'); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/gnot/');
/* Add some HTML to the existing form */ $html = Renderer::replaceMacros($t, [
'$text' => DI::l10n()->t("Allows threading of email comment notifications on Gmail and anonymising the subject line."),
$s .= Renderer::replaceMacros($t, [ '$enabled' => ['gnot', DI::l10n()->t('Enable this addon?'), $gnot],
'$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.")
]); ]);
$data = [
'addon' => 'gnot',
'title' => DI::l10n()->t('Gnot Settings'),
'html' => $html,
];
} }

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,25 +17,21 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: gnot.php:71 #: gnot.php:63
msgid "Gnot Settings"
msgstr ""
#: gnot.php:72
msgid "Save Settings"
msgstr ""
#: gnot.php:73
msgid "Enable this addon?"
msgstr ""
#: gnot.php:75
msgid "" msgid ""
"Allows threading of email comment notifications on Gmail and anonymising the " "Allows threading of email comment notifications on Gmail and anonymising the "
"subject line." "subject line."
msgstr "" msgstr ""
#: gnot.php:84 #: gnot.php:64
msgid "Enable this addon?"
msgstr ""
#: gnot.php:69
msgid "Gnot Settings"
msgstr ""
#: gnot.php:79
#, php-format #, php-format
msgid "[Friendica:Notify] Comment to conversation #%d" msgid "[Friendica:Notify] Comment to conversation #%d"
msgstr "" msgstr ""

View File

@ -1,20 +1,2 @@
<span id="settings_gnot_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_gnot_expanded\'); openClose(\'settings_gnot_inflated\');"> <p>{{$text}}</p>
<h3>{{$title}}</h3> {{include file="field_checkbox.tpl" field=$enabled}}
</span>
<div id="settings_gnot_expanded" class="settings-block" style="display: none;">
<span class="fakelink" onclick="openClose(\'settings_gnot_expanded\'); openClose(\'settings_gnot_inflated\');">
<h3>{{$title}}</h3>
</span>
<div id="gnot-wrapper">
<div id="gnot-desc">{{$text}}</div>
<label id="gnot-label" for="gnot">{{$enable}}</label>
<input id="gnot-input" type="checkbox" name="gnot" value="1" {{$enabled}} />
</div>
<div class="clear"></div>
/* provide a submit button */
<div class="settings-submit-wrapper" >
<input type="submit" name="gnot-submit" class="settings-submit" value="{{$submit}}" />
</div>
</div>

View File

@ -1,14 +0,0 @@
#group_text-enable-label {
float: left;
width: 200px;
margin-bottom: 25px;
}
#group_text-checkbox {
float: left;
}

View File

@ -5,8 +5,11 @@
* Version: 1.0 * Version: 1.0
* Author: Thomas Willingham <https://kakste.com/profile/beardyunixer> * Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
function group_text_install() { function group_text_install() {
@ -42,31 +45,22 @@ function group_text_settings_post($a,$post) {
function group_text_settings(&$a,&$s) { function group_text_settings(App &$a, array &$data)
{
if(! local_user()) if (!local_user()) {
return; return;
}
/* Add our stylesheet to the page so we can make our settings look nice */
DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/group_text/group_text.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */
$enabled = DI::pConfig()->get(local_user(),'system','groupedit_image_limit'); $enabled = DI::pConfig()->get(local_user(),'system','groupedit_image_limit');
$checked = (($enabled) ? ' checked="checked" ' : '');
/* Add some HTML to the existing form */ $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/group_text/');
$html = Renderer::replaceMacros($t, [
$s .= '<div class="settings-block">'; '$enabled' => ['group_text', DI::l10n()->t('Use a text only (non-image) group selector in the "group edit" menu'), $enabled],
$s .= '<h3>' . DI::l10n()->t('Group Text') . '</h3>'; ]);
$s .= '<div id="group_text-enable-wrapper">';
$s .= '<label id="group_text-enable-label" for="group_text-checkbox">' . DI::l10n()->t('Use a text only (non-image) group selector in the "group edit" menu') . '</label>';
$s .= '<input id="group_text-checkbox" type="checkbox" name="group_text" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="group_text-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
$data = [
'addon' => 'group_text',
'title' => DI::l10n()->t('Group Text'),
'html' => $html,
];
} }

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,14 +17,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: group_text.php:62 #: group_text.php:58
msgid "Group Text"
msgstr ""
#: group_text.php:64
msgid "Use a text only (non-image) group selector in the \"group edit\" menu" msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
msgstr "" msgstr ""
#: group_text.php:70 #: group_text.php:63
msgid "Save Settings" msgid "Group Text"
msgstr "" msgstr ""

View File

@ -0,0 +1 @@
{{include file="field_checkbox.tpl" field=$enabled}}

View File

@ -11,6 +11,7 @@ use Friendica\Content\PageInfo;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Item; use Friendica\Model\Item;
@ -33,55 +34,47 @@ function ifttt_content()
} }
function ifttt_settings(App $a, &$s) function ifttt_settings(App $a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
} }
$key = DI::pConfig()->get(local_user(), 'ifttt', 'key'); $key = DI::pConfig()->get(local_user(), 'ifttt', 'key');
if (!$key) { if (!$key) {
$key = Strings::getRandomHex(20); $key = Strings::getRandomHex(20);
DI::pConfig()->set(local_user(), 'ifttt', 'key', $key); DI::pConfig()->set(local_user(), 'ifttt', 'key', $key);
} }
$s .= '<span id="settings_ifttt_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_ifttt_expanded\'); openClose(\'settings_ifttt_inflated\');">'; $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ifttt/');
$s .= '<img class="connector" src="addon/ifttt/ifttt.png" /><h3 class="connector">' . DI::l10n()->t('IFTTT Mirror') . '</h3>'; $html = Renderer::replaceMacros($t, [
$s .= '</span>'; '$l10n' => [
$s .= '<div id="settings_ifttt_expanded" class="settings-block" style="display: none;">'; 'intro' => DI::l10n()->t('Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'),
$s .= '<span class="fakelink" onclick="openClose(\'settings_ifttt_expanded\'); openClose(\'settings_ifttt_inflated\');">'; 'url' => DI::l10n()->t('URL'),
$s .= '<img class="connector" src="addon/ifttt/ifttt.png" /><h3 class="connector">' . DI::l10n()->t('IFTTT Mirror') . '</h3>'; 'method' => DI::l10n()->t('Method'),
$s .= '</span>'; 'content_type' => DI::l10n()->t('Content Type'),
'new_status_message_body' => DI::l10n()->t('Body for "new status message"'),
'new_photo_upload_body' => DI::l10n()->t('Body for "new photo upload"'),
'new_link_post_body' => DI::l10n()->t('Body for "new link post"'),
],
'$url' => DI::baseUrl()->get() . '/ifttt/' . $a->getLoggedInUserNickname(),
'$new_status_message_body' => 'key=' . $key . '&type=status&msg=<<<{{Message}}>>>&date=<<<{{UpdatedAt}}>>>&url=<<<{{PageUrl}}>>>',
'$new_photo_upload_body' => 'key=' . $key . '&type=photo&link=<<<{{Link}}>>>&image=<<<{{ImageSource}}>>>&msg=<<<{{Caption}}>>>&date=<<<{{CreatedAt}}>>>&url=<<<{{PageUrl}}>>>',
'$new_link_post_body' => 'key=' . $key . '&type=link&link=<<<{{Link}}>>>&title=<<<{{Title}}>>>&msg=<<<{{Message}}>>>&description=<<<{{Description}}>>>&date=<<<{{CreatedAt}}>>>&url=<<<{{PageUrl}}>>>',
]);
$s .= '<div id="ifttt-configuration-wrapper">'; $data = [
$s .= '<p>' . DI::l10n()->t('Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:') . '</p>'; 'connector' => 'ifttt',
$s .= '<h4>URL</h4>'; 'title' => DI::l10n()->t('IFTTT Mirror'),
$s .= '<p>' . DI::baseUrl()->get() . '/ifttt/' . $a->getLoggedInUserNickname() . '</p>'; 'image' => 'addon/ifttt/ifttt.png',
$s .= '<h4>Method</h4>'; 'html' => $html,
$s .= '<p>POST</p>'; 'submit' => DI::l10n()->t('Generate new key'),
$s .= '<h4>Content Type</h4>'; ];
$s .= '<p>application/x-www-form-urlencoded</p>';
$s .= '<h4>' . DI::l10n()->t('Body for "new status message"') . '</h4>';
$s .= '<p><code>' . htmlentities('key=' . $key . '&type=status&msg=<<<{{Message}}>>>&date=<<<{{UpdatedAt}}>>>&url=<<<{{PageUrl}}>>>') . '</code></p>';
$s .= '<h4>' . DI::l10n()->t('Body for "new photo upload"') . '</h4>';
$s .= '<p><code>' . htmlentities('key=' . $key . '&type=photo&link=<<<{{Link}}>>>&image=<<<{{ImageSource}}>>>&msg=<<<{{Caption}}>>>&date=<<<{{CreatedAt}}>>>&url=<<<{{PageUrl}}>>>') . '</code></p>';
$s .= '<h4>' . DI::l10n()->t('Body for "new link post"') . '</h4>';
$s .= '<p><code>' . htmlentities('key=' . $key . '&type=link&link=<<<{{Link}}>>>&title=<<<{{Title}}>>>&msg=<<<{{Message}}>>>&description=<<<{{Description}}>>>&date=<<<{{CreatedAt}}>>>&url=<<<{{PageUrl}}>>>') . '</code></p>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ifttt-rekey-wrapper">';
$s .= '<label id="ifttt-rekey-label" for="ifttt-checkbox">' . DI::l10n()->t('Generate new key') . '</label>';
$s .= '<input id="ifttt-checkbox" type="checkbox" name="ifttt-rekey" value="1" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="ifttt-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div>';
$s .= '</div>';
} }
function ifttt_settings_post() 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'); DI::pConfig()->delete(local_user(), 'ifttt', 'key');
} }
} }

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,11 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: ifttt.php:50 ifttt.php:54 #: ifttt.php:52
msgid "IFTTT Mirror"
msgstr ""
#: ifttt.php:58
msgid "" msgid ""
"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create " "Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
"three Facebook recipes that are connected with <a href=\"https://ifttt.com/" "three Facebook recipes that are connected with <a href=\"https://ifttt.com/"
@ -29,22 +25,34 @@ msgid ""
"following parameters:" "following parameters:"
msgstr "" msgstr ""
#: ifttt.php:65 #: ifttt.php:53
msgid "URL"
msgstr ""
#: ifttt.php:54
msgid "Method"
msgstr ""
#: ifttt.php:55
msgid "Content Type"
msgstr ""
#: ifttt.php:56
msgid "Body for \"new status message\"" msgid "Body for \"new status message\""
msgstr "" msgstr ""
#: ifttt.php:67 #: ifttt.php:57
msgid "Body for \"new photo upload\"" msgid "Body for \"new photo upload\""
msgstr "" msgstr ""
#: ifttt.php:69 #: ifttt.php:58
msgid "Body for \"new link post\"" msgid "Body for \"new link post\""
msgstr "" msgstr ""
#: ifttt.php:74 #: ifttt.php:68
msgid "Generate new key" msgid "IFTTT Mirror"
msgstr "" msgstr ""
#: ifttt.php:78 #: ifttt.php:71
msgid "Save Settings" msgid "Generate new key"
msgstr "" msgstr ""

View File

@ -0,0 +1,15 @@
<p>{{$l10n.intro nofilter}}</p>
<dl>
<dt>{{$l10n.url}}</dt>
<dd>{{$url}}</dd>
<dt>{{$l10n.method}}</dt>
<dd>POST</dd>
<dt>{{$l10n.content_type}}</dt>
<dd>application/x-www-form-urlencoded</dd>
<dt>{{$l10n.new_status_message_body}}</dt>
<dd><code>{{$new_status_message_body}}</code></dd>
<dt>{{$l10n.new_photo_upload_body}}</dt>
<dd><code>{{$new_photo_upload_body}}</code></dd>
<dt>{{$l10n.new_link_post_body}}</dt>
<dd><code>{{$new_link_post_body}}</code></dd>
</dl>

View File

@ -1,15 +0,0 @@
#ijpost-enable-label, #ijpost-username-label, #ijpost-password-label, #ijpost-bydefault-label {
float: left;
width: 200px;
margin-top: 10px;
}
#ijpost-checkbox, #ijpost-username, #ijpost-password, #ijpost-bydefault {
float: left;
margin-top: 10px;
}
#ijpost-submit {
margin-top: 15px;
}

View File

@ -8,9 +8,11 @@
* Author: Cat Gray <https://free-haven.org/profile/catness> * Author: Cat Gray <https://free-haven.org/profile/catness>
*/ */
use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Tag; use Friendica\Model\Tag;
use Friendica\Model\User; use Friendica\Model\User;
@ -26,7 +28,7 @@ function ijpost_install()
Hook::register('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post'); Hook::register('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
} }
function ijpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields) function ijpost_jot_nets(App &$a, array &$jotnets_fields)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
@ -44,60 +46,31 @@ function ijpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
} }
} }
function ijpost_settings(&$a, &$s) function ijpost_settings(App &$a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
} }
/* Add our stylesheet to the page so we can make our settings look nice */ $enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post', false);
$ij_username = DI::pConfig()->get(local_user(), 'ijpost', 'ij_username');
DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/ijpost/ijpost.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variables */
$enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
$def_enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default'); $def_enabled = DI::pConfig()->get(local_user(), 'ijpost', 'post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : ''); $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ijpost/');
$html = Renderer::replaceMacros($t, [
'$enabled' => ['ijpost', DI::l10n()->t('Enable InsaneJournal Post Addon'), $enabled],
'$username' => ['ij_username', DI::l10n()->t('InsaneJournal username'), $ij_username],
'$password' => ['ij_password', DI::l10n()->t('InsaneJournal password')],
'$bydefault' => ['ij_bydefault', DI::l10n()->t('Post to InsaneJournal by default'), $def_enabled],
]);
$ij_username = DI::pConfig()->get(local_user(), 'ijpost', 'ij_username'); $data = [
$ij_password = DI::pConfig()->get(local_user(), 'ijpost', 'ij_password'); 'connector' => 'ijpost',
'title' => DI::l10n()->t('InsaneJournal Export'),
/* Add some HTML to the existing form */ 'image' => 'images/insanejournal.gif',
$s .= '<span id="settings_ijpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">'; 'enabled' => $enabled,
$s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. DI::l10n()->t("InsaneJournal Export").'</h3>'; 'html' => $html,
$s .= '</span>'; ];
$s .= '<div id="settings_ijpost_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">';
$s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. DI::l10n()->t("InsaneJournal Export").'</h3>';
$s .= '</span>';
$s .= '<div id="ijpost-enable-wrapper">';
$s .= '<label id="ijpost-enable-label" for="ijpost-checkbox">' . DI::l10n()->t('Enable InsaneJournal Post Addon') . '</label>';
$s .= '<input id="ijpost-checkbox" type="checkbox" name="ijpost" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ijpost-username-wrapper">';
$s .= '<label id="ijpost-username-label" for="ijpost-username">' . DI::l10n()->t('InsaneJournal username') . '</label>';
$s .= '<input id="ijpost-username" type="text" name="ij_username" value="' . $ij_username . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ijpost-password-wrapper">';
$s .= '<label id="ijpost-password-label" for="ijpost-password">' . DI::l10n()->t('InsaneJournal password') . '</label>';
$s .= '<input id="ijpost-password" type="password" name="ij_password" value="' . $ij_password . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ijpost-bydefault-wrapper">';
$s .= '<label id="ijpost-bydefault-label" for="ijpost-bydefault">' . DI::l10n()->t('Post to InsaneJournal by default') . '</label>';
$s .= '<input id="ijpost-bydefault" type="checkbox" name="ij_bydefault" value="1" ' . $def_checked . '/>';
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
} }
function ijpost_settings_post(&$a, &$b) function ijpost_settings_post(&$a, &$b)

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,30 +17,26 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: ijpost.php:39 #: ijpost.php:42
msgid "Post to Insanejournal" msgid "Post to Insanejournal"
msgstr "" msgstr ""
#: ijpost.php:71 ijpost.php:75 #: ijpost.php:61
msgid "InsaneJournal Export"
msgstr ""
#: ijpost.php:79
msgid "Enable InsaneJournal Post Addon" msgid "Enable InsaneJournal Post Addon"
msgstr "" msgstr ""
#: ijpost.php:84 #: ijpost.php:62
msgid "InsaneJournal username" msgid "InsaneJournal username"
msgstr "" msgstr ""
#: ijpost.php:89 #: ijpost.php:63
msgid "InsaneJournal password" msgid "InsaneJournal password"
msgstr "" msgstr ""
#: ijpost.php:94 #: ijpost.php:64
msgid "Post to InsaneJournal by default" msgid "Post to InsaneJournal by default"
msgstr "" msgstr ""
#: ijpost.php:99 #: ijpost.php:69
msgid "Save Settings" msgid "InsaneJournal Export"
msgstr "" msgstr ""

View File

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

View File

@ -7,6 +7,7 @@
* Author: Tobias Diekershoff <https://f.diekershoff.de/u/tobias> * Author: Tobias Diekershoff <https://f.diekershoff.de/u/tobias>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
@ -17,30 +18,27 @@ function irc_install() {
Hook::register('addon_settings_post', 'addon/irc/irc.php', 'irc_addon_settings_post'); Hook::register('addon_settings_post', 'addon/irc/irc.php', 'irc_addon_settings_post');
} }
function irc_addon_settings(&$a,&$s) { function irc_addon_settings(App &$a, array &$data)
if(! local_user()) {
if (!local_user()) {
return; return;
}
/* Add our stylesheet to the page so we can make our settings look nice */ $sitechats = DI::pConfig()->get(local_user(), 'irc', 'sitechats'); /* popular channels */
$autochans = DI::pConfig()->get(local_user(), 'irc', 'autochans'); /* auto connect chans */
// DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->getBaseURL() . '/addon/irc/irc.css' . '" media="all" />' . "\r\n"; $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/irc/');
$html = Renderer::replaceMacros($t, [
/* setting popular channels, auto connect channels */
$sitechats = DI::pConfig()->get( local_user(), 'irc','sitechats'); /* popular channels */
$autochans = DI::pConfig()->get( local_user(), 'irc','autochans'); /* auto connect chans */
$t = Renderer::getMarkupTemplate( "settings.tpl", "addon/irc/" );
$s .= Renderer::replaceMacros($t, [
'$header' => DI::l10n()->t('IRC Settings'),
'$info' => DI::l10n()->t('Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'), '$info' => DI::l10n()->t('Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'),
'$submit' => DI::l10n()->t('Save Settings'), '$autochans' => ['autochans', DI::l10n()->t('Channel(s) to auto connect (comma separated)'), $autochans, DI::l10n()->t('List of channels that shall automatically connected to when the app is launched.')],
'$autochans' => [ 'autochans', DI::l10n()->t('Channel(s) to auto connect (comma separated)'), $autochans, DI::l10n()->t('List of channels that shall automatically connected to when the app is launched.')], '$sitechats' => ['sitechats', DI::l10n()->t('Popular Channels (comma separated)'), $sitechats, DI::l10n()->t('List of popular channels, will be displayed at the side and hotlinked for easy joining.')],
'$sitechats' => [ 'sitechats', DI::l10n()->t('Popular Channels (comma separated)'), $sitechats, DI::l10n()->t('List of popular channels, will be displayed at the side and hotlinked for easy joining.') ]
]); ]);
$data = [
return; 'addon' => 'irc',
'title' => DI::l10n()->t('IRC Settings'),
'html' => $html,
];
} }
function irc_addon_settings_post(&$a, &$b) { function irc_addon_settings_post(&$a, &$b) {

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,45 +17,45 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: irc.php:34 #: irc.php:32
msgid "IRC Settings"
msgstr ""
#: irc.php:35
msgid "" msgid ""
"Here you can change the system wide settings for the channels to " "Here you can change the system wide settings for the channels to "
"automatically join and access via the side bar. Note the changes you do " "automatically join and access via the side bar. Note the changes you do "
"here, only effect the channel selection if you are logged in." "here, only effect the channel selection if you are logged in."
msgstr "" msgstr ""
#: irc.php:36 irc.php:134 #: irc.php:33 irc.php:133
msgid "Save Settings"
msgstr ""
#: irc.php:37 irc.php:135
msgid "Channel(s) to auto connect (comma separated)" msgid "Channel(s) to auto connect (comma separated)"
msgstr "" msgstr ""
#: irc.php:37 irc.php:135 #: irc.php:33 irc.php:133
msgid "" msgid ""
"List of channels that shall automatically connected to when the app is " "List of channels that shall automatically connected to when the app is "
"launched." "launched."
msgstr "" msgstr ""
#: irc.php:38 irc.php:136 #: irc.php:34 irc.php:134
msgid "Popular Channels (comma separated)" msgid "Popular Channels (comma separated)"
msgstr "" msgstr ""
#: irc.php:38 irc.php:136 #: irc.php:34 irc.php:134
msgid "" msgid ""
"List of popular channels, will be displayed at the side and hotlinked for " "List of popular channels, will be displayed at the side and hotlinked for "
"easy joining." "easy joining."
msgstr "" msgstr ""
#: irc.php:62 #: irc.php:39
msgid "IRC Settings"
msgstr ""
#: irc.php:60
msgid "IRC Chatroom" msgid "IRC Chatroom"
msgstr "" msgstr ""
#: irc.php:90 #: irc.php:88
msgid "Popular Channels" msgid "Popular Channels"
msgstr "" msgstr ""
#: irc.php:132
msgid "Save Settings"
msgstr ""

View File

@ -1,15 +1,3 @@
<span id="settings_irc_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_irc_expanded'); openClose('settings_irc_inflated');"> <p>{{$info}}</p>
<h3>{{$header}}</h3> {{include file="field_input.tpl" field=$autochans}}
</span> {{include file="field_input.tpl" field=$sitechats}}
<div id="settings_irc_expanded" class="settings-block" style="display: none;">
<span class="fakelink" onclick="openClose('settings_irc_expanded'); openClose('settings_irc_inflated');">
<h3>{{$header}}</h3>
</span>
<p>{{$info}}</p>
{{include file="field_input.tpl" field=$autochans}}
{{include file="field_input.tpl" field=$sitechats}}
<div class="settings-submit-wrapper" >
<input type="submit" id="irc-submit" name="irc-submit" class="settings-submit" value="{{$submit}}" />
</div>
</div>

View File

@ -29,8 +29,8 @@ function js_upload_form(App $a, array &$b)
{ {
$b['default_upload'] = false; $b['default_upload'] = false;
DI::page()->registerStylesheet('addon/js_upload/file-uploader/client/fileuploader.css'); DI::page()->registerStylesheet(__DIR__ . '/file-uploader/client/fileuploader.css');
DI::page()->registerFooterScript('addon/js_upload/file-uploader/client/fileuploader.js'); DI::page()->registerFooterScript(__DIR__ . '/file-uploader/client/fileuploader.js');
$tpl = Renderer::getMarkupTemplate('js_upload.tpl', 'addon/js_upload'); $tpl = Renderer::getMarkupTemplate('js_upload.tpl', 'addon/js_upload');
$b['addon_text'] .= Renderer::replaceMacros($tpl, [ $b['addon_text'] .= Renderer::replaceMacros($tpl, [

View File

@ -1,14 +0,0 @@
#krynn-enable-label {
float: left;
width: 200px;
margin-bottom: 25px;
}
#krynn-checkbox {
float: left;
}

View File

@ -9,8 +9,11 @@
* *
*"My body was my sacrifice... for my magic. This damage is permanent." - Raistlin Majere *"My body was my sacrifice... for my magic. This damage is permanent." - Raistlin Majere
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
function krynn_install() { function krynn_install() {
@ -111,42 +114,24 @@ function krynn_settings_post($a,$post) {
function krynn_settings(&$a,&$s) { function krynn_settings(App &$a, array &$data)
{
if(! local_user()) if(! local_user()) {
return; return;
}
/* Add our stylesheet to the page so we can make our settings look nice */
DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/krynn/krynn.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */
$enabled = DI::pConfig()->get(local_user(),'krynn','enable'); $enabled = DI::pConfig()->get(local_user(),'krynn','enable');
$checked = (($enabled) ? ' checked="checked" ' : ''); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/krynn/');
$html = Renderer::replaceMacros($t, [
/* Add some HTML to the existing form */ '$enabled' => ['krynn', DI::l10n()->t('Enable Krynn Addon'), $enabled],
]);
$s .= '<span id="settings_krynn_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_krynn_expanded\'); openClose(\'settings_krynn_inflated\');">';
$s .= '<h3>' . DI::l10n()->t('Krynn') . '</h3>';
$s .= '</span>';
$s .= '<div id="settings_krynn_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_krynn_expanded\'); openClose(\'settings_krynn_inflated\');">';
$s .= '<h3>' . DI::l10n()->t('Krynn') . '</h3>';
$s .= '</span>';
$s .= '<div class="settings-block">';
$s .= '<h3>' . DI::l10n()->t('Krynn Settings') . '</h3>';
$s .= '<div id="krynn-enable-wrapper">';
$s .= '<label id="krynn-enable-label" for="krynn-checkbox">' . DI::l10n()->t('Enable Krynn Addon') . '</label>';
$s .= '<input id="krynn-checkbox" type="checkbox" name="krynn" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="krynn-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
$data = [
'addon' => 'krynn',
'title' => DI::l10n()->t('Krynn Settings'),
'html' => $html,
];
} }

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,18 +17,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: krynn.php:132 krynn.php:136 #: krynn.php:127
msgid "Krynn"
msgstr ""
#: krynn.php:141
msgid "Krynn Settings"
msgstr ""
#: krynn.php:143
msgid "Enable Krynn Addon" msgid "Enable Krynn Addon"
msgstr "" msgstr ""
#: krynn.php:148 #: krynn.php:132
msgid "Save Settings" msgid "Krynn Settings"
msgstr "" msgstr ""

View File

@ -0,0 +1 @@
{{include file="field_checkbox.tpl" field=$enabled}}

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,58 +17,58 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: langfilter.php:50 #: langfilter.php:49
msgid "Language Filter"
msgstr ""
#: langfilter.php:51
msgid "" msgid ""
"This addon tries to identify the language posts are written in. If it does " "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 " "not match any language specified below, posts will be hidden by collapsing "
"them." "them."
msgstr "" msgstr ""
#: langfilter.php:52 #: langfilter.php:50
msgid "Use the language filter" msgid "Use the language filter"
msgstr "" msgstr ""
#: langfilter.php:53 #: langfilter.php:51
msgid "Able to read" msgid "Able to read"
msgstr "" msgstr ""
#: langfilter.php:53 #: langfilter.php:51
msgid "" msgid ""
"List of abbreviations (ISO 639-1 codes) for languages you speak, comma " "List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
"separated. For example \"de,it\"." "separated. For example \"de,it\"."
msgstr "" msgstr ""
#: langfilter.php:54 #: langfilter.php:52
msgid "Minimum confidence in language detection" msgid "Minimum confidence in language detection"
msgstr "" msgstr ""
#: langfilter.php:54 #: langfilter.php:52
msgid "" msgid ""
"Minimum confidence in language detection being correct, from 0 to 100. Posts " "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 " "will not be filtered when the confidence of language detection is below this "
"percent value." "percent value."
msgstr "" msgstr ""
#: langfilter.php:55 #: langfilter.php:53
msgid "Minimum length of message body" msgid "Minimum length of message body"
msgstr "" msgstr ""
#: langfilter.php:55 #: langfilter.php:53
msgid "" msgid ""
"Minimum number of characters in message body for filter to be used. Posts " "Minimum number of characters in message body for filter to be used. Posts "
"shorter than this will not be filtered. Note: Language detection is " "shorter than this will not be filtered. Note: Language detection is "
"unreliable for short content (<200 characters)." "unreliable for short content (<200 characters)."
msgstr "" msgstr ""
#: langfilter.php:56 #: langfilter.php:58
msgid "Language Filter"
msgstr ""
#: langfilter.php:60
msgid "Save Settings" msgid "Save Settings"
msgstr "" msgstr ""
#: langfilter.php:187 #: langfilter.php:193
#, php-format #, php-format
msgid "Filtered language: %s" msgid "Filtered language: %s"
msgstr "" msgstr ""

View File

@ -31,7 +31,7 @@ function langfilter_install()
* 3rd parse a SMARTY3 template, replacing some translateable strings for the form * 3rd parse a SMARTY3 template, replacing some translateable strings for the form
*/ */
function langfilter_addon_settings(App $a, &$s) function langfilter_addon_settings(App $a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
@ -40,23 +40,25 @@ function langfilter_addon_settings(App $a, &$s)
$enabled = DI::pConfig()->get(local_user(), 'langfilter', 'enable', $enabled = DI::pConfig()->get(local_user(), 'langfilter', 'enable',
!DI::pConfig()->get(local_user(), 'langfilter', 'disable')); !DI::pConfig()->get(local_user(), 'langfilter', 'disable'));
$enable_checked = $enabled ? ' checked="checked"' : '';
$languages = DI::pConfig()->get(local_user(), 'langfilter', 'languages'); $languages = DI::pConfig()->get(local_user(), 'langfilter', 'languages');
$minconfidence = DI::pConfig()->get(local_user(), 'langfilter', 'minconfidence', 0) * 100; $minconfidence = DI::pConfig()->get(local_user(), 'langfilter', 'minconfidence', 0) * 100;
$minlength = DI::pConfig()->get(local_user(), 'langfilter', 'minlength' , 32); $minlength = DI::pConfig()->get(local_user(), 'langfilter', 'minlength', 32);
$t = Renderer::getMarkupTemplate("settings.tpl", "addon/langfilter/"); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/langfilter/');
$s .= Renderer::replaceMacros($t, [ $html = Renderer::replaceMacros($t, [
'$title' => DI::l10n()->t("Language Filter"),
'$intro' => DI::l10n()->t('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.'), '$intro' => DI::l10n()->t('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.'),
'$enabled' => ['langfilter_enable', DI::l10n()->t('Use the language filter'), $enable_checked, ''], '$enabled' => ['langfilter_enable', DI::l10n()->t('Use the language filter'), $enabled],
'$languages' => ['langfilter_languages', DI::l10n()->t('Able to read'), $languages, DI::l10n()->t('List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".')], '$languages' => ['langfilter_languages', DI::l10n()->t('Able to read'), $languages, DI::l10n()->t('List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".')],
'$minconfidence' => ['langfilter_minconfidence', DI::l10n()->t('Minimum confidence in language detection'), $minconfidence, DI::l10n()->t('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.')], '$minconfidence' => ['langfilter_minconfidence', DI::l10n()->t('Minimum confidence in language detection'), $minconfidence, DI::l10n()->t('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.')],
'$minlength' => ['langfilter_minlength', DI::l10n()->t('Minimum length of message body'), $minlength, DI::l10n()->t('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).')], '$minlength' => ['langfilter_minlength', DI::l10n()->t('Minimum length of message body'), $minlength, DI::l10n()->t('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).')],
'$submit' => DI::l10n()->t('Save Settings'),
]); ]);
return; $data = [
'addon' => 'langfilter',
'title' => DI::l10n()->t('Language Filter'),
'html' => $html,
'submit' => ['langfilter-settings-submit' => DI::l10n()->t('Save Settings')],
];
} }
/* Save the settings /* Save the settings

View File

@ -1,19 +1,5 @@
<span id="settings_langfilter_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_langfilter_expanded'); openClose('settings_langfilter_inflated');"> <p>{{$intro}}</p>
<h3>{{$title}}</h3> {{include file="field_checkbox.tpl" field=$enabled}}
</span> {{include file="field_input.tpl" field=$languages}}
<div id="settings_langfilter_expanded" class="settings-block" style="display: none;"> {{include file="field/range_percent.tpl" field=$minconfidence}}
<span class="fakelink" onclick="openClose('settings_langfilter_expanded'); openClose('settings_langfilter_inflated');"> {{include file="field_input.tpl" field=$minlength}}
<h3>{{$title}}</h3>
</span>
<div id="langfilter-wrapper">
<p>{{$intro}}</p>
{{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}}
</div>
<div class="settings-submit-wrapper" >
<input type="submit" id="langfilter-settings-submit" name="langfilter-settings-submit" class="settings-submit" value="{{$submit}}" />
</div>
</div>

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,30 +17,26 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: libertree.php:37 #: libertree.php:39
msgid "Post to libertree" msgid "Post to libertree"
msgstr "" msgstr ""
#: libertree.php:71 libertree.php:75 #: libertree.php:60
msgid "libertree Export"
msgstr ""
#: libertree.php:79
msgid "Enable Libertree Post Addon" msgid "Enable Libertree Post Addon"
msgstr "" msgstr ""
#: libertree.php:84 #: libertree.php:61
msgid "Libertree API token"
msgstr ""
#: libertree.php:89
msgid "Libertree site URL" msgid "Libertree site URL"
msgstr "" msgstr ""
#: libertree.php:94 #: libertree.php:62
msgid "Libertree API token"
msgstr ""
#: libertree.php:63
msgid "Post to Libertree by default" msgid "Post to Libertree by default"
msgstr "" msgstr ""
#: libertree.php:100 #: libertree.php:68
msgid "Save Settings" msgid "Libertree Export"
msgstr "" msgstr ""

View File

@ -1,16 +0,0 @@
#libertree-enable-label, #libertree-api_token-label, #libertree-url-label, #libertree-bydefault-label {
float: left;
width: 200px;
margin-top: 10px;
}
#libertree-checkbox, #libertree-api_token, #libertree-url, #libertree-bydefault {
float: left;
margin-top: 10px;
}
#libertree-submit {
margin-top: 15px;
}

View File

@ -10,6 +10,7 @@ use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Post; use Friendica\Model\Post;
@ -43,63 +44,32 @@ function libertree_jot_nets(App &$a, array &$jotnets_fields)
} }
function libertree_settings(&$a,&$s) { function libertree_settings(App $a, array &$data)
{
if(! local_user()) if (!local_user()) {
return; return;
}
/* Add our stylesheet to the page so we can make our settings look nice */ $enabled = DI::pConfig()->get(local_user(), 'libertree', 'post', false);
DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/libertree/libertree.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variables */
$enabled = DI::pConfig()->get(local_user(),'libertree','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
$css = (($enabled) ? '' : '-disabled');
$def_enabled = DI::pConfig()->get(local_user(),'libertree','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
$ltree_api_token = DI::pConfig()->get(local_user(), 'libertree', 'libertree_api_token'); $ltree_api_token = DI::pConfig()->get(local_user(), 'libertree', 'libertree_api_token');
$ltree_url = DI::pConfig()->get(local_user(), 'libertree', 'libertree_url'); $ltree_url = DI::pConfig()->get(local_user(), 'libertree', 'libertree_url');
$def_enabled = DI::pConfig()->get(local_user(), 'libertree', 'post_by_default');
$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],
]);
/* Add some HTML to the existing form */ $data = [
'connector' => 'libertree',
$s .= '<span id="settings_libertree_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">'; 'title' => DI::l10n()->t('Libertree Export'),
$s .= '<img class="connector'.$css.'" src="images/libertree.png" /><h3 class="connector">'. DI::l10n()->t('libertree Export').'</h3>'; 'image' => 'images/libertree.png',
$s .= '</span>'; 'enabled' => $enabled,
$s .= '<div id="settings_libertree_expanded" class="settings-block" style="display: none;">'; 'html' => $html,
$s .= '<span class="fakelink" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">'; ];
$s .= '<img class="connector'.$css.'" src="images/libertree.png" /><h3 class="connector">'. DI::l10n()->t('libertree Export').'</h3>';
$s .= '</span>';
$s .= '<div id="libertree-enable-wrapper">';
$s .= '<label id="libertree-enable-label" for="libertree-checkbox">' . DI::l10n()->t('Enable Libertree Post Addon') . '</label>';
$s .= '<input id="libertree-checkbox" type="checkbox" name="libertree" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="libertree-api_token-wrapper">';
$s .= '<label id="libertree-api_token-label" for="libertree-api_token">' . DI::l10n()->t('Libertree API token') . '</label>';
$s .= '<input id="libertree-api_token" type="text" name="libertree_api_token" value="' . $ltree_api_token . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="libertree-url-wrapper">';
$s .= '<label id="libertree-url-label" for="libertree-url">' . DI::l10n()->t('Libertree site URL') . '</label>';
$s .= '<input id="libertree-url" type="text" name="libertree_url" value="' . $ltree_url . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="libertree-bydefault-wrapper">';
$s .= '<label id="libertree-bydefault-label" for="libertree-bydefault">' . DI::l10n()->t('Post to Libertree by default') . '</label>';
$s .= '<input id="libertree-bydefault" type="checkbox" name="libertree_bydefault" value="1" ' . $def_checked . '/>';
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="libertree-submit" name="libertree-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
} }

View File

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

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,30 +17,26 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: ljpost.php:39 #: ljpost.php:43
msgid "Post to LiveJournal" msgid "Post to LiveJournal"
msgstr "" msgstr ""
#: ljpost.php:73 #: ljpost.php:63
msgid "LiveJournal Post Settings"
msgstr ""
#: ljpost.php:75
msgid "Enable LiveJournal Post Addon" msgid "Enable LiveJournal Post Addon"
msgstr "" msgstr ""
#: ljpost.php:80 #: ljpost.php:64
msgid "LiveJournal username" msgid "LiveJournal username"
msgstr "" msgstr ""
#: ljpost.php:85 #: ljpost.php:65
msgid "LiveJournal password" msgid "LiveJournal password"
msgstr "" msgstr ""
#: ljpost.php:90 #: ljpost.php:66
msgid "Post to LiveJournal by default" msgid "Post to LiveJournal by default"
msgstr "" msgstr ""
#: ljpost.php:96 #: ljpost.php:71
msgid "Save Settings" msgid "LiveJournal Export"
msgstr "" msgstr ""

BIN
ljpost/livejournal.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

@ -8,9 +8,11 @@
* Author: Cat Gray <https://free-haven.org/profile/catness> * Author: Cat Gray <https://free-haven.org/profile/catness>
*/ */
use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\Tag; use Friendica\Model\Tag;
@ -27,7 +29,7 @@ function ljpost_install() {
} }
function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields) function ljpost_jot_nets(App &$a, array &$jotnets_fields)
{ {
if(! local_user()) { if(! local_user()) {
return; return;
@ -46,57 +48,31 @@ function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
} }
function ljpost_settings(&$a,&$s) { function ljpost_settings(App &$a, array &$data)
{
if(! local_user()) if (!local_user()) {
return; return;
}
/* Add our stylesheet to the page so we can make our settings look nice */ $enabled = DI::pConfig()->get(local_user(), 'ljpost', 'post', false);
$ij_username = DI::pConfig()->get(local_user(), 'ljpost', 'ij_username');
$def_enabled = DI::pConfig()->get(local_user(), 'ljpost', 'post_by_default');
DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/ljpost/ljpost.css' . '" media="all" />' . "\r\n"; $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ljpost/');
$html = Renderer::replaceMacros($t, [
/* Get the current state of our config variables */ '$enabled' => ['ljpost', DI::l10n()->t('Enable LiveJournal Post Addon'), $enabled],
'$username' => ['ij_username', DI::l10n()->t('LiveJournal username'), $ij_username],
$enabled = DI::pConfig()->get(local_user(),'ljpost','post'); '$password' => ['ij_password', DI::l10n()->t('LiveJournal password')],
'$bydefault' => ['ij_bydefault', DI::l10n()->t('Post to LiveJournal by default'), $def_enabled],
$checked = (($enabled) ? ' checked="checked" ' : ''); ]);
$def_enabled = DI::pConfig()->get(local_user(),'ljpost','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
$lj_username = DI::pConfig()->get(local_user(), 'ljpost', 'lj_username');
$lj_password = DI::pConfig()->get(local_user(), 'ljpost', 'lj_password');
/* Add some HTML to the existing form */
$s .= '<div class="settings-block">';
$s .= '<h3>' . DI::l10n()->t('LiveJournal Post Settings') . '</h3>';
$s .= '<div id="ljpost-enable-wrapper">';
$s .= '<label id="ljpost-enable-label" for="ljpost-checkbox">' . DI::l10n()->t('Enable LiveJournal Post Addon') . '</label>';
$s .= '<input id="ljpost-checkbox" type="checkbox" name="ljpost" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ljpost-username-wrapper">';
$s .= '<label id="ljpost-username-label" for="ljpost-username">' . DI::l10n()->t('LiveJournal username') . '</label>';
$s .= '<input id="ljpost-username" type="text" name="lj_username" value="' . $lj_username . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ljpost-password-wrapper">';
$s .= '<label id="ljpost-password-label" for="ljpost-password">' . DI::l10n()->t('LiveJournal password') . '</label>';
$s .= '<input id="ljpost-password" type="password" name="lj_password" value="' . $lj_password . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="ljpost-bydefault-wrapper">';
$s .= '<label id="ljpost-bydefault-label" for="ljpost-bydefault">' . DI::l10n()->t('Post to LiveJournal by default') . '</label>';
$s .= '<input id="ljpost-bydefault" type="checkbox" name="lj_bydefault" value="1" ' . $def_checked . '/>';
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ljpost-submit" name="ljpost-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
$data = [
'connector' => 'ljpost',
'title' => DI::l10n()->t('LiveJournal Export'),
'image' => 'addon/ljpost/livejournal.png',
'enabled' => $enabled,
'html' => $html,
];
} }

View File

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

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,80 +17,80 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: mailstream.php:66 #: mailstream.php:77
msgid "From Address" msgid "From Address"
msgstr "" msgstr ""
#: mailstream.php:68 #: mailstream.php:79
msgid "Email address that stream items will appear to be from." msgid "Email address that stream items will appear to be from."
msgstr "" msgstr ""
#: mailstream.php:71 mailstream.php:382 #: mailstream.php:82
msgid "Save Settings" msgid "Save Settings"
msgstr "" msgstr ""
#: mailstream.php:225 #: mailstream.php:301
msgid "Re:" msgid "Re:"
msgstr "" msgstr ""
#: mailstream.php:233 #: mailstream.php:314 mailstream.php:317
msgid "Friendica post" msgid "Friendica post"
msgstr "" msgstr ""
#: mailstream.php:236 #: mailstream.php:320
msgid "Diaspora post" msgid "Diaspora post"
msgstr "" msgstr ""
#: mailstream.php:246 #: mailstream.php:330
msgid "Feed item" msgid "Feed item"
msgstr "" msgstr ""
#: mailstream.php:249 #: mailstream.php:333
msgid "Email" msgid "Email"
msgstr "" msgstr ""
#: mailstream.php:251 #: mailstream.php:335
msgid "Friendica Item" msgid "Friendica Item"
msgstr "" msgstr ""
#: mailstream.php:296 #: mailstream.php:404
msgid "Upstream" msgid "Upstream"
msgstr "" msgstr ""
#: mailstream.php:297 #: mailstream.php:405
msgid "Local" msgid "Local"
msgstr "" msgstr ""
#: mailstream.php:364 #: mailstream.php:481
msgid "Enabled" msgid "Enabled"
msgstr "" msgstr ""
#: mailstream.php:368 #: mailstream.php:486
msgid "Email Address" msgid "Email Address"
msgstr "" msgstr ""
#: mailstream.php:370 #: mailstream.php:488
msgid "Leave blank to use your account email address" msgid "Leave blank to use your account email address"
msgstr "" msgstr ""
#: mailstream.php:373 #: mailstream.php:492
msgid "Exclude Likes" msgid "Exclude Likes"
msgstr "" msgstr ""
#: mailstream.php:375 #: mailstream.php:494
msgid "Check this to omit mailing \"Like\" notifications" msgid "Check this to omit mailing \"Like\" notifications"
msgstr "" msgstr ""
#: mailstream.php:378 #: mailstream.php:498
msgid "Attach Images" msgid "Attach Images"
msgstr "" msgstr ""
#: mailstream.php:380 #: mailstream.php:500
msgid "" msgid ""
"Download images in posts and attach them to the email. Useful for reading " "Download images in posts and attach them to the email. Useful for reading "
"email while offline." "email while offline."
msgstr "" msgstr ""
#: mailstream.php:381 #: mailstream.php:507
msgid "Mail Stream Settings" msgid "Mail Stream Settings"
msgstr "" msgstr ""

View File

@ -6,6 +6,7 @@
* Author: Matthew Exon <http://mat.exon.name> * Author: Matthew Exon <http://mat.exon.name>
*/ */
use Friendica\App;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
@ -462,17 +463,19 @@ function mailstream_convert_table_entries()
/** /**
* Form for configuring mailstream features for a user * Form for configuring mailstream features for a user
* *
* @param Friendica\App $a App object * @param App $a App object
* @param string $o HTML form data * @param array $data Hook data array
* @throws \Friendica\Network\HTTPException\ServiceUnavailableException
*/ */
function mailstream_addon_settings(&$a, &$s) function mailstream_addon_settings(App &$a, array &$data)
{ {
$enabled = DI::pConfig()->get(local_user(), 'mailstream', 'enabled'); $enabled = DI::pConfig()->get(local_user(), 'mailstream', 'enabled');
$address = DI::pConfig()->get(local_user(), 'mailstream', 'address'); $address = DI::pConfig()->get(local_user(), 'mailstream', 'address');
$nolikes = DI::pConfig()->get(local_user(), 'mailstream', 'nolikes'); $nolikes = DI::pConfig()->get(local_user(), 'mailstream', 'nolikes');
$attachimg= DI::pConfig()->get(local_user(), 'mailstream', 'attachimg'); $attachimg = DI::pConfig()->get(local_user(), 'mailstream', 'attachimg');
$template = Renderer::getMarkupTemplate('settings.tpl', 'addon/mailstream/'); $template = Renderer::getMarkupTemplate('settings.tpl', 'addon/mailstream/');
$s .= Renderer::replaceMacros($template, [ $html = Renderer::replaceMacros($template, [
'$enabled' => [ '$enabled' => [
'mailstream_enabled', 'mailstream_enabled',
DI::l10n()->t('Enabled'), DI::l10n()->t('Enabled'),
@ -482,31 +485,36 @@ function mailstream_addon_settings(&$a, &$s)
'mailstream_address', 'mailstream_address',
DI::l10n()->t('Email Address'), DI::l10n()->t('Email Address'),
$address, $address,
DI::l10n()->t("Leave blank to use your account email address") DI::l10n()->t('Leave blank to use your account email address')
], ],
'$nolikes' => [ '$nolikes' => [
'mailstream_nolikes', 'mailstream_nolikes',
DI::l10n()->t('Exclude Likes'), DI::l10n()->t('Exclude Likes'),
$nolikes, $nolikes,
DI::l10n()->t("Check this to omit mailing \"Like\" notifications") DI::l10n()->t('Check this to omit mailing "Like" notifications')
], ],
'$attachimg' => [ '$attachimg' => [
'mailstream_attachimg', 'mailstream_attachimg',
DI::l10n()->t('Attach Images'), DI::l10n()->t('Attach Images'),
$attachimg, $attachimg,
DI::l10n()->t("Download images in posts and attach them to the email. " . DI::l10n()->t('Download images in posts and attach them to the email. ' .
"Useful for reading email while offline.") 'Useful for reading email while offline.')
], ],
'$title' => DI::l10n()->t('Mail Stream Settings'), ]);
'$submit' => DI::l10n()->t('Save Settings')]);
$data = [
'addon' => 'mailstream',
'title' => DI::l10n()->t('Mail Stream Settings'),
'html' => $html,
];
} }
/** /**
* Process data submitted to user's mailstream features form * Process data submitted to user's mailstream features form
* @param \Friendica\App $a * @param App $a
* @param array $post POST data * @param array $post POST data
*/ */
function mailstream_addon_settings_post(\Friendica\App $a, array $post) function mailstream_addon_settings_post(App $a, array $post)
{ {
if (!local_user() || empty($post['mailstream-submit'])) { if (!local_user() || empty($post['mailstream-submit'])) {
return; return;

View File

@ -1,13 +1,4 @@
<span id="settings_mailstream_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mailstream_expanded'); openClose('settings_mailstream_inflated');"> {{include file="field_checkbox.tpl" field=$enabled}}
<h3>{{$title}}</h3> {{include file="field_input.tpl" field=$address}}
</span> {{include file="field_checkbox.tpl" field=$nolikes}}
<div id="settings_mailstream_expanded" class="settings-block" style="display: none;"> {{include file="field_checkbox.tpl" field=$attachimg}}
<span class="fakelink" onclick="openClose('settings_mailstream_expanded'); openClose('settings_mailstream_inflated');">
<h3>{{$title}}</h3>
</span>
{{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}}
<input type="submit" name="mailstream-submit" value="{{$submit}}">
</div>

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,18 +18,13 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: markdown.php:30 #: markdown.php:30
msgid "Markdown"
msgstr ""
#: markdown.php:31
msgid "Enable Markdown parsing" msgid "Enable Markdown parsing"
msgstr "" msgstr ""
#: markdown.php:31 #: markdown.php:30
msgid "" msgid "If enabled, adds Markdown support to the Compose Post form."
"If enabled, self created items will additionally be parsed via Markdown."
msgstr "" msgstr ""
#: markdown.php:32 #: markdown.php:35
msgid "Save Settings" msgid "Markdown Settings"
msgstr "" msgstr ""

View File

@ -17,7 +17,7 @@ function markdown_install() {
Hook::register('addon_settings_post', __FILE__, 'markdown_addon_settings_post'); Hook::register('addon_settings_post', __FILE__, 'markdown_addon_settings_post');
} }
function markdown_addon_settings(App $a, &$s) function markdown_addon_settings(App $a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
@ -26,11 +26,15 @@ function markdown_addon_settings(App $a, &$s)
$enabled = intval(DI::pConfig()->get(local_user(), 'markdown', 'enabled')); $enabled = intval(DI::pConfig()->get(local_user(), 'markdown', 'enabled'));
$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/markdown/'); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/markdown/');
$s .= Renderer::replaceMacros($t, [ $html = Renderer::replaceMacros($t, [
'$title' => DI::l10n()->t('Markdown'), '$enabled' => ['enabled', DI::l10n()->t('Enable Markdown parsing'), $enabled, DI::l10n()->t('If enabled, adds Markdown support to the Compose Post form.')],
'$enabled' => ['enabled', DI::l10n()->t('Enable Markdown parsing'), $enabled, DI::l10n()->t('If enabled, self created items will additionally be parsed via Markdown.')],
'$submit' => DI::l10n()->t('Save Settings'),
]); ]);
$data = [
'addon' => 'markdown',
'title' => DI::l10n()->t('Markdown Settings'),
'html' => $html,
];
} }
function markdown_addon_settings_post(App $a, &$b) function markdown_addon_settings_post(App $a, &$b)

View File

@ -1,15 +1 @@
<span id="settings_markdown_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_markdown_expanded'); openClose('settings_markdown_inflated');"> {{include file="field_checkbox.tpl" field=$enabled}}
<h3>{{$title}}</h3>
</span>
<div id="settings_markdown_expanded" class="settings-block" style="display: none;">
<span class="fakelink" onclick="openClose('settings_markdown_expanded'); openClose('settings_markdown_inflated');">
<h3>{{$title}}</h3>
</span>
<div id="markdown-wrapper">
{{include file="field_checkbox.tpl" field=$enabled}}
</div>
<div class="settings-submit-wrapper" >
<input type="submit" id="markdown-submit" name="markdown-submit" class="settings-submit" value="{{$submit}}" />
</div>
</div>

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,17 +17,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: mathjax.php:43 #: mathjax.php:42
msgid "" msgid ""
"The MathJax addon renders mathematical formulae written using the LaTeX " "The MathJax addon renders mathematical formulae written using the LaTeX "
"syntax surrounded by the usual $$ or an eqnarray block in the postings of " "syntax surrounded by the usual $$ or an eqnarray block in the postings of "
"your wall,network tab and private mail." "your wall,network tab and private mail."
msgstr "" msgstr ""
#: mathjax.php:44 #: mathjax.php:43
msgid "Use the MathJax renderer" msgid "Use the MathJax renderer"
msgstr "" msgstr ""
#: mathjax.php:45
msgid "Save Settings"
msgstr ""

View File

@ -29,7 +29,7 @@ function mathjax_settings_post($a)
DI::pConfig()->set(local_user(), 'mathjax', 'use', intval($_POST['mathjax_use'])); DI::pConfig()->set(local_user(), 'mathjax', 'use', intval($_POST['mathjax_use']));
} }
function mathjax_settings(App $a, &$s) function mathjax_settings(App $a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
@ -38,12 +38,16 @@ function mathjax_settings(App $a, &$s)
$use = DI::pConfig()->get(local_user(), 'mathjax', 'use', false); $use = DI::pConfig()->get(local_user(), 'mathjax', 'use', false);
$tpl = Renderer::getMarkupTemplate('settings.tpl', 'addon/mathjax'); $tpl = Renderer::getMarkupTemplate('settings.tpl', 'addon/mathjax');
$s .= Renderer::replaceMacros($tpl, [ $html = Renderer::replaceMacros($tpl, [
'$title' => 'MathJax',
'$description' => DI::l10n()->t('The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'), '$description' => DI::l10n()->t('The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'),
'$mathjax_use' => ['mathjax_use', DI::l10n()->t('Use the MathJax renderer'), $use, ''], '$mathjax_use' => ['mathjax_use', DI::l10n()->t('Use the MathJax renderer'), $use, ''],
'$savesettings' => DI::l10n()->t('Save Settings'),
]); ]);
$data = [
'addon' => 'mathjax',
'title' => 'MathJax',
'html' => $html,
];
} }
function mathjax_footer(App $a, &$b) function mathjax_footer(App $a, &$b)

View File

@ -1,16 +1,2 @@
<p>{{$description}}</p>
<span id="settings_mathjax_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mathjax_expanded'); openClose('settings_mathjax_inflated');"> {{include file="field_checkbox.tpl" field=$mathjax_use}}
<h3>{{$title}}</h3>
</span>
<div id="settings_mathjax_expanded" class="settings-block" style="display: none;">
<span class="fakelink" onclick="openClose('settings_mathjax_expanded'); openClose('settings_mathjax_inflated');">
<h3>{{$title}}</h3>
</span>
<p>{{$description nofilter}}</p>
{{include file="field_checkbox.tpl" field=$mathjax_use}}
<div class="clear"></div>
<div class="settings-submit-wrapper">
<button type="submit" id="mathjax-submit" name="mathjax-submit" class="settings-submit" value="1">{{$savesettings}}</button>
</div>
</div>

View File

@ -0,0 +1 @@
{{include file="field_checkbox.tpl" field=$enabled}}

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,11 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: nsfw.php:68 nsfw.php:72 #: nsfw.php:65
msgid "Content Filter (NSFW and more)"
msgstr ""
#: nsfw.php:76
msgid "" msgid ""
"This addon searches for specified words/text in posts and collapses them. It " "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 " "can be used to filter content tagged with for instance #NSFW that may be "
@ -29,28 +25,28 @@ msgid ""
"is also useful for hiding irrelevant or annoying content from direct view." "is also useful for hiding irrelevant or annoying content from direct view."
msgstr "" msgstr ""
#: nsfw.php:77 #: nsfw.php:66
msgid "Enable Content filter" msgid "Enable Content filter"
msgstr "" msgstr ""
#: nsfw.php:80 #: nsfw.php:67
msgid "Comma separated list of keywords to hide" msgid "Comma separated list of keywords to hide"
msgstr "" msgstr ""
#: nsfw.php:84 #: nsfw.php:67
msgid "Save Settings"
msgstr ""
#: nsfw.php:85
msgid "Use /expression/ to provide regular expressions" msgid "Use /expression/ to provide regular expressions"
msgstr "" msgstr ""
#: nsfw.php:152 #: nsfw.php:72
msgid "Content Filter (NSFW and more)"
msgstr ""
#: nsfw.php:140
#, php-format #, php-format
msgid "Filtered tag: %s" msgid "Filtered tag: %s"
msgstr "" msgstr ""
#: nsfw.php:154 #: nsfw.php:142
#, php-format #, php-format
msgid "Filtered word: %s" msgid "Filtered word: %s"
msgstr "" msgstr ""

View File

@ -1,19 +0,0 @@
#nsfw-label, #nsfw-enable-label {
float: left;
width: 300px;
margin-top: 10px;
}
#nsfw-words, #nsfw-enable {
float: left;
margin-top: 10px;
}
#nsfw-submit {
margin-top: 15px;
}
.nsfw-desc {
margin-top: 10px;
}

View File

@ -7,7 +7,10 @@
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike> * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
* *
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
function nsfw_install() function nsfw_install()
@ -48,42 +51,27 @@ function nsfw_extract_photos($body)
return $new_body; return $new_body;
} }
function nsfw_addon_settings(&$a, &$s) function nsfw_addon_settings(App &$a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
} }
/* Add our stylesheet to the page so we can make our settings look nice */ $enabled = !DI::pConfig()->get(local_user(), 'nsfw', 'disable');
$words = DI::pConfig()->get(local_user(), 'nsfw', 'words', 'nsfw,');
DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n"; $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/nsfw/');
$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')],
]);
$enable_checked = (intval(DI::pConfig()->get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" '); $data = [
$words = DI::pConfig()->get(local_user(), 'nsfw', 'words'); 'addon' => 'nsfw',
if (!$words) { 'title' => DI::l10n()->t('Content Filter (NSFW and more)'),
$words = 'nsfw,'; 'html' => $html,
} ];
$s .= '<span id="settings_nsfw_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
$s .= '<h3>' . DI::l10n()->t('Content Filter (NSFW and more)') . '</h3>';
$s .= '</span>';
$s .= '<div id="settings_nsfw_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
$s .= '<h3>' . DI::l10n()->t('Content Filter (NSFW and more)') . '</h3>';
$s .= '</span>';
$s .= '<div id="nsfw-wrapper">';
$s .= '<p>' . 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.') . '</p>';
$s .= '<label id="nsfw-enable-label" for="nsfw-enable">' . DI::l10n()->t('Enable Content filter') . ' </label>';
$s .= '<input id="nsfw-enable" type="checkbox" name="nsfw-enable" value="1"' . $enable_checked . ' />';
$s .= '<div class="clear"></div>';
$s .= '<label id="nsfw-label" for="nsfw-words">' . DI::l10n()->t('Comma separated list of keywords to hide') . ' </label>';
$s .= '<textarea id="nsfw-words" type="text" name="nsfw-words">' . $words . '</textarea>';
$s .= '</div><div class="clear"></div>';
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="nsfw-submit" name="nsfw-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div>';
$s .= '<div class="nsfw-desc">' . DI::l10n()->t('Use /expression/ to provide regular expressions') . '</div></div>';
return;
} }
function nsfw_addon_settings_post(&$a, &$b) 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; $words = null;
if (DI::pConfig()->get(local_user(), 'nsfw', 'disable')) { if (DI::pConfig()->get(local_user(), 'nsfw', 'disable')) {

View File

@ -0,0 +1,3 @@
<p>{{$info}}</p>
{{include file="field_checkbox.tpl" field=$enabled}}
{{include file="field_textarea.tpl" field=$words}}

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,14 +17,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: numfriends.php:59 #: numfriends.php:55
msgid "Numfriends Settings"
msgstr ""
#: numfriends.php:61
msgid "How many contacts to display on profile sidebar" msgid "How many contacts to display on profile sidebar"
msgstr "" msgstr ""
#: numfriends.php:67 #: numfriends.php:60
msgid "Save Settings" msgid "Numfriends Settings"
msgstr "" msgstr ""

View File

@ -1,14 +0,0 @@
#numfriends-label {
float: left;
width: 200px;
margin-bottom: 25px;
}
#numfriends {
float: left;
}

View File

@ -5,8 +5,11 @@
* Version: 1.0 * Version: 1.0
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike> * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
function numfriends_install() { function numfriends_install() {
@ -39,30 +42,22 @@ function numfriends_settings_post($a,$post) {
* Add our own settings info to the page. * Add our own settings info to the page.
* *
*/ */
function numfriends_settings(&$a, &$s) function numfriends_settings(App &$a, array &$data)
{ {
if (! local_user()) { if (! local_user()) {
return; return;
} }
/* Add our stylesheet to the page so we can make our settings look nice */
DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/numfriends/numfriends.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */
$numfriends = DI::pConfig()->get(local_user(), 'system', 'display_friend_count', 24); $numfriends = DI::pConfig()->get(local_user(), 'system', 'display_friend_count', 24);
/* Add some HTML to the existing form */ $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/numfriends/');
$html = Renderer::replaceMacros($t, [
'$numfriends' => ['numfriends', DI::l10n()->t('How many contacts to display on profile sidebar'), $numfriends],
]);
$s .= '<div class="settings-block">'; $data = [
$s .= '<h3>' . DI::l10n()->t('Numfriends Settings') . '</h3>'; 'addon' => 'numfriends',
$s .= '<div id="numfriends-wrapper">'; 'title' => DI::l10n()->t('Numfriends Settings'),
$s .= '<label id="numfriends-label" for="numfriends">' . DI::l10n()->t('How many contacts to display on profile sidebar') . '</label>'; 'html' => $html,
$s .= '<input id="numfriends-input" type="text" name="numfriends" value="' . intval($numfriends) . '" ' . '/>'; ];
$s .= '</div><div class="clear"></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="numfriends-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
} }

View File

@ -0,0 +1 @@
{{include file="field_input.tpl" field=$numfriends}}

View File

@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: opmlexport.php:79
msgid "OPML Export"
msgstr ""
#: opmlexport.php:80
msgid "Export RSS/Atom contacts"
msgstr ""

View File

@ -68,17 +68,17 @@ function opmlexport(App $a)
} }
function opmlexport_addon_settings(App $a, &$s) function opmlexport_addon_settings(App $a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
} }
$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/opmlexport/'); $data = [
$s .= Renderer::replaceMacros($t, [ 'addon' => 'opmlexport',
'$title' => DI::l10n()->t('OPML Export'), 'title' => DI::l10n()->t('OPML Export'),
'$submit' => DI::l10n()->t('Export RSS/Atom contacts'), 'submit' => DI::l10n()->t('Export RSS/Atom contacts'),
]); ];
} }

View File

@ -1,12 +0,0 @@
<span id="settings_opmlexport_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_opmlexport_expanded'); openClose('settings_opmlexport_inflated');">
<h3>{{$title}}</h3>
</span>
<div id="settings_opmlexport_expanded" class="settings-block" style="display: none;">
<span class="fakelink" onclick="openClose('settings_opmlexport_expanded'); openClose('settings_opmlexport_inflated');">
<h3>{{$title}}</h3>
</span>
<div class="settings-submit-wrapper" >
<input type="submit" id="opmlexport-submit" name="opmlexport-submit" class="settings-submit" value="{{$submit}}" />
</div>
</div>

View File

@ -23,9 +23,7 @@ function pageheader_addon_admin(App &$a, &$s)
return; return;
} }
/* Add our stylesheet to the page so we can make our settings look nice */ DI::page()->registerStylesheet(__DIR__ . '/pageheader.css');
$stylesheetPath = __DIR__ . '/pageheader.css';
DI::page()->registerStylesheet($stylesheetPath);
$words = DI::config()->get('pageheader','text'); $words = DI::config()->get('pageheader','text');
if(! $words) if(! $words)
@ -62,8 +60,7 @@ function pageheader_fetch(App $a, &$b)
$s = DI::config()->get('pageheader', 'text'); $s = DI::config()->get('pageheader', 'text');
} }
$stylesheetPath = __DIR__ .'/pageheader.css'; DI::page()->registerStylesheet(__DIR__ .'/pageheader.css');
DI::page()->registerStylesheet($stylesheetPath);
if ($s) { if ($s) {
$b .= '<div class="pageheader">' . $s . '</div>'; $b .= '<div class="pageheader">' . $s . '</div>';

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,18 +17,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: planets.php:131 planets.php:135 #: planets.php:126
msgid "Planets"
msgstr ""
#: planets.php:139
msgid "Planets Settings"
msgstr ""
#: planets.php:141
msgid "Enable Planets Addon" msgid "Enable Planets Addon"
msgstr "" msgstr ""
#: planets.php:147 #: planets.php:131
msgid "Save Settings" msgid "Planets Settings"
msgstr "" msgstr ""

View File

@ -1,14 +0,0 @@
#planets-enable-label {
float: left;
width: 200px;
margin-bottom: 25px;
}
#planets-checkbox {
float: left;
}

View File

@ -6,8 +6,11 @@
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike> * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
* Author: Tony Baldwin <https://free-haven.org/profile/tony> * Author: Tony Baldwin <https://free-haven.org/profile/tony>
*/ */
use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
function planets_install() { function planets_install() {
@ -110,40 +113,22 @@ function planets_settings_post($a,$post) {
function planets_settings(&$a,&$s) { function planets_settings(App &$a, array &$data)
{
if(! local_user()) if(! local_user()) {
return; return;
}
/* Add our stylesheet to the page so we can make our settings look nice */
DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/planets/planets.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variable */
$enabled = DI::pConfig()->get(local_user(),'planets','enable'); $enabled = DI::pConfig()->get(local_user(),'planets','enable');
$checked = (($enabled) ? ' checked="checked" ' : ''); $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/planets/');
$html = Renderer::replaceMacros($t, [
/* Add some HTML to the existing form */ '$enabled' => ['planets', DI::l10n()->t('Enable Planets Addon'), $enabled],
]);
$s .= '<span id="settings_planets_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_planets_expanded\'); openClose(\'settings_planets_inflated\');">';
$s .= '<h3>' . DI::l10n()->t('Planets') . '</h3>';
$s .= '</span>';
$s .= '<div id="settings_planets_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_planets_expanded\'); openClose(\'settings_planets_inflated\');">';
$s .= '<h3>' . DI::l10n()->t('Planets') . '</h3>';
$s .= '</span>';
$s .= '<div class="settings-block">';
$s .= '<h3>' . DI::l10n()->t('Planets Settings') . '</h3>';
$s .= '<div id="planets-enable-wrapper">';
$s .= '<label id="planets-enable-label" for="planets-checkbox">' . DI::l10n()->t('Enable Planets Addon') . '</label>';
$s .= '<input id="planets-checkbox" type="checkbox" name="planets" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div></div>';
/* provide a submit button */
$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="planets-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
$data = [
'addon' => 'planets',
'title' => DI::l10n()->t('Planets Settings'),
'html' => $html,
];
} }

View File

@ -0,0 +1 @@
{{include file="field_checkbox.tpl" field=$enabled}}

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,76 +17,76 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: pumpio.php:54 #: pumpio.php:57
msgid "Permission denied." msgid "Permission denied."
msgstr "" msgstr ""
#: pumpio.php:149 #: pumpio.php:152
#, php-format #, php-format
msgid "Unable to register the client at the pump.io server '%s'." msgid "Unable to register the client at the pump.io server '%s'."
msgstr "" msgstr ""
#: pumpio.php:189 #: pumpio.php:192
msgid "You are now authenticated to pumpio." msgid "You are now authenticated to pumpio."
msgstr "" msgstr ""
#: pumpio.php:190 #: pumpio.php:193
msgid "return to the connector page" msgid "return to the connector page"
msgstr "" msgstr ""
#: pumpio.php:210 #: pumpio.php:213
msgid "Post to pumpio" msgid "Post to pumpio"
msgstr "" msgstr ""
#: pumpio.php:251 pumpio.php:255 #: pumpio.php:237
msgid "Pump.io Import/Export/Mirror"
msgstr ""
#: pumpio.php:259
msgid "pump.io username (without the servername)"
msgstr ""
#: pumpio.php:264
msgid "pump.io servername (without \"http://\" or \"https://\" )"
msgstr ""
#: pumpio.php:275
msgid "Authenticate your pump.io connection"
msgstr ""
#: pumpio.php:279
msgid "Import the remote timeline"
msgstr ""
#: pumpio.php:284
msgid "Enable pump.io Post Addon"
msgstr ""
#: pumpio.php:289
msgid "Post to pump.io by default"
msgstr ""
#: pumpio.php:294
msgid "Should posts be public?"
msgstr ""
#: pumpio.php:299
msgid "Mirror all public posts"
msgstr ""
#: pumpio.php:304
msgid "Check to delete this preset"
msgstr ""
#: pumpio.php:314
msgid "Save Settings" msgid "Save Settings"
msgstr "" msgstr ""
#: pumpio.php:983 #: pumpio.php:239
msgid "Delete this preset"
msgstr ""
#: pumpio.php:245
msgid "Authenticate your pump.io connection"
msgstr ""
#: pumpio.php:252
msgid "Pump.io servername (without \"http://\" or \"https://\" )"
msgstr ""
#: pumpio.php:253
msgid "Pump.io username (without the servername)"
msgstr ""
#: pumpio.php:254
msgid "Import the remote timeline"
msgstr ""
#: pumpio.php:255
msgid "Enable Pump.io Post Addon"
msgstr ""
#: pumpio.php:256
msgid "Post to Pump.io by default"
msgstr ""
#: pumpio.php:257
msgid "Should posts be public?"
msgstr ""
#: pumpio.php:258
msgid "Mirror all public posts"
msgstr ""
#: pumpio.php:263
msgid "Pump.io Import/Export/Mirror"
msgstr ""
#: pumpio.php:920
msgid "status" msgid "status"
msgstr "" msgstr ""
#: pumpio.php:987 #: pumpio.php:924
#, php-format #, php-format
msgid "%1$s likes %2$s's %3$s" msgid "%1$s likes %2$s's %3$s"
msgstr "" msgstr ""

View File

@ -1,16 +0,0 @@
#pumpio-import-label,#pumpio-mirror-label,#pumpio-public-label, #pumpio-enable-label, #pumpio-username-label, #pumpio-servername-label, #pumpio-bydefault-label, #pumpio-delete-label {
float: left;
width: 200px;
margin-top: 10px;
}
#pumpio-import,#pumpio-mirror,#pumpio-public, #pumpio-checkbox, #pumpio-username, #pumpio-servername, #pumpio-bydefault, #pumpio-delete {
float: left;
margin-top: 10px;
}
#pumpio-submit {
margin-top: 15px;
}

View File

@ -13,6 +13,7 @@ use Friendica\Core\Addon;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
@ -216,109 +217,59 @@ function pumpio_jot_nets(App $a, array &$jotnets_fields)
} }
} }
function pumpio_settings(App $a, &$s) function pumpio_settings(App $a, array &$data)
{ {
if (!local_user()) { if (!local_user()) {
return; return;
} }
/* Add our stylesheet to the page so we can make our settings look nice */ $pumpio_host = DI::pConfig()->get(local_user(), 'pumpio', 'host');
$pumpio_user = DI::pConfig()->get(local_user(), 'pumpio', 'user');
$oauth_token = DI::pConfig()->get(local_user(), 'pumpio', 'oauth_token');
$oauth_token_secret = DI::pConfig()->get(local_user(), 'pumpio', 'oauth_token_secret');
DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl()->get() . '/addon/pumpio/pumpio.css' . '" media="all" />' . "\r\n"; $import_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'import', false);
$enabled = DI::pConfig()->get(local_user(), 'pumpio', 'post', false);
$def_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'post_by_default', false);
$public_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'public', false);
$mirror_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'mirror', false);
/* Get the current state of our config variables */ $submit = ['pumpio-submit' => DI::l10n()->t('Save Settings')];
if ($oauth_token && $oauth_token_secret) {
$import_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'import'); $submit['pumpio-delete'] = DI::l10n()->t('Delete this preset');
$import_checked = (($import_enabled) ? ' checked="checked" ' : '');
$enabled = DI::pConfig()->get(local_user(), 'pumpio', 'post');
$checked = (($enabled) ? ' checked="checked" ' : '');
$css = (($enabled) ? '' : '-disabled');
$def_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
$public_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'public');
$public_checked = (($public_enabled) ? ' checked="checked" ' : '');
$mirror_enabled = DI::pConfig()->get(local_user(), 'pumpio', 'mirror');
$mirror_checked = (($mirror_enabled) ? ' checked="checked" ' : '');
$servername = DI::pConfig()->get(local_user(), "pumpio", "host");
$username = DI::pConfig()->get(local_user(), "pumpio", "user");
/* Add some HTML to the existing form */
$s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
$s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. DI::l10n()->t('Pump.io Import/Export/Mirror').'</h3>';
$s .= '</span>';
$s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
$s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. DI::l10n()->t('Pump.io Import/Export/Mirror').'</h3>';
$s .= '</span>';
$s .= '<div id="pumpio-username-wrapper">';
$s .= '<label id="pumpio-username-label" for="pumpio-username">'.DI::l10n()->t('pump.io username (without the servername)').'</label>';
$s .= '<input id="pumpio-username" type="text" name="pumpio_user" value="'.$username.'" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="pumpio-servername-wrapper">';
$s .= '<label id="pumpio-servername-label" for="pumpio-servername">'.DI::l10n()->t('pump.io servername (without "http://" or "https://" )').'</label>';
$s .= '<input id="pumpio-servername" type="text" name="pumpio_host" value="'.$servername.'" />';
$s .= '</div><div class="clear"></div>';
if (($username != '') && ($servername != '')) {
$oauth_token = DI::pConfig()->get(local_user(), "pumpio", "oauth_token");
$oauth_token_secret = DI::pConfig()->get(local_user(), "pumpio", "oauth_token_secret");
$s .= '<div id="pumpio-password-wrapper">';
if (($oauth_token == "") || ($oauth_token_secret == "")) {
$s .= '<div id="pumpio-authenticate-wrapper">';
$s .= '<a href="'.DI::baseUrl()->get().'/pumpio/connect">'.DI::l10n()->t("Authenticate your pump.io connection").'</a>';
$s .= '</div><div class="clear"></div>';
} else {
$s .= '<div id="pumpio-import-wrapper">';
$s .= '<label id="pumpio-import-label" for="pumpio-import">' . DI::l10n()->t('Import the remote timeline') . '</label>';
$s .= '<input id="pumpio-import" type="checkbox" name="pumpio_import" value="1" ' . $import_checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="pumpio-enable-wrapper">';
$s .= '<label id="pumpio-enable-label" for="pumpio-checkbox">' . DI::l10n()->t('Enable pump.io Post Addon') . '</label>';
$s .= '<input id="pumpio-checkbox" type="checkbox" name="pumpio" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="pumpio-bydefault-wrapper">';
$s .= '<label id="pumpio-bydefault-label" for="pumpio-bydefault">' . DI::l10n()->t('Post to pump.io by default') . '</label>';
$s .= '<input id="pumpio-bydefault" type="checkbox" name="pumpio_bydefault" value="1" ' . $def_checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="pumpio-public-wrapper">';
$s .= '<label id="pumpio-public-label" for="pumpio-public">' . DI::l10n()->t('Should posts be public?') . '</label>';
$s .= '<input id="pumpio-public" type="checkbox" name="pumpio_public" value="1" ' . $public_checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="pumpio-mirror-wrapper">';
$s .= '<label id="pumpio-mirror-label" for="pumpio-mirror">' . DI::l10n()->t('Mirror all public posts') . '</label>';
$s .= '<input id="pumpio-mirror" type="checkbox" name="pumpio_mirror" value="1" ' . $mirror_checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="pumpio-delete-wrapper">';
$s .= '<label id="pumpio-delete-label" for="pumpio-delete">' . DI::l10n()->t('Check to delete this preset') . '</label>';
$s .= '<input id="pumpio-delete" type="checkbox" name="pumpio_delete" value="1" />';
$s .= '</div><div class="clear"></div>';
} }
$s .= '</div><div class="clear"></div>'; $t = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/pumpio/');
} $html = Renderer::replaceMacros($t, [
'$l10n' => [
'authenticate' => DI::l10n()->t('Authenticate your pump.io connection'),
],
'$pumpio_host' => $pumpio_host,
'$pumpio_user' => $pumpio_user,
'$oauth_token' => $oauth_token,
'$oauth_token_secret' => $oauth_token_secret,
'$authenticate_url' => DI::baseUrl()->get() . '/pumpio/connect',
'$servername' => ['pumpio_host', DI::l10n()->t('Pump.io servername (without "http://" or "https://" )'), $pumpio_host],
'$username' => ['pumpio_user', DI::l10n()->t('Pump.io username (without the servername)'), $pumpio_user],
'$import' => ['pumpio_import', DI::l10n()->t('Import the remote timeline'), $import_enabled],
'$enabled' => ['pumpio', DI::l10n()->t('Enable Pump.io Post Addon'), $enabled],
'$bydefault' => ['pumpio_bydefault', DI::l10n()->t('Post to Pump.io by default'), $def_enabled],
'$public' => ['pumpio_public', DI::l10n()->t('Should posts be public?'), $public_enabled],
'$mirror' => ['pumpio_mirror', DI::l10n()->t('Mirror all public posts'), $mirror_enabled],
]);
/* provide a submit button */ $data = [
'connector' => 'pumpio',
$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>'; '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) function pumpio_settings_post(App $a, array &$b)
{ {
if (!empty($_POST['pumpio-submit'])) {
if (!empty($_POST['pumpio_delete'])) { if (!empty($_POST['pumpio_delete'])) {
DI::pConfig()->set(local_user(), 'pumpio', 'consumer_key' , ''); DI::pConfig()->set(local_user(), 'pumpio', 'consumer_key' , '');
DI::pConfig()->set(local_user(), 'pumpio', 'consumer_secret' , ''); DI::pConfig()->set(local_user(), 'pumpio', 'consumer_secret' , '');
@ -333,7 +284,7 @@ function pumpio_settings_post(App $a, array &$b)
DI::pConfig()->set(local_user(), 'pumpio', 'post_by_default' , 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', 'lastdate' , 0);
DI::pConfig()->set(local_user(), 'pumpio', 'last_id' , ''); DI::pConfig()->set(local_user(), 'pumpio', 'last_id' , '');
} else { } elseif (!empty($_POST['pumpio-submit'])) {
// filtering the username if it is filled wrong // filtering the username if it is filled wrong
$user = $_POST['pumpio_user']; $user = $_POST['pumpio_user'];
if (strstr($user, "@")) { if (strstr($user, "@")) {
@ -361,7 +312,6 @@ function pumpio_settings_post(App $a, array &$b)
DI::pConfig()->delete(local_user(), 'pumpio', 'lastdate'); DI::pConfig()->delete(local_user(), 'pumpio', 'lastdate');
} }
} }
}
} }
function pumpio_load_config(App $a, ConfigFileLoader $loader) function pumpio_load_config(App $a, ConfigFileLoader $loader)

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