friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Notices what else? (#5545) 

* Poco isn't filled, so we cannot store it

* We should initialize our variables
This commit is contained in:
Michael Vogel 2018-08-02 16:11:21 +02:00 committed by Tobias Diekershoff
parent c72c64a6d8
commit 65d752d03c
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/dfrn_request.php
View File

@ -133,8 +133,8 @@ function dfrn_request_post(App $a)
// Create a contact record on our site for the other person
$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`)
VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)",
`request`, `confirm`, `notify`, `poll`, `network`, `aes_allow`, `hidden`, `blocked`, `pending`)
VALUES ( %d, '%s', '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d)",
intval(local_user()),
DateTimeFormat::utcNow(),
DBA::escape($dfrn_url),
@ -148,7 +148,6 @@ function dfrn_request_post(App $a)
$parms['dfrn-confirm'],
$parms['dfrn-notify'],
$parms['dfrn-poll'],
$parms['dfrn-poco'],
DBA::escape(NETWORK_DFRN),
intval($aes_allow),
intval($hidden),
@ -373,8 +372,8 @@ function dfrn_request_post(App $a)
DBA::escapeArray($parms);
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
`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', %d, %d )",
`request`, `confirm`, `notify`, `poll`, `network`, `blocked`, `pending` )
VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
intval($uid),
DBA::escape(DateTimeFormat::utcNow()),
$parms['url'],
@ -389,7 +388,6 @@ function dfrn_request_post(App $a)
$parms['dfrn-confirm'],
$parms['dfrn-notify'],
$parms['dfrn-poll'],
$parms['dfrn-poco'],
DBA::escape(NETWORK_DFRN),
intval($blocked),
intval($pending)

2
mod/dirfind.php
View File

@ -45,6 +45,8 @@ function dirfind_content(App $a, $prefix = "") {
$search = $prefix.notags(trim($_REQUEST['search']));
$header = '';
if (strpos($search,'@') === 0) {
$search = substr($search,1);
$header = L10n::t('People Search - %s', $search);

2
mod/suggest.php
View File

@ -74,6 +74,8 @@ function suggest_content(App $a)
return $o;
}
$id = 0;
foreach ($r as $rr) {
$connlnk = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);

7
src/Network/Probe.php
View File

@ -925,7 +925,6 @@ class Probe
|| !isset($data["confirm"])
|| !isset($data["request"])
|| !isset($data["poll"])
|| !isset($data["poco"])
|| !isset($data["name"])
|| !isset($data["photo"])
) {
@ -939,16 +938,10 @@ class Probe
$prof_data["dfrn-confirm"] = $data["confirm"];
$prof_data["dfrn-notify"] = $data["notify"];
$prof_data["dfrn-poll"] = $data["poll"];
$prof_data["dfrn-poco"] = $data["poco"];
$prof_data["photo"] = $data["photo"];
$prof_data["fn"] = $data["name"];
$prof_data["key"] = $data["pubkey"];
// This logging is for temporarily debugging reasons
if (!isset($data["poco"])) {
logger('POCO not defined for ' . $profile_link . ' - ' . System::callstack(), LOGGER_DEBUG);
}
logger("Result for profile ".$profile_link.": ".print_r($prof_data, true), LOGGER_DEBUG);
return $prof_data;