- $aspects = $conn->getAspects();
-
- if (!$aspects) {
- $status = 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 .= '<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>";
+ $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;
+ }
+
+ $aspect_select = ['aspect', DI::l10n()->t('Post to aspect:'), $aspect, '', $availableAspects];
+ $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.");