From 4dfe64bd5a63ed09c64b087f49eaa5f68aea3edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20H=C3=A4der?= Date: Tue, 20 Dec 2016 10:39:06 +0100 Subject: [PATCH] Coding convention: - added curly braces - added space between "if" and brace - also added TODO (old-lost code?) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- mod/hcard.php | 5 +++-- mod/noscrape.php | 11 ++++++++--- mod/profile.php | 3 ++- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/mod/hcard.php b/mod/hcard.php index 1231d71e6..366986344 100644 --- a/mod/hcard.php +++ b/mod/hcard.php @@ -42,10 +42,11 @@ function hcard_init(&$a) { $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : '')); $a->page['htmlhead'] .= '' . "\r\n"; header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false); - + $dfrn_pages = array('request', 'confirm', 'notify', 'poll'); - foreach($dfrn_pages as $dfrn) + foreach($dfrn_pages as $dfrn) { $a->page['htmlhead'] .= "\r\n"; + } } diff --git a/mod/noscrape.php b/mod/noscrape.php index 289d0499e..98d491bca 100644 --- a/mod/noscrape.php +++ b/mod/noscrape.php @@ -26,6 +26,7 @@ function noscrape_init(&$a) { $keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords); $keywords = explode(',', $keywords); + /// @TODO This query's result is not being used (see below), maybe old-lost code? $r = q("SELECT `photo` FROM `contact` WHERE `self` AND `uid` = %d", intval($a->profile['uid'])); @@ -59,12 +60,16 @@ function noscrape_init(&$a) { //These are optional fields. $profile_fields = array('pdesc', 'locality', 'region', 'postal-code', 'country-name', 'gender', 'marital', 'about'); - foreach($profile_fields as $field) - if(!empty($a->profile[$field])) $json_info["$field"] = $a->profile[$field]; + foreach($profile_fields as $field) { + if(!empty($a->profile[$field])) { + $json_info["$field"] = $a->profile[$field]; + } + } $dfrn_pages = array('request', 'confirm', 'notify', 'poll'); - foreach($dfrn_pages as $dfrn) + foreach($dfrn_pages as $dfrn) { $json_info["dfrn-{$dfrn}"] = App::get_baseurl()."/dfrn_{$dfrn}/{$which}"; + } //Output all the JSON! header('Content-type: application/json; charset=utf-8'); diff --git a/mod/profile.php b/mod/profile.php index a4b618371..20206c733 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -62,8 +62,9 @@ function profile_init(&$a) { header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false); $dfrn_pages = array('request', 'confirm', 'notify', 'poll'); - foreach($dfrn_pages as $dfrn) + foreach($dfrn_pages as $dfrn) { $a->page['htmlhead'] .= "\r\n"; + } $a->page['htmlhead'] .= "\r\n"; }