X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=diaspora%2Fdiaspora.php;h=0d847b1447a6a53e3516d67ad191d1a297e515ba;hb=261efba5102ab1d3abdf070c4e4a0846e691f787;hp=aed80b88b0db2423d43ee7c97b9d5eb8e69e415a;hpb=e7558b1873a96913b30d8a6f20a3f10dabbe4432;p=friendica-addons.git

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
old mode 100755
new mode 100644
index aed80b88..0d847b14
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -7,158 +7,110 @@
  * Author: Michael Vogel <heluecht@pirati.ca>
  */
 
-require_once("addon/diaspora/Diaspora_Connection.php");
-
-function diaspora_install() {
-	register_hook('post_local',           'addon/diaspora/diaspora.php', 'diaspora_post_local');
-	register_hook('notifier_normal',      'addon/diaspora/diaspora.php', 'diaspora_send');
-	register_hook('jot_networks',         'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
-	register_hook('connector_settings',      'addon/diaspora/diaspora.php', 'diaspora_settings');
-	register_hook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
-	register_hook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook');
+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\Database\DBA;
+use Friendica\Core\Worker;
+
+function diaspora_install()
+{
+	Hook::register('hook_fork',               'addon/diaspora/diaspora.php', 'diaspora_hook_fork');
+	Hook::register('post_local',              'addon/diaspora/diaspora.php', 'diaspora_post_local');
+	Hook::register('notifier_normal',         'addon/diaspora/diaspora.php', 'diaspora_send');
+	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');
 }
-function diaspora_uninstall() {
-	unregister_hook('post_local',       'addon/diaspora/diaspora.php', 'diaspora_post_local');
-	unregister_hook('notifier_normal',  'addon/diaspora/diaspora.php', 'diaspora_send');
-	unregister_hook('jot_networks',     'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
-	unregister_hook('connector_settings',      'addon/diaspora/diaspora.php', 'diaspora_settings');
-	unregister_hook('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
-	unregister_hook('queue_predeliver', 'addon/diaspora/diaspora.php', 'diaspora_queue_hook');
-}
-
 
-function diaspora_jot_nets(&$a,&$b) {
-    if(! local_user())
-        return;
-
-    $diaspora_post = get_pconfig(local_user(),'diaspora','post');
-    if(intval($diaspora_post) == 1) {
-        $diaspora_defpost = get_pconfig(local_user(),'diaspora','post_by_default');
-        $selected = ((intval($diaspora_defpost) == 1) ? ' checked="checked" ' : '');
-        $b .= '<div class="profile-jot-net"><input type="checkbox" name="diaspora_enable"' . $selected . ' value="1" /> '
-            . t('Post to Diaspora') . '</div>';
-    }
+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_queue_hook(&$a,&$b) {
-	$hostname = $a->get_hostname();
-
-	$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
-		dbesc(NETWORK_DIASPORA2)
-	);
-	if(! count($qi))
+function diaspora_jot_nets(App $a, array &$jotnets_fields)
+{
+	if (!local_user()) {
 		return;
+	}
 
-	require_once('include/queue_fn.php');
-
-	foreach($qi as $x) {
-		if($x['network'] !== NETWORK_DIASPORA2)
-			continue;
-
-		logger('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(! count($r))
-			continue;
-
-		$userdata = $r[0];
-
-		$handle = get_pconfig($userdata['uid'],'diaspora','handle');
-		$password = get_pconfig($userdata['uid'],'diaspora','password');
-		$aspect = get_pconfig($userdata['uid'],'diaspora','aspect');
-
-		$success = false;
-
-		if ($handle && $password) {
-                        logger('diaspora_queue: able to post for user '.$handle);
-
-			$z = unserialize($x['content']);
-
-			$post = $z['post'];
-
-			logger('diaspora_queue: post: '.$post, LOGGER_DATA);
-
-			try {
-				logger('diaspora_queue: prepare', LOGGER_DEBUG);
-				$conn = new Diaspora_Connection($handle, $password);
-				logger('diaspora_queue: try to log in '.$handle, LOGGER_DEBUG);
-				$conn->logIn();
-				logger('diaspora_queue: try to send '.$body, LOGGER_DEBUG);
-				$conn->provider = $hostname;
-				$conn->postStatusMessage($post, $aspect);
-
-                                logger('diaspora_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
-
-                                $success = true;
-
-                                remove_queue_item($x['id']);
-			} catch (Exception $e) {
-				logger("diaspora_queue: Send ".$userdata['uid']." failed: ".$e->getMessage(), LOGGER_DEBUG);
-			}
-		} else
-			logger('diaspora_queue: send '.$userdata['uid'].' missing username or password', LOGGER_DEBUG);
-
-		if (!$success) {
-			logger('diaspora_queue: delayed');
-			update_queue_time($x['id']);
-		}
+	if (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')
+			]
+		];
 	}
 }
 
-function diaspora_settings(&$a,&$s) {
-
-	if(! local_user())
+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'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/diaspora/diaspora.css' . '" media="all" />' . "\r\n";
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/diaspora/diaspora.css' . '" media="all" />' . "\r\n";
 
 	/* Get the current state of our config variables */
 
-	$enabled = get_pconfig(local_user(),'diaspora','post');
+	$enabled = PConfig::get(local_user(),'diaspora','post');
 	$checked = (($enabled) ? ' checked="checked" ' : '');
 	$css = (($enabled) ? '' : '-disabled');
 
-	$def_enabled = get_pconfig(local_user(),'diaspora','post_by_default');
+	$def_enabled = PConfig::get(local_user(),'diaspora','post_by_default');
 
 	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
-	$handle = get_pconfig(local_user(), 'diaspora', 'handle');
-	$password = get_pconfig(local_user(), 'diaspora', 'password');
-	$aspect = get_pconfig(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 (dbm::is_result($r)) {
-		$status = sprintf(t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. "), $r[0]['addr']);
-		$status .= t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
-		$status .= sprintf(t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.'), $r[0]['addr']);
+
+	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']);
 	}
 
 	$aspects = false;
 
-	if ($handle AND $password) {
+	if ($handle && $password) {
 		$conn = new Diaspora_Connection($handle, $password);
 		$conn->logIn();
 		$aspects = $conn->getAspects();
+
 		if (!$aspects) {
-			$status = t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.");
+			$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 .= '<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">'. t('Diaspora Export').'</h3>';
+	$s .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. 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">'. t('Diaspora Export').'</h3>';
+	$s .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. L10n::t('Diaspora Export').'</h3>';
 	$s .= '</span>';
 
 	if ($status) {
@@ -168,32 +120,32 @@ function diaspora_settings(&$a,&$s) {
 	}
 
 	$s .= '<div id="diaspora-enable-wrapper">';
-	$s .= '<label id="diaspora-enable-label" for="diaspora-checkbox">' . t('Enable Diaspora Post Plugin') . '</label>';
+	$s .= '<label id="diaspora-enable-label" for="diaspora-checkbox">' . 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">' . t('Diaspora handle') . '</label>';
+	$s .= '<label id="diaspora-username-label" for="diaspora-username">' . 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">' . t('Diaspora password') . '</label>';
+	$s .= '<label id="diaspora-password-label" for="diaspora-password">' . 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 = t('All aspects');
+		$single_aspect->name = L10n::t('All aspects');
 		$aspects[] = $single_aspect;
 
 		$single_aspect =  new stdClass();
 		$single_aspect->id = 'public';
-		$single_aspect->name = t('Public');
+		$single_aspect->name = L10n::t('Public');
 		$aspects[] = $single_aspect;
 
-		$s .= '<label id="diaspora-aspect-label" for="diaspora-aspect">' . t('Post to aspect:') . '</label>';
+		$s .= '<label id="diaspora-aspect-label" for="diaspora-aspect">' . L10n::t('Post to aspect:') . '</label>';
 		$s .= '<select name="aspect" id="diaspora-aspect">';
 		foreach($aspects as $single_aspect) {
 			if ($single_aspect->id == $aspect)
@@ -207,95 +159,124 @@ function diaspora_settings(&$a,&$s) {
 	}
 
 	$s .= '<div id="diaspora-bydefault-wrapper">';
-	$s .= '<label id="diaspora-bydefault-label" for="diaspora-bydefault">' . t('Post to Diaspora by default') . '</label>';
+	$s .= '<label id="diaspora-bydefault-label" for="diaspora-bydefault">' . 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="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="diaspora-submit" name="diaspora-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
 }
 
 
-function diaspora_settings_post(&$a,&$b) {
-
-	if(x($_POST,'diaspora-submit')) {
+function diaspora_settings_post(App $a, &$b)
+{
+	if (!empty($_POST['diaspora-submit'])) {
+		PConfig::set(local_user(),'diaspora', 'post'           , intval($_POST['diaspora']));
+		PConfig::set(local_user(),'diaspora', 'post_by_default', intval($_POST['diaspora_bydefault']));
+		PConfig::set(local_user(),'diaspora', 'handle'         , trim($_POST['handle']));
+		PConfig::set(local_user(),'diaspora', 'password'       , trim($_POST['password']));
+		PConfig::set(local_user(),'diaspora', 'aspect'         , trim($_POST['aspect']));
+	}
+}
 
-		set_pconfig(local_user(),'diaspora','post',intval($_POST['diaspora']));
-		set_pconfig(local_user(),'diaspora','post_by_default',intval($_POST['diaspora_bydefault']));
-		set_pconfig(local_user(),'diaspora','handle',trim($_POST['handle']));
-		set_pconfig(local_user(),'diaspora','password',trim($_POST['password']));
-		set_pconfig(local_user(),'diaspora','aspect',trim($_POST['aspect']));
+function diaspora_hook_fork(&$a, &$b)
+{
+	if ($b['name'] != 'notifier_normal') {
+		return;
 	}
 
-}
+	$post = $b['data'];
 
-function diaspora_post_local(&$a,&$b) {
+	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
+		!strstr($post['postopts'], 'diaspora') || ($post['parent'] != $post['id'])) {
+		$b['execute'] = false;
+		return;
+	}
+}
 
-	if($b['edit'])
+function diaspora_post_local(App $a, array &$b)
+{
+	if ($b['edit']) {
 		return;
+	}
 
-	if((! local_user()) || (local_user() != $b['uid']))
+	if (!local_user() || (local_user() != $b['uid'])) {
 		return;
+	}
 
-	if($b['private'] || $b['parent'])
+	if ($b['private'] || $b['parent']) {
 		return;
+	}
 
-	$diaspora_post   = intval(get_pconfig(local_user(),'diaspora','post'));
+	$diaspora_post   = intval(PConfig::get(local_user(),'diaspora','post'));
 
-	$diaspora_enable = (($diaspora_post && x($_REQUEST,'diaspora_enable')) ? intval($_REQUEST['diaspora_enable']) : 0);
+	$diaspora_enable = (($diaspora_post && !empty($_REQUEST['diaspora_enable'])) ? intval($_REQUEST['diaspora_enable']) : 0);
 
-	if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'diaspora','post_by_default')))
+	if ($b['api_source'] && intval(PConfig::get(local_user(),'diaspora','post_by_default'))) {
 		$diaspora_enable = 1;
+	}
 
-    if(! $diaspora_enable)
-       return;
-
-    if(strlen($b['postopts']))
-       $b['postopts'] .= ',';
-     $b['postopts'] .= 'diaspora';
-}
+	if (!$diaspora_enable) {
+		return;
+	}
 
+	if (strlen($b['postopts'])) {
+		$b['postopts'] .= ',';
+	}
 
+	$b['postopts'] .= 'diaspora';
+}
 
+function diaspora_send(App $a, array &$b)
+{
+	$hostname = $a->getHostName();
 
-function diaspora_send(&$a,&$b) {
-	$hostname = $a->get_hostname();
+	Logger::log('diaspora_send: invoked');
 
-	logger('diaspora_send: invoked');
+	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+		return;
+	}
 
-	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+	if (!strstr($b['postopts'],'diaspora')) {
 		return;
+	}
 
-	if(! strstr($b['postopts'],'diaspora'))
+	if ($b['parent'] != $b['id']) {
 		return;
+	}
 
-	if($b['parent'] != $b['id'])
+	// Dont't post if the post doesn't belong to us.
+	// This is a check for forum postings
+	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+
+	if ($b['contact-id'] != $self['id']) {
 		return;
+	}
 
-	logger('diaspora_send: prepare posting', LOGGER_DEBUG);
+	Logger::log('diaspora_send: prepare posting', Logger::DEBUG);
 
-	$handle = get_pconfig($b['uid'],'diaspora','handle');
-	$password = get_pconfig($b['uid'],'diaspora','password');
-	$aspect = get_pconfig($b['uid'],'diaspora','aspect');
+	$handle = PConfig::get($b['uid'],'diaspora','handle');
+	$password = PConfig::get($b['uid'],'diaspora','password');
+	$aspect = PConfig::get($b['uid'],'diaspora','aspect');
 
 	if ($handle && $password) {
+		Logger::log('diaspora_send: all values seem to be okay', Logger::DEBUG);
 
-		logger('diaspora_send: all values seem to be okay', LOGGER_DEBUG);
-
-		require_once('include/bb2diaspora.php');
-		$tag_arr = array();
+		$tag_arr = [];
 		$tags = '';
 		$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
 
-		if($x) {
-			foreach($matches as $mtch) {
+		if ($x) {
+			foreach ($matches as $mtch) {
 				$tag_arr[] = $mtch[2];
 			}
 		}
-		if(count($tag_arr))
+
+		if (count($tag_arr)) {
 			$tags = implode(',',$tag_arr);
+		}
 
 		$title = $b['title'];
 		$body = $b['body'];
@@ -312,42 +293,36 @@ function diaspora_send(&$a,&$b) {
 		// remove multiple newlines
 		do {
 			$oldbody = $body;
-                        $body = str_replace("\n\n\n", "\n\n", $body);
-                } while ($oldbody != $body);
+			$body = str_replace("\n\n\n", "\n\n", $body);
+		} while ($oldbody != $body);
 
 		// convert to markdown
-		$body = bb2diaspora($body, false, true);
+		$body = BBCode::toMarkdown($body);
 
 		// Adding the title
-		if(strlen($title))
+		if (strlen($title)) {
 			$body = "## ".html_entity_decode($title)."\n\n".$body;
+		}
 
-		require_once("addon/diaspora/diasphp.php");
+		require_once "addon/diaspora/diasphp.php";
 
 		try {
-			logger('diaspora_send: prepare', LOGGER_DEBUG);
+			Logger::log('diaspora_send: prepare', Logger::DEBUG);
 			$conn = new Diaspora_Connection($handle, $password);
-			logger('diaspora_send: try to log in '.$handle, LOGGER_DEBUG);
+			Logger::log('diaspora_send: try to log in '.$handle, Logger::DEBUG);
 			$conn->logIn();
-			logger('diaspora_send: try to send '.$body, LOGGER_DEBUG);
+			Logger::log('diaspora_send: try to send '.$body, Logger::DEBUG);
 
 			$conn->provider = $hostname;
 			$conn->postStatusMessage($body, $aspect);
 
-			logger('diaspora_send: success');
+			Logger::log('diaspora_send: success');
 		} catch (Exception $e) {
-			logger("diaspora_send: Error submitting the post: " . $e->getMessage());
-
-			logger('diaspora_send: requeueing '.$b['uid'], LOGGER_DEBUG);
+			Logger::log("diaspora_send: Error submitting the post: " . $e->getMessage());
 
-			$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']);
-			if (count($r))
-				$a->contact = $r[0]["id"];
+			Logger::log('diaspora_send: requeueing '.$b['uid'], Logger::DEBUG);
 
-			$s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $body));
-			require_once('include/queue_fn.php');
-			add_to_queue($a->contact,NETWORK_DIASPORA2,$s);
-			notice(t('Diaspora post failed. Queued for retry.').EOL);
+			Worker::defer();
 		}
 	}
 }