X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=diaspora%2Fdiaspora.php;h=77aef3af0a1742eddd8d8bd32af0e22a63bb1e01;hb=d7de9d9bf729806cd362f50b1a968b6c21f3f094;hp=bf3cae2b9ef961ccc0dfbf87277395b0a30e47ba;hpb=1eb23e3667ac780ea59bad219fb1e3a0517421d9;p=friendica-addons.git
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index bf3cae2b..77aef3af 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -12,8 +12,9 @@ require_once 'addon/diaspora/Diaspora_Connection.php';
use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\Core\Session;
use Friendica\Database\DBA;
use Friendica\Core\Worker;
use Friendica\DI;
@@ -28,16 +29,6 @@ function diaspora_install()
Hook::register('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
}
-function diaspora_uninstall()
-{
- Hook::unregister('hook_fork', 'addon/diaspora/diaspora.php', 'diaspora_hook_fork');
- Hook::unregister('post_local', 'addon/diaspora/diaspora.php', 'diaspora_post_local');
- Hook::unregister('notifier_normal', 'addon/diaspora/diaspora.php', 'diaspora_send');
- Hook::unregister('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
- Hook::unregister('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings');
- Hook::unregister('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
-}
-
function diaspora_jot_nets(App $a, array &$jotnets_fields)
{
if (!local_user()) {
@@ -49,7 +40,7 @@ function diaspora_jot_nets(App $a, array &$jotnets_fields)
'type' => 'checkbox',
'field' => [
'diaspora_enable',
- L10n::t('Post to Diaspora'),
+ DI::l10n()->t('Post to Diaspora'),
DI::pConfig()->get(local_user(), 'diaspora', 'post_by_default')
]
];
@@ -62,121 +53,81 @@ 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 = L10n::t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. ", $r[0]['addr']);
- $status .= L10n::t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
- $status .= 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();
-
- if (!$aspects) {
- $status = 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 .= '