From 8f6ae2b66044a36996ac92a8db1a540db9c71fe3 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 24 Aug 2011 20:40:08 -0700
Subject: [PATCH] missing salmon key? report it.

---
 include/auth.php   | 6 ++++--
 include/queue.php  | 5 +++--
 include/salmon.php | 7 +++++++
 mod/openid.php     | 3 ++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/include/auth.php b/include/auth.php
index 768af626f..b7b96bdc0 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -48,7 +48,8 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 			goaway(z_root());
 		}
 
-		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+		$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` 
+		FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($_SESSION['uid'])
 		);
 
@@ -183,7 +184,8 @@ else {
 
 			// process normal login request
 
-			$r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) 
+			$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`  
+				FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) 
 				AND `password` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
 				dbesc(trim($_POST['openid_url'])),
 				dbesc(trim($_POST['openid_url'])),
diff --git a/include/queue.php b/include/queue.php
index da5028aee..fe96a75ce 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -83,7 +83,8 @@ function queue_run($argv, $argc){
 				continue;
 		}
 
-		$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+		$u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey` 
+			FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($c[0]['uid'])
 		);
 		if(! count($u)) {
@@ -124,7 +125,7 @@ function queue_run($argv, $argc){
 			case NETWORK_DIASPORA:
 				if($contact['notify']) {
 					logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
-					$deliver_status = diaspora_transmit($owner,$contact['notify'],$data);
+					$deliver_status = diaspora_transmit($owner,$contact,$data);
 
 					if($deliver_status == (-1))
 						update_queue_time($q_item['id']);
diff --git a/include/salmon.php b/include/salmon.php
index 4043b4f1d..ba61fffcc 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -73,6 +73,13 @@ function slapper($owner,$url,$slap) {
 	if(! strlen($url))
 		return;
 
+
+	if(! $owner['sprvkey']) {
+		logger(sprintf("slapper: user '%s' (%d) does not have a salmon private key. Send failed.",
+		$owner['username'],$owner['uid']));
+		return;
+	}
+
 	// add all namespaces to item
 
 $namespaces = <<< EOT
diff --git a/mod/openid.php b/mod/openid.php
index 6fbd013b8..3c3293147 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -55,7 +55,8 @@ function openid_content(&$a) {
 			} 
 
 
-			$r = q("SELECT * FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
+			$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` 
+				FROM `user` WHERE `openid` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
 				dbesc($_SESSION['openid'])
 			);
 			if(! count($r)) {