From: Michael Vogel <icarus@dabo.de>
Date: Sun, 13 Dec 2015 23:42:36 +0000 (+0100)
Subject: Only optical stuff
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bc8f7539004868cd6ab270a7a4a2ac331db3935b;p=friendica.git

Only optical stuff
---

diff --git a/include/ostatus.php b/include/ostatus.php
index d651fed12b..e0e6c2186e 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -1080,30 +1080,30 @@ function ostatus_store_conversation($itemid, $conversation_url) {
 }
 
 function get_reshared_guid($item) {
-        $body = trim($item["body"]);
+	$body = trim($item["body"]);
 
-        // Skip if it isn't a pure repeated messages
-        // Does it start with a share?
-        if (strpos($body, "[share") > 0)
-                return("");
+	// Skip if it isn't a pure repeated messages
+	// Does it start with a share?
+	if (strpos($body, "[share") > 0)
+		return("");
 
-        // Does it end with a share?
-        if (strlen($body) > (strrpos($body, "[/share]") + 8))
-                return("");
+	// Does it end with a share?
+	if (strlen($body) > (strrpos($body, "[/share]") + 8))
+		return("");
 
-        $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
-        // Skip if there is no shared message in there
-        if ($body == $attributes)
-                return(false);
+	$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
+	// Skip if there is no shared message in there
+	if ($body == $attributes)
+		return(false);
 
-        $guid = "";
-        preg_match("/guid='(.*?)'/ism", $attributes, $matches);
-        if ($matches[1] != "")
-                $guid = $matches[1];
+	$guid = "";
+	preg_match("/guid='(.*?)'/ism", $attributes, $matches);
+	if ($matches[1] != "")
+		$guid = $matches[1];
 
-        preg_match('/guid="(.*?)"/ism', $attributes, $matches);
-        if ($matches[1] != "")
-                $guid = $matches[1];
+	preg_match('/guid="(.*?)"/ism', $attributes, $matches);
+	if ($matches[1] != "")
+		$guid = $matches[1];
 
 	return $guid;
 }
@@ -1501,7 +1501,7 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false)
 			$mentioned[$thrparent[0]["author-link"]] = $thrparent[0]["author-link"];
 			$mentioned[$thrparent[0]["owner-link"]] = $thrparent[0]["owner-link"];
 		}
-        }
+	}
 
 	xml_add_element($doc, $entry, "link", "", array("rel" => "ostatus:conversation",
 							"href" => $a->get_baseurl()."/display/".$owner["nick"]."/".$item["parent"]));
@@ -1515,7 +1515,6 @@ function ostatus_entry($doc, $item, $owner, $toplevel = false, $repeat = false)
 				$mentioned[$t[1]] = $t[1];
 
 	// Make sure that mentions are accepted (GNU Social has problems with mixing HTTP and HTTPS)
-	// Not sure if that will really work.
 	$newmentions = array();
 	foreach ($mentioned AS $mention) {
 		$newmentions[str_replace("http://", "https://", $mention)] = str_replace("http://", "https://", $mention);
diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index 07972b7a8c..0ac50aaaa7 100644
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -13,6 +13,9 @@ function handle_pubsubhubbub() {
 	$r = q("SELECT * FROM `push_subscriber` WHERE `push` > 0");
 
 	foreach($r as $rr) {
+
+		logger("Generate feed for user ".$rr['nickname']." - last updated ".$rr['last_update'], LOGGER_DEBUG);
+
 		$params = ostatus_feed($a, $rr['nickname'], $rr['last_update']);
 		$hmac_sig = hash_hmac("sha1", $params, $rr['secret']);