missing salmon key? report it.
This commit is contained in:
parent
96adbb6457
commit
8f6ae2b660
|
@ -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'])),
|
||||
|
|
|
@ -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']);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)) {
|
||||
|
|
Loading…
Reference in a new issue