From a23099a6fd15ab7730501eb3246f0eee3e16a45b Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 22 Apr 2014 15:28:23 +0200
Subject: [PATCH] Diaspora: The hostname is now send, so that at Diaspora there
 is a line telling "via ..."

---
 diaspora/diasphp.php  | 5 +++--
 diaspora/diaspora.php | 7 +++++--
 fbsync/fbsync.php     | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/diaspora/diasphp.php b/diaspora/diasphp.php
index cb7a13cc..589a5810 100644
--- a/diaspora/diasphp.php
+++ b/diaspora/diasphp.php
@@ -61,11 +61,12 @@ class Diasphp {
 		return $this;
 	}
 
-	function post($text) {
+	function post($text, $provider = "diasphp") {
 		// post-daten vorbereiten
 		$datatopost = json_encode(array(
 				'aspect_ids' => 'public',
-				'status_message' => array('text' => $text)
+				'status_message' => array('text' => $text,
+							'provider_display_name' => $provider)
 		));
 
 		// header vorbereiten
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index c9eb337d..45b59cc0 100755
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -39,6 +39,8 @@ function diaspora_jot_nets(&$a,&$b) {
 }
 
 function diaspora_queue_hook(&$a,&$b) {
+	$hostname = $a->get_hostname();
+
 	$qi = q("SELECT * FROM `queue` WHERE `network` = '%s'",
 		dbesc(NETWORK_DIASPORA2)
 	);
@@ -85,7 +87,7 @@ function diaspora_queue_hook(&$a,&$b) {
 				logger('diaspora_queue: try to log in '.$diaspora_username, LOGGER_DEBUG);
 				$conn->login($diaspora_username, $diaspora_password);
 				logger('diaspora_queue: try to send '.$body, LOGGER_DEBUG);
-				$conn->post($post);
+				$conn->post($post, $hostname);
 
                                 logger('diaspora_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
 
@@ -233,6 +235,7 @@ function diaspora_post_local(&$a,&$b) {
 
 
 function diaspora_send(&$a,&$b) {
+	$hostname = $a->get_hostname();
 
 	logger('diaspora_send: invoked');
 
@@ -303,7 +306,7 @@ function diaspora_send(&$a,&$b) {
 			logger('diaspora_send: try to send '.$body, LOGGER_DEBUG);
 
 			//throw new Exception('Test');
-			$conn->post($body);
+			$conn->post($body, $hostname);
 
 			logger('diaspora_send: success');
 		} catch (Exception $e) {
diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php
index d05d6e42..f6310ccf 100644
--- a/fbsync/fbsync.php
+++ b/fbsync/fbsync.php
@@ -177,7 +177,7 @@ function fbsync_cron($a,$b) {
 		}
 	}
 
-	logger('fbsync: cron_end');
+	logger('fbsync_cron: cron_end');
 
 	set_config('fbsync','last_poll', time());
 }
-- 
2.39.5