friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

[mailstream] Add a name to the addon settings submit button #1141

Merged
MrPetovan merged 2 commits from bug/10439-addon-settings-forms into 2021.06-rc 2021-06-29 07:24:01 +02:00
Conversation 0 Commits 2 Files changed 3 +46 -43
3 changed files with 46 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
catavatar/catavatar.php
View file

@ -64,13 +64,6 @@ function catavatar_addon_settings_post(App $a, &$s)
return;
}
// delete the current cached cat avatar
$condition = ['uid' => local_user(), 'blocked' => false,
'account_expired' => false, 'account_removed' => false];
$user = DBA::selectFirst('user', ['email'], $condition);
$seed = DI::pConfig()->get(local_user(), 'catavatar', 'seed', md5(trim(strtolower($user['email']))));
if (!empty($_POST['catavatar-usecat'])) {
$url = DI::baseUrl()->get() . '/catavatar/' . local_user() . '?ts=' . time();

36
mailstream/mailstream.php
View file

@ -494,49 +494,59 @@ function mailstream_addon_settings(&$a, &$s)
'$enabled' => [
'mailstream_enabled',
DI::l10n()->t('Enabled'),
$enabled],
$enabled
],
'$address' => [
'mailstream_address',
DI::l10n()->t('Email 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' => [
'mailstream_nolikes',
DI::l10n()->t('Exclude Likes'),
$nolikes,
DI::l10n()->t("Check this to omit mailing \"Like\" notifications")],
DI::l10n()->t("Check this to omit mailing \"Like\" notifications")
],
'$attachimg' => [
'mailstream_attachimg',
DI::l10n()->t('Attach Images'),
$attachimg,
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')]);
}
/**
* Process data submitted to user's mailstream features form
* @param \Friendica\App $a
* @param array $post POST data
*/
function mailstream_addon_settings_post()
function mailstream_addon_settings_post(\Friendica\App $a, array $post)
{
if ($_POST['mailstream_address'] != "") {
DI::pConfig()->set(local_user(), 'mailstream', 'address', $_POST['mailstream_address']);
if (!local_user() || empty($post['mailstream-submit'])) {
return;
}
if ($post['mailstream_address'] != "") {
DI::pConfig()->set(local_user(), 'mailstream', 'address', $post['mailstream_address']);
} else {
DI::pConfig()->delete(local_user(), 'mailstream', 'address');
}
if ($_POST['mailstream_nolikes']) {
DI::pConfig()->set(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']);
if ($post['mailstream_nolikes']) {
DI::pConfig()->set(local_user(), 'mailstream', 'nolikes', $post['mailstream_enabled']);
} else {
DI::pConfig()->delete(local_user(), 'mailstream', 'nolikes');
}
if ($_POST['mailstream_enabled']) {
DI::pConfig()->set(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']);
if ($post['mailstream_enabled']) {
DI::pConfig()->set(local_user(), 'mailstream', 'enabled', $post['mailstream_enabled']);
} else {
DI::pConfig()->delete(local_user(), 'mailstream', 'enabled');
}
if ($_POST['mailstream_attachimg']) {
DI::pConfig()->set(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']);
if ($post['mailstream_attachimg']) {
DI::pConfig()->set(local_user(), 'mailstream', 'attachimg', $post['mailstream_attachimg']);
} else {
DI::pConfig()->delete(local_user(), 'mailstream', 'attachimg');
}

2
mailstream/templates/settings.tpl
View file

@ -9,5 +9,5 @@
{{include file="field_input.tpl" field=$address}}
{{include file="field_checkbox.tpl" field=$nolikes}}
{{include file="field_checkbox.tpl" field=$attachimg}}
<input type="submit" value="{{$submit}}">
<input type="submit" name="mailstream-submit" value="{{$submit}}">
</div>