X-Git-Url: https://git.mxchange.org/?p=friendica-addons.git;a=blobdiff_plain;f=diaspora%2Fdiaspora.php;h=3c4a30d2f7f5c77d9db6a8b5f51041175a08dfbf;hp=53e1890c1c63e5ad4dcd65d1213af2b6ab839793;hb=27b60e003f92dd9f3aebbeddb34ebb905488ca82;hpb=2ca92ed594ba3909fdcc063b2b63e27620841336

diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
old mode 100755
new mode 100644
index 53e1890c..3c4a30d2
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -3,10 +3,15 @@
 /**
  * Name: Diaspora Post Connector
  * Description: Post to Diaspora
- * Version: 0.1
+ * Version: 0.2
  * Author: Michael Vogel <heluecht@pirati.ca>
  */
 
+require_once("addon/diaspora/Diaspora_Connection.php");
+
+use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
+
 function diaspora_install() {
 	register_hook('post_local',           'addon/diaspora/diaspora.php', 'diaspora_post_local');
 	register_hook('notifier_normal',      'addon/diaspora/diaspora.php', 'diaspora_send');
@@ -29,9 +34,9 @@ function diaspora_jot_nets(&$a,&$b) {
     if(! local_user())
         return;
 
-    $diaspora_post = get_pconfig(local_user(),'diaspora','post');
+    $diaspora_post = PConfig::get(local_user(),'diaspora','post');
     if(intval($diaspora_post) == 1) {
-        $diaspora_defpost = get_pconfig(local_user(),'diaspora','post_by_default');
+        $diaspora_defpost = PConfig::get(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>';
@@ -64,16 +69,14 @@ function diaspora_queue_hook(&$a,&$b) {
 
 		$userdata = $r[0];
 
-		$diaspora_username = get_pconfig($userdata['uid'],'diaspora','diaspora_username');
-		$diaspora_password = get_pconfig($userdata['uid'],'diaspora','diaspora_password');
-		$diaspora_url = get_pconfig($userdata['uid'],'diaspora','diaspora_url');
+		$handle = PConfig::get($userdata['uid'],'diaspora','handle');
+		$password = PConfig::get($userdata['uid'],'diaspora','password');
+		$aspect = PConfig::get($userdata['uid'],'diaspora','aspect');
 
 		$success = false;
 
-		if($diaspora_url && $diaspora_username && $diaspora_password) {
-			require_once("addon/diaspora/diasphp.php");
-
-                        logger('diaspora_queue: able to post for user '.$diaspora_username);
+		if ($handle && $password) {
+                        logger('diaspora_queue: able to post for user '.$handle);
 
 			$z = unserialize($x['content']);
 
@@ -83,11 +86,12 @@ function diaspora_queue_hook(&$a,&$b) {
 
 			try {
 				logger('diaspora_queue: prepare', LOGGER_DEBUG);
-				$conn = new Diasphp($diaspora_url);
-				logger('diaspora_queue: try to log in '.$diaspora_username, LOGGER_DEBUG);
-				$conn->login($diaspora_username, $diaspora_password);
+				$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->post($post, $hostname);
+				$conn->provider = $hostname;
+				$conn->postStatusMessage($post, $aspect);
 
                                 logger('diaspora_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
 
@@ -118,39 +122,46 @@ function diaspora_settings(&$a,&$s) {
 
 	/* 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" ' : '');
 
-	$diaspora_username = get_pconfig(local_user(), 'diaspora', 'diaspora_username');
-	$diaspora_password = get_pconfig(local_user(), 'diaspora', 'diaspora_password');
-	$diaspora_url = get_pconfig(local_user(), 'diaspora', 'diaspora_url');
+	$handle = PConfig::get(local_user(), 'diaspora', 'handle');
+	$password = PConfig::get(local_user(), 'diaspora', 'password');
+	$aspect = PConfig::get(local_user(),'diaspora','aspect');
 
 	$status = "";
 
-	if ($diaspora_username AND $diaspora_password AND $diaspora_url) {
-		try {
-			require_once("addon/diaspora/diasphp.php");
+	$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']);
+	}
 
-			$conn = new Diasphp($diaspora_url);
-			$conn->login($diaspora_username, $diaspora_password);
-		} catch (Exception $e) {
-			$status = t("Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)");
+	$aspects = false;
+
+	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.");
 		}
 	}
 
 	/* 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" 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">'. 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" 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">'. t('Diaspora Export').'</h3>';
 	$s .= '</span>';
 
 	if ($status) {
@@ -165,19 +176,38 @@ function diaspora_settings(&$a,&$s) {
 	$s .= '</div><div class="clear"></div>';
 
 	$s .= '<div id="diaspora-username-wrapper">';
-	$s .= '<label id="diaspora-username-label" for="diaspora-username">' . t('Diaspora username') . '</label>';
-	$s .= '<input id="diaspora-username" type="text" name="diaspora_username" value="' . $diaspora_username . '" />';
+	$s .= '<label id="diaspora-username-label" for="diaspora-username">' . 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 .= '<input id="diaspora-password" type="password" name="diaspora_password" value="' . $diaspora_password . '" />';
+	$s .= '<input id="diaspora-password" type="password" name="password" value="' . $password . '" />';
 	$s .= '</div><div class="clear"></div>';
 
-	$s .= '<div id="diaspora-url-wrapper">';
-	$s .= '<label id="diaspora-url-label" for="diaspora-url">' . t('Diaspora site URL') . '</label>';
-	$s .= '<input id="diaspora-url" type="text" name="diaspora_url" value="' . $diaspora_url . '" />';
-	$s .= '</div><div class="clear"></div>';
+	if ($aspects) {
+		$single_aspect =  new stdClass();
+		$single_aspect->id = 'all_aspects';
+		$single_aspect->name = t('All aspects');
+		$aspects[] = $single_aspect;
+
+		$single_aspect =  new stdClass();
+		$single_aspect->id = 'public';
+		$single_aspect->name = t('Public');
+		$aspects[] = $single_aspect;
+
+		$s .= '<label id="diaspora-aspect-label" for="diaspora-aspect">' . 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">' . t('Post to Diaspora by default') . '</label>';
@@ -195,40 +225,46 @@ function diaspora_settings_post(&$a,&$b) {
 
 	if(x($_POST,'diaspora-submit')) {
 
-		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','diaspora_username',trim($_POST['diaspora_username']));
-		set_pconfig(local_user(),'diaspora','diaspora_password',trim($_POST['diaspora_password']));
-		set_pconfig(local_user(),'diaspora','diaspora_url',trim($_POST['diaspora_url']));
-
+		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']));
 	}
 
 }
 
 function diaspora_post_local(&$a,&$b) {
 
-	if($b['edit'])
+	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);
 
-	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 (!$diaspora_enable) {
+		return;
+	}
+
+	if (strlen($b['postopts'])) {
+		$b['postopts'] .= ',';
+	}
 
-    if(strlen($b['postopts']))
-       $b['postopts'] .= ',';
-     $b['postopts'] .= 'diaspora';
+	$b['postopts'] .= 'diaspora';
 }
 
 
@@ -239,27 +275,37 @@ function diaspora_send(&$a,&$b) {
 
 	logger('diaspora_send: invoked');
 
-	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
+	}
+
+	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);
 
-	$diaspora_username = get_pconfig($b['uid'],'diaspora','diaspora_username');
-	$diaspora_password = get_pconfig($b['uid'],'diaspora','diaspora_password');
-	$diaspora_url = get_pconfig($b['uid'],'diaspora','diaspora_url');
+	$handle = PConfig::get($b['uid'],'diaspora','handle');
+	$password = PConfig::get($b['uid'],'diaspora','password');
+	$aspect = PConfig::get($b['uid'],'diaspora','aspect');
 
-	if($diaspora_url && $diaspora_username && $diaspora_password) {
+	if ($handle && $password) {
 
 		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);
 
@@ -300,13 +346,13 @@ function diaspora_send(&$a,&$b) {
 
 		try {
 			logger('diaspora_send: prepare', LOGGER_DEBUG);
-			$conn = new Diasphp($diaspora_url);
-			logger('diaspora_send: try to log in '.$diaspora_username, LOGGER_DEBUG);
-			$conn->login($diaspora_username, $diaspora_password);
+			$conn = new Diaspora_Connection($handle, $password);
+			logger('diaspora_send: try to log in '.$handle, LOGGER_DEBUG);
+			$conn->logIn();
 			logger('diaspora_send: try to send '.$body, LOGGER_DEBUG);
 
-			//throw new Exception('Test');
-			$conn->post($body, $hostname);
+			$conn->provider = $hostname;
+			$conn->postStatusMessage($body, $aspect);
 
 			logger('diaspora_send: success');
 		} catch (Exception $e) {
@@ -318,7 +364,7 @@ function diaspora_send(&$a,&$b) {
 			if (count($r))
 				$a->contact = $r[0]["id"];
 
-			$s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $body));
+			$s = serialize(['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);