From a3118e0a6edc2da6711404acc0aa9fc447e90624 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sat, 30 May 2015 21:08:24 +0200
Subject: [PATCH] Cleaning the code from several tests.

---
 include/items.php         |  2 +-
 include/pubsubpublish.php |  3 +--
 include/salmon.php        | 28 ++++++++++++++--------------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/include/items.php b/include/items.php
index 44eb18ccd1..2c4ae9e5ca 100644
--- a/include/items.php
+++ b/include/items.php
@@ -115,7 +115,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0,
 	else
 		$sort = 'ASC';
 
-	// Include answers to status.net posts in public feeds
+	// Include answers to status.net posts in pubsub feeds
 	if($forpubsub) {
 		$sql_post_table = "INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent` ";
 		$visibility = "OR (`item`.`network` = 'dfrn' AND `thread`.`network`='stat')";
diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index 60bb2b3de0..bc81fd7868 100644
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -46,9 +46,8 @@ function handle_pubsubhubbub() {
 			if ($new_push > 30) // OK, let's give up
 				$new_push = 0;
 
-			q("UPDATE `push_subscriber` SET `push` = %d, last_update = '%s' WHERE id = %d",
+			q("UPDATE `push_subscriber` SET `push` = %d WHERE id = %d",
 				$new_push,
-				dbesc($date_now),
 				intval($rr['id']));
 		}
 	}
diff --git a/include/salmon.php b/include/salmon.php
index ed4ed7ad62..3d525f51ad 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -62,13 +62,13 @@ function get_salmon_key($uri,$keyhash) {
 	return '';
 }
 
-
-
+	
+		
 function slapper($owner,$url,$slap) {
 
-	logger('slapper called for '.$owner['url'].' to '.$url.' . Data: ' . $slap);
+	logger('slapper called. Data: ' . $slap);
 
-	// does contact have a salmon endpoint?
+	// does contact have a salmon endpoint? 
 
 	if(! strlen($url))
 		return;
@@ -87,16 +87,16 @@ $namespaces = <<< EOT
       xmlns:thr="http://purl.org/syndication/thread/1.0"
       xmlns:at="http://purl.org/atompub/tombstones/1.0"
       xmlns:media="http://purl.org/syndication/atommedia"
-      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0"
+      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
       xmlns:as="http://activitystrea.ms/spec/1.0/"
-      xmlns:georss="http://www.georss.org/georss"
-      xmlns:poco="http://portablecontacts.net/spec/1.0"
-      xmlns:ostatus="http://ostatus.org/schema/1.0"
+      xmlns:georss="http://www.georss.org/georss" 
+      xmlns:poco="http://portablecontacts.net/spec/1.0" 
+      xmlns:ostatus="http://ostatus.org/schema/1.0" 
 	  xmlns:statusnet="http://status.net/schema/api/1/" >													>
 EOT;
 
 	$slap = str_replace('<entry>',$namespaces,$slap);
-
+	
 	// create a magic envelope
 
 	$data      = base64url_encode($slap);
@@ -125,7 +125,7 @@ EOT;
 		'$signature' => $signature
 	));
 
-	// slap them
+	// slap them 
 	post_url($url,$salmon, array(
 		'Content-type: application/magic-envelope+xml',
 		'Content-length: ' . strlen($salmon)
@@ -152,7 +152,7 @@ EOT;
 			'$signature' => $signature2
 		));
 
-		// slap them
+		// slap them 
 		post_url($url,$salmon, array(
 			'Content-type: application/magic-envelope+xml',
 			'Content-length: ' . strlen($salmon)
@@ -166,7 +166,7 @@ EOT;
 
 			// Entirely likely that their salmon implementation is
 			// non-compliant. Let's try once more, this time only signing
-			// the data, without the precomputed blob
+			// the data, without the precomputed blob 
 
 			$salmon = replace_macros($salmon_tpl,array(
 				'$data'      => $data,
@@ -176,7 +176,7 @@ EOT;
 				'$signature' => $signature3
 			));
 
-			// slap them
+			// slap them 
 			post_url($url,$salmon, array(
 				'Content-type: application/magic-envelope+xml',
 				'Content-length: ' . strlen($salmon)
@@ -184,7 +184,7 @@ EOT;
 			$return_code = $a->get_curl_code();
 		}
 	}
-	logger('slapper returned ' . $return_code);
+	logger('slapper returned ' . $return_code); 
 	if(! $return_code)
 		return(-1);
 	if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))
-- 
2.39.5