X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=diaspora%2Fdiaspora.php;h=77aef3af0a1742eddd8d8bd32af0e22a63bb1e01;hb=d7de9d9bf729806cd362f50b1a968b6c21f3f094;hp=cf272a27b4fc4b68f8414f956a13487800bedcf8;hpb=5d0760f285edb26df278bd59c6a7e81fbb515f8f;p=friendica-addons.git
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index cf272a27..77aef3af 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -12,13 +12,12 @@ 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\PConfig;
-use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
+use Friendica\Core\Session;
use Friendica\Database\DBA;
-use Friendica\Model\Queue;
use Friendica\Core\Worker;
+use Friendica\DI;
function diaspora_install()
{
@@ -28,18 +27,6 @@ function diaspora_install()
Hook::register('jot_networks', 'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
Hook::register('connector_settings', 'addon/diaspora/diaspora.php', 'diaspora_settings');
Hook::register('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
- Hook::register('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook');
-}
-
-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');
- Hook::unregister('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook');
}
function diaspora_jot_nets(App $a, array &$jotnets_fields)
@@ -48,211 +35,99 @@ function diaspora_jot_nets(App $a, array &$jotnets_fields)
return;
}
- if (PConfig::get(local_user(), 'diaspora', 'post')) {
+ if (DI::pConfig()->get(local_user(), 'diaspora', 'post')) {
$jotnets_fields[] = [
'type' => 'checkbox',
'field' => [
'diaspora_enable',
- L10n::t('Post to Diaspora'),
- PConfig::get(local_user(), 'diaspora', 'post_by_default')
+ DI::l10n()->t('Post to Diaspora'),
+ DI::pConfig()->get(local_user(), 'diaspora', 'post_by_default')
]
];
}
}
-function diaspora_queue_hook(App $a, &$b) {
- $hostname = $a->getHostName();
-
- $qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
- DBA::escape(Protocol::DIASPORA2)
- );
-
- if (!DBA::isResult($qi)) {
- return;
- }
-
- foreach ($qi as $x) {
- if ($x['network'] !== Protocol::DIASPORA2) {
- continue;
- }
-
- Logger::log('diaspora_queue: run');
-
- $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid`
- WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
- intval($x['cid'])
- );
-
- if (!DBA::isResult($r)) {
- continue;
- }
-
- $userdata = $r[0];
-
- $handle = PConfig::get($userdata['uid'], 'diaspora', 'handle');
- $password = PConfig::get($userdata['uid'], 'diaspora', 'password');
- $aspect = PConfig::get($userdata['uid'], 'diaspora', 'aspect');
-
- $success = false;
-
- if ($handle && $password) {
- Logger::log('diaspora_queue: able to post for user '.$handle);
-
- $z = unserialize($x['content']);
-
- $post = $z['post'];
-
- Logger::log('diaspora_queue: post: '.$post, Logger::DATA);
-
- try {
- Logger::log('diaspora_queue: prepare', Logger::DEBUG);
- $conn = new Diaspora_Connection($handle, $password);
- Logger::log('diaspora_queue: try to log in '.$handle, Logger::DEBUG);
- $conn->logIn();
- Logger::log('diaspora_queue: try to send '.$body, Logger::DEBUG);
- $conn->provider = $hostname;
- $conn->postStatusMessage($post, $aspect);
-
- Logger::log('diaspora_queue: send '.$userdata['uid'].' success', Logger::DEBUG);
-
- $success = true;
-
- Queue::removeItem($x['id']);
- } catch (Exception $e) {
- Logger::log("diaspora_queue: Send ".$userdata['uid']." failed: ".$e->getMessage(), Logger::DEBUG);
- }
- } else {
- Logger::log('diaspora_queue: send '.$userdata['uid'].' missing username or password', Logger::DEBUG);
- }
-
- if (!$success) {
- Logger::log('diaspora_queue: delayed');
- Queue::updateTime($x['id']);
- }
- }
-}
-
function diaspora_settings(App $a, &$s)
{
if (! local_user()) {
return;
}
- /* Add our stylesheet to the page so we can make our settings look nice */
-
- $a->page['htmlhead'] .= '' . "\r\n";
-
/* Get the current state of our config variables */
- $enabled = PConfig::get(local_user(),'diaspora','post');
- $checked = (($enabled) ? ' checked="checked" ' : '');
- $css = (($enabled) ? '' : '-disabled');
-
- $def_enabled = PConfig::get(local_user(),'diaspora','post_by_default');
+ $enabled = DI::pConfig()->get(local_user(),'diaspora','post');
+ $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');
- $handle = PConfig::get(local_user(), 'diaspora', 'handle');
- $password = PConfig::get(local_user(), 'diaspora', 'password');
- $aspect = 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 .= ''. L10n::t('Diaspora Export').'
';
- $s .= '';
- $s .= '