bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #2981 from rabuzarus/20161129_-_small_dfrn_request_polish

Browse source 
dfrn_request: fix forgotten value variable + added $blocked and $pending also for other queries
This commit is contained in:
Michael Vogel 2016-11-29 19:33:57 +01:00 committed by GitHub
parent 250f978872 54f3867ebd
commit fa8eb101d4
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
mod/dfrn_request.php
View file

@ -151,7 +151,7 @@ function dfrn_request_post(&$a) {
$r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`, $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `addr`, `name`, `nick`, `photo`, `site-pubkey`,
`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`) `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`)
VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)", VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)",
intval(local_user()), intval(local_user()),
datetime_convert(), datetime_convert(),
dbesc($dfrn_url), dbesc($dfrn_url),
@ -256,6 +256,8 @@ function dfrn_request_post(&$a) {
$contact_record = null; $contact_record = null;
$failed = false; $failed = false;
$parms = null; $parms = null;
$blocked = 1;
$pending = 1;
if( x($_POST,'dfrn_url')) { if( x($_POST,'dfrn_url')) {
@ -354,8 +356,6 @@ function dfrn_request_post(&$a) {
$nurl = normalise_url($host); $nurl = normalise_url($host);
$poll = 'email ' . random_string(); $poll = 'email ' . random_string();
$notify = 'smtp ' . random_string(); $notify = 'smtp ' . random_string();
$blocked = 1;
$pending = 1;
$network = NETWORK_MAIL2; $network = NETWORK_MAIL2;
$rel = CONTACT_IS_FOLLOWER; $rel = CONTACT_IS_FOLLOWER;
@ -540,8 +540,8 @@ function dfrn_request_post(&$a) {
dbesc_array($parms); dbesc_array($parms);
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`, $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
`request`, `confirm`, `notify`, `poll`, `poco`, `network` ) `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `blocked`, `pending` )
VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )", VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
intval($uid), intval($uid),
dbesc(datetime_convert()), dbesc(datetime_convert()),
$parms['url'], $parms['url'],
@ -557,7 +557,9 @@ function dfrn_request_post(&$a) {
$parms['dfrn-notify'], $parms['dfrn-notify'],
$parms['dfrn-poll'], $parms['dfrn-poll'],
$parms['dfrn-poco'], $parms['dfrn-poco'],
dbesc(NETWORK_DFRN) dbesc(NETWORK_DFRN),
intval($blocked),
intval($pending)
); );
// find the contact record we just created // find the contact record we just created