From 65d752d03c102173dee86d9ef1cb39d5891c8f09 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Thu, 2 Aug 2018 16:11:21 +0200
Subject: [PATCH] Notices what else? (#5545)

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

* We should initialize our variables
---
 mod/dfrn_request.php  | 10 ++++------
 mod/dirfind.php       |  2 ++
 mod/suggest.php       |  2 ++
 src/Network/Probe.php |  7 -------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 21c5d2c0f..484599f6f 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -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)
diff --git a/mod/dirfind.php b/mod/dirfind.php
index 333d9086e..2d728f8e7 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -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);
diff --git a/mod/suggest.php b/mod/suggest.php
index 8330250a7..1a4dbc5a1 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -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']);
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index c515e066a..75312fee9 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -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;