haheute/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

[diaspora] Overhaul connector settings

Browse source 
- 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
This commit is contained in:
Hypolite Petovan 2020-05-07 00:16:40 -04:00
parent e060931939
commit b733391e85
3 changed files with 178 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
diaspora/diaspora.php
View file

@ -13,6 +13,8 @@ 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\Core\Session;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\DI; use Friendica\DI;
@ -61,121 +63,83 @@ function diaspora_settings(App $a, &$s)
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/diaspora/diaspora.css' . '" media="all" />' . "\r\n";
/* Get the current state of our config variables */ /* Get the current state of our config variables */
$enabled = DI::pConfig()->get(local_user(),'diaspora','post'); $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_enabled = DI::pConfig()->get(local_user(),'diaspora','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
$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');
$status = ""; $info = '';
$error = '';
$r = q("SELECT `addr` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user())); if (Session::get('my_address')) {
$info = DI::l10n()->t('Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. ', Session::get('my_address'));
if (DBA::isResult($r)) { $info .= 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("Please remember: You can always be reached from Diaspora with your Friendica handle %s. ", $r[0]['addr']); $info .= DI::l10n()->t('However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.', Session::get('my_address'));
$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']);
} }
$aspects = false; $aspect_select = '';
if ($handle && $password) { if ($handle && $password) {
$conn = new Diaspora_Connection($handle, $password); $conn = new Diaspora_Connection($handle, $password);
$conn->logIn(); $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) { $aspect_select = ['aspect', DI::l10n()->t('Post to aspect:'), $aspect, '', $availableAspects];
$status = DI::l10n()->t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."); $info = DI::l10n()->t('Connected with your Diaspora account <strong>%s</strong>', $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 */ DI::page()->registerStylesheet('addon/diaspora/diaspora.css');
$s .= '<span id="settings_diaspora_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
$s .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. DI::l10n()->t('Diaspora Export').'</h3>';
$s .= '</span>';
$s .= '<div id="settings_diaspora_expanded" class="settings-block" style="display: none;">';
$s .= '<span class="fakelink" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
$s .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. DI::l10n()->t('Diaspora Export').'</h3>';
$s .= '</span>';
if ($status) {
$s .= '<div id="diaspora-status-wrapper"><strong>';
$s .= $status;
$s .= '</strong></div><div class="clear"></div>';
}
$s .= '<div id="diaspora-enable-wrapper">';
$s .= '<label id="diaspora-enable-label" for="diaspora-checkbox">' . DI::l10n()->t('Enable Diaspora Post Addon') . '</label>';
$s .= '<input id="diaspora-checkbox" type="checkbox" name="diaspora" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="diaspora-username-wrapper">';
$s .= '<label id="diaspora-username-label" for="diaspora-username">' . DI::l10n()->t('Diaspora handle') . '</label>';
$s .= '<input id="diaspora-username" type="text" name="handle" value="' . $handle . '" />';
$s .= '</div><div class="clear"></div>';
$s .= '<div id="diaspora-password-wrapper">';
$s .= '<label id="diaspora-password-label" for="diaspora-password">' . DI::l10n()->t('Diaspora password') . '</label>';
$s .= '<input id="diaspora-password" type="password" name="password" value="' . $password . '" />';
$s .= '</div><div class="clear"></div>';
if ($aspects) {
$single_aspect = new stdClass();
$single_aspect->id = 'all_aspects';
$single_aspect->name = DI::l10n()->t('All aspects');
$aspects[] = $single_aspect;
$single_aspect = new stdClass();
$single_aspect->id = 'public';
$single_aspect->name = DI::l10n()->t('Public');
$aspects[] = $single_aspect;
$s .= '<label id="diaspora-aspect-label" for="diaspora-aspect">' . DI::l10n()->t('Post to aspect:') . '</label>';
$s .= '<select name="aspect" id="diaspora-aspect">';
foreach($aspects as $single_aspect) {
if ($single_aspect->id == $aspect)
$s .= "<option value='".$single_aspect->id."' selected>".$single_aspect->name."</option>";
else
$s .= "<option value='".$single_aspect->id."'>".$single_aspect->name."</option>";
}
$s .= "</select>";
$s .= '<div class="clear"></div>';
}
$s .= '<div id="diaspora-bydefault-wrapper">';
$s .= '<label id="diaspora-bydefault-label" for="diaspora-bydefault">' . DI::l10n()->t('Post to Diaspora by default') . '</label>';
$s .= '<input id="diaspora-bydefault" type="checkbox" name="diaspora_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="diaspora-submit" name="diaspora-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
$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) function diaspora_settings_post(App $a, &$b)
{ {
if (!empty($_POST['diaspora-submit'])) { if (!empty($_POST['diaspora-submit'])) {
DI::pConfig()->set(local_user(),'diaspora', 'post' , intval($_POST['diaspora'])); DI::pConfig()->set(local_user(),'diaspora', 'post' , intval($_POST['enabled']));
DI::pConfig()->set(local_user(),'diaspora', 'post_by_default', intval($_POST['diaspora_bydefault'])); if (intval($_POST['enabled'])) {
DI::pConfig()->set(local_user(),'diaspora', 'handle' , trim($_POST['handle'])); if (isset($_POST['handle'])) {
DI::pConfig()->set(local_user(),'diaspora', 'password' , trim($_POST['password'])); DI::pConfig()->set(local_user(),'diaspora', 'handle' , trim($_POST['handle']));
DI::pConfig()->set(local_user(),'diaspora', 'aspect' , trim($_POST['aspect'])); 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.'));
}
} }
} }

102
diaspora/lang/C/messages.po
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: 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" "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,44 +17,96 @@ 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:37 #: diaspora.php:53
msgid "Post to Diaspora" msgid "Post to Diaspora"
msgstr "" msgstr ""
#: diaspora.php:142 #: diaspora.php:78
#, php-format
msgid "" msgid ""
"Can't login to your Diaspora account. Please check username and password and " "Please remember: You can always be reached from Diaspora with your Friendica "
"ensure you used the complete address (including http...)" "handle <strong>%s</strong>. "
msgstr "" 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 "
"<strong>%s</strong> 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 <strong>%s</strong>"
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" msgid "Diaspora Export"
msgstr "" msgstr ""
#: diaspora.php:163 #: diaspora.php:110
msgid "Enable Diaspora Post Addon" msgid "Information"
msgstr "" msgstr ""
#: diaspora.php:168 #: diaspora.php:111
msgid "Diaspora username" msgid "Error"
msgstr "" msgstr ""
#: diaspora.php:173 #: diaspora.php:112
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
msgid "Save Settings" msgid "Save Settings"
msgstr "" msgstr ""
#: diaspora.php:324 #: diaspora.php:116
msgid "Diaspora post failed. Queued for retry." 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 "" msgstr ""

47
diaspora/templates/settings.tpl Normal file
View file

@ -0,0 +1,47 @@
<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>