From b733391e857068e20b0cd01d7ab8b77d485ee00a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 7 May 2020 00:16:40 -0400 Subject: [PATCH] [diaspora] Overhaul connector settings - Move HTML in template file - Use standard form fields - Hide irrelevant fields depending on the connector status (disabled, enabled, error) - Add notice messages on settings submit --- diaspora/diaspora.php | 144 ++++++++++++-------------------- diaspora/lang/C/messages.po | 102 ++++++++++++++++------ diaspora/templates/settings.tpl | 47 +++++++++++ 3 files changed, 178 insertions(+), 115 deletions(-) create mode 100644 diaspora/templates/settings.tpl diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index 380a4df8..edf6922d 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -13,6 +13,8 @@ use Friendica\App; use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\Core\Renderer; +use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\Core\Worker; use Friendica\DI; @@ -61,121 +63,83 @@ function diaspora_settings(App $a, &$s) return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - - DI::page()['htmlhead'] .= '' . "\r\n"; - /* Get the current state of our config variables */ $enabled = DI::pConfig()->get(local_user(),'diaspora','post'); - $checked = (($enabled) ? ' checked="checked" ' : ''); - $css = (($enabled) ? '' : '-disabled'); - $def_enabled = DI::pConfig()->get(local_user(),'diaspora','post_by_default'); - $def_checked = (($def_enabled) ? ' checked="checked" ' : ''); - $handle = DI::pConfig()->get(local_user(), 'diaspora', 'handle'); $password = DI::pConfig()->get(local_user(), 'diaspora', 'password'); $aspect = DI::pConfig()->get(local_user(),'diaspora','aspect'); - $status = ""; - - $r = q("SELECT `addr` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user())); - - if (DBA::isResult($r)) { - $status = DI::l10n()->t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. ", $r[0]['addr']); - $status .= DI::l10n()->t('This connector is only meant if you still want to use your old Diaspora account for some time. '); - $status .= DI::l10n()->t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.', $r[0]['addr']); + $info = ''; + $error = ''; + if (Session::get('my_address')) { + $info = DI::l10n()->t('Please remember: You can always be reached from Diaspora with your Friendica handle %s. ', Session::get('my_address')); + $info .= DI::l10n()->t('This connector is only meant if you still want to use your old Diaspora account for some time. '); + $info .= DI::l10n()->t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.', Session::get('my_address')); } - $aspects = false; - + $aspect_select = ''; if ($handle && $password) { $conn = new Diaspora_Connection($handle, $password); $conn->logIn(); - $aspects = $conn->getAspects(); + $rawAspects = $conn->getAspects(); + if ($rawAspects) { + $availableAspects = [ + 'all_aspects' => DI::l10n()->t('All aspects'), + 'public' => DI::l10n()->t('Public'), + ]; + foreach ($rawAspects as $rawAspect) { + $availableAspects[$rawAspect->id] = $rawAspect->name; + } - if (!$aspects) { - $status = DI::l10n()->t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."); + $aspect_select = ['aspect', DI::l10n()->t('Post to aspect:'), $aspect, '', $availableAspects]; + $info = DI::l10n()->t('Connected with your Diaspora account %s', $handle); + } else { + $info = ''; + $error = DI::l10n()->t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."); } } - /* Add some HTML to the existing form */ - - $s .= ''; - $s .= '

'. DI::l10n()->t('Diaspora Export').'

