Notices what else? (#5545)

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

* We should initialize our variables

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 21c5d2c0fc118927c2b96840b4da07e2e72bec1f..484599f6fc51e2b9807b988b3c73189d58d91f01 100644 (file)
--- 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 333d9086ecc94f61e74e9cdf1d77c7075be51c8b..2d728f8e730f0bb4e309d783c8899ae8588260fc 100644 (file)
--- 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 8330250a7bb756b2aded74a9c3797c7c7ffb79e9..1a4dbc5a13c2e25ab380cdced9d0459bc3591102 100644 (file)
--- 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 c515e066a2888ddb1b124ea6567e0b622a188e7d..75312fee9744c7006fbc0bf64239ab9ef1e1e5db 100644 (file)
--- 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;