'; - $s .= ''; - $s .= ''; + DI::page()->registerStylesheet('addon/diaspora/diaspora.css'); + $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/diaspora/'); + $s .= Renderer::replaceMacros($t, [ + '$header' => DI::l10n()->t('Diaspora Export'), + '$info_header' => DI::l10n()->t('Information'), + '$error_header' => DI::l10n()->t('Error'), + '$submit' => DI::l10n()->t('Save Settings'), + '$info' => $info, + '$error' => $error, + '$enabled' => $enabled, + '$enabled_checkbox' => ['enabled', DI::l10n()->t('Enable Diaspora Post Addon'), $enabled], + '$handle' => ['handle', DI::l10n()->t('Diaspora handle'), $handle, null, null, 'placeholder="user@domain.tld"'], + '$password' => ['password', DI::l10n()->t('Diaspora password'), '', DI::l10n()->t('Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.')], + '$aspect_select' => $aspect_select, + '$post_by_default' => ['post_by_default', DI::l10n()->t('Post to Diaspora by default'), $def_enabled], + ]); } function diaspora_settings_post(App $a, &$b) { if (!empty($_POST['diaspora-submit'])) { - DI::pConfig()->set(local_user(),'diaspora', 'post' , intval($_POST['diaspora'])); - DI::pConfig()->set(local_user(),'diaspora', 'post_by_default', intval($_POST['diaspora_bydefault'])); - DI::pConfig()->set(local_user(),'diaspora', 'handle' , trim($_POST['handle'])); - DI::pConfig()->set(local_user(),'diaspora', 'password' , trim($_POST['password'])); - DI::pConfig()->set(local_user(),'diaspora', 'aspect' , trim($_POST['aspect'])); + DI::pConfig()->set(local_user(),'diaspora', 'post' , intval($_POST['enabled'])); + if (intval($_POST['enabled'])) { + if (isset($_POST['handle'])) { + DI::pConfig()->set(local_user(),'diaspora', 'handle' , trim($_POST['handle'])); + DI::pConfig()->set(local_user(),'diaspora', 'password' , trim($_POST['password'])); + } + if (!empty($_POST['aspect'])) { + DI::pConfig()->set(local_user(),'diaspora', 'aspect' , trim($_POST['aspect'])); + DI::pConfig()->set(local_user(),'diaspora', 'post_by_default', intval($_POST['post_by_default'])); + } + notice(DI::l10n()->t('Diaspora settings updated.')); + } else { + DI::pConfig()->delete(local_user(), 'diaspora', 'password'); + notice(DI::l10n()->t('Diaspora connector disabled.')); + } } } diff --git a/diaspora/lang/C/messages.po b/diaspora/lang/C/messages.po index 6764eaf1..82660b50 100644 --- a/diaspora/lang/C/messages.po +++ b/diaspora/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-22 13:18+0200\n" +"POT-Creation-Date: 2020-05-07 00:15-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,44 +17,96 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: diaspora.php:37 +#: diaspora.php:53 msgid "Post to Diaspora" msgstr "" -#: diaspora.php:142 +#: diaspora.php:78 +#, php-format msgid "" -"Can't login to your Diaspora account. Please check username and password and " -"ensure you used the complete address (including http...)" +"Please remember: You can always be reached from Diaspora with your Friendica " +"handle %s. " msgstr "" -#: diaspora.php:149 diaspora.php:153 +#: diaspora.php:79 +msgid "" +"This connector is only meant if you still want to use your old Diaspora " +"account for some time. " +msgstr "" + +#: diaspora.php:80 +#, php-format +msgid "" +"However, it is preferred that you tell your Diaspora contacts the new handle " +"%s instead." +msgstr "" + +#: diaspora.php:90 +msgid "All aspects" +msgstr "" + +#: diaspora.php:91 +msgid "Public" +msgstr "" + +#: diaspora.php:97 +msgid "Post to aspect:" +msgstr "" + +#: diaspora.php:98 +#, php-format +msgid "Connected with your Diaspora account %s" +msgstr "" + +#: diaspora.php:101 +msgid "" +"Can't login to your Diaspora account. Please check handle (in the format " +"user@domain.tld) and password." +msgstr "" + +#: diaspora.php:109 msgid "Diaspora Export" msgstr "" -#: diaspora.php:163 -msgid "Enable Diaspora Post Addon" +#: diaspora.php:110 +msgid "Information" msgstr "" -#: diaspora.php:168 -msgid "Diaspora username" +#: diaspora.php:111 +msgid "Error" msgstr "" -#: diaspora.php:173 -msgid "Diaspora password" -msgstr "" - -#: diaspora.php:178 -msgid "Diaspora site URL" -msgstr "" - -#: diaspora.php:183 -msgid "Post to Diaspora by default" -msgstr "" - -#: diaspora.php:189 +#: diaspora.php:112 msgid "Save Settings" msgstr "" -#: diaspora.php:324 -msgid "Diaspora post failed. Queued for retry." +#: diaspora.php:116 +msgid "Enable Diaspora Post Addon" +msgstr "" + +#: diaspora.php:117 +msgid "Diaspora handle" +msgstr "" + +#: diaspora.php:118 +msgid "Diaspora password" +msgstr "" + +#: diaspora.php:118 +msgid "" +"Privacy notice: Your Diaspora password will be stored unencrypted to " +"authenticate you with your Diaspora pod. This means your Friendica node " +"administrator can have access to it." +msgstr "" + +#: diaspora.php:120 +msgid "Post to Diaspora by default" +msgstr "" + +#: diaspora.php:138 +msgid "Diaspora settings updated." +msgstr "" + +#: diaspora.php:141 +msgid "Diaspora connector disabled." msgstr "" diff --git a/diaspora/templates/settings.tpl b/diaspora/templates/settings.tpl new file mode 100644 index 00000000..dadebe44 --- /dev/null +++ b/diaspora/templates/settings.tpl @@ -0,0 +1,47 @@ + + +

{{$header}}

+ + \ No newline at end of file