clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3458 from Hypolite/bug/missing-require-poco 

Missing require for poco_serverlist
This commit is contained in:
Michael Vogel 2017-05-09 06:56:32 +02:00 committed by GitHub
parent 6f6b029c4d 108f0b2d1e
commit bc724f2b68
1 changed files with 89 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
mod/poco.php
View File

@ -1,15 +1,15 @@
<?php <?php
// See here for a documentation for portable contacts: // See here for a documentation for portable contacts:
// https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html // https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
function poco_init(App $a) { function poco_init(App $a) {
require_once("include/bbcode.php");
$system_mode = false; $system_mode = false;
if (intval(get_config('system','block_public')) || (get_config('system','block_local_dir'))) { if (intval(Config::get('system', 'block_public')) || (Config::get('system', 'block_local_dir'))) {
http_status_exit(401); http_status_exit(401);
} }
@ -30,6 +30,7 @@ function poco_init(App $a) {
$global = false; $global = false;
if ($a->argc > 1 && $a->argv[1] === '@server') { if ($a->argc > 1 && $a->argv[1] === '@server') {
require_once 'include/socgraph.php';
// List of all servers that this server knows // List of all servers that this server knows
$ret = poco_serverlist(); $ret = poco_serverlist();
header('Content-type: application/json'); header('Content-type: application/json');
@ -54,16 +55,16 @@ function poco_init(App $a) {
$cid = intval($a->argv[4]); $cid = intval($a->argv[4]);
} }
if (!$system_mode AND !$global) { if (! $system_mode AND ! $global) {
$r = q("SELECT `user`.*,`profile`.`hide-friends` from user left join profile on `user`.`uid` = `profile`.`uid` $users = q("SELECT `user`.*,`profile`.`hide-friends` from user left join profile on `user`.`uid` = `profile`.`uid`
where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1", where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1",
dbesc($user) dbesc($user)
); );
if (! dbm::is_result($r) || $r[0]['hidewall'] || $r[0]['hide-friends']) { if (! dbm::is_result($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) {
http_status_exit(404); http_status_exit(404);
} }
$user = $r[0]; $user = $users[0];
} }
if ($justme) { if ($justme) {
@ -73,23 +74,23 @@ function poco_init(App $a) {
// $sql_extra = " AND `contact`.`self` = 0 "; // $sql_extra = " AND `contact`.`self` = 0 ";
if ($cid) { if ($cid) {
$sql_extra = sprintf(" AND `contact`.`id` = %d ",intval($cid)); $sql_extra = sprintf(" AND `contact`.`id` = %d ", intval($cid));
} }
if (x($_GET,'updatedSince')) { if (x($_GET, 'updatedSince')) {
$update_limit = date("Y-m-d H:i:s",strtotime($_GET['updatedSince'])); $update_limit = date("Y-m-d H:i:s", strtotime($_GET['updatedSince']));
} }
if ($global) { if ($global) {
$r = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure` AND NOT `hide` AND `network` IN ('%s', '%s', '%s')", $contacts = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure` AND NOT `hide` AND `network` IN ('%s', '%s', '%s')",
dbesc($update_limit), dbesc($update_limit),
dbesc(NETWORK_DFRN), dbesc(NETWORK_DFRN),
dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DIASPORA),
dbesc(NETWORK_OSTATUS) dbesc(NETWORK_OSTATUS)
); );
} elseif ($system_mode) { } elseif ($system_mode) {
$r = q("SELECT count(*) AS `total` FROM `contact` WHERE `self` = 1 $contacts = q("SELECT count(*) AS `total` FROM `contact` WHERE `self` = 1
AND `uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) "); AND `uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) ");
} else { } else {
$r = q("SELECT count(*) AS `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 $contacts = q("SELECT count(*) AS `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`) AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`)
AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra", AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra",
intval($user['uid']), intval($user['uid']),
@ -99,8 +100,8 @@ function poco_init(App $a) {
dbesc(NETWORK_STATUSNET) dbesc(NETWORK_STATUSNET)
); );
} }
if (dbm::is_result($r)) { if (dbm::is_result($contacts)) {
$totalResults = intval($r[0]['total']); $totalResults = intval($contacts[0]['total']);
} else { } else {
$totalResults = 0; $totalResults = 0;
} }
@ -108,11 +109,11 @@ function poco_init(App $a) {
if (! $startIndex) { if (! $startIndex) {
$startIndex = 0; $startIndex = 0;
} }
$itemsPerPage = ((x($_GET,'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults); $itemsPerPage = ((x($_GET, 'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
if ($global) { if ($global) {
logger("Start global query", LOGGER_DEBUG); logger("Start global query", LOGGER_DEBUG);
$r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND NOT `hide` AND `network` IN ('%s', '%s', '%s') AND `updated` > `last_failure` $contacts = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND NOT `hide` AND `network` IN ('%s', '%s', '%s') AND `updated` > `last_failure`
ORDER BY `updated` DESC LIMIT %d, %d", ORDER BY `updated` DESC LIMIT %d, %d",
dbesc($update_limit), dbesc($update_limit),
dbesc(NETWORK_DFRN), dbesc(NETWORK_DFRN),
@ -123,7 +124,7 @@ function poco_init(App $a) {
); );
} elseif ($system_mode) { } elseif ($system_mode) {
logger("Start system mode query", LOGGER_DEBUG); logger("Start system mode query", LOGGER_DEBUG);
$r = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`, $contacts = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`,
`profile`.`gender` AS `pgender`, `profile`.`address` AS `paddress`, `profile`.`region` AS `pregion`, `profile`.`gender` AS `pgender`, `profile`.`address` AS `paddress`, `profile`.`region` AS `pregion`,
`profile`.`postal-code` AS `ppostalcode`, `profile`.`country-name` AS `pcountry`, `user`.`account-type` `profile`.`postal-code` AS `ppostalcode`, `profile`.`country-name` AS `pcountry`, `user`.`account-type`
FROM `contact` INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid` FROM `contact` INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid`
@ -134,8 +135,8 @@ function poco_init(App $a) {
intval($itemsPerPage) intval($itemsPerPage)
); );
} else { } else {
logger("Start query for user ".$user['nickname'], LOGGER_DEBUG); logger("Start query for user " . $user['nickname'], LOGGER_DEBUG);
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 $contacts = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`) AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`)
AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra LIMIT %d, %d", AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra LIMIT %d, %d",
intval($user['uid']), intval($user['uid']),
@ -150,13 +151,13 @@ function poco_init(App $a) {
logger("Query done", LOGGER_DEBUG); logger("Query done", LOGGER_DEBUG);
$ret = array(); $ret = array();
if (x($_GET,'sorted')) { if (x($_GET, 'sorted')) {
$ret['sorted'] = false; $ret['sorted'] = false;
} }
if (x($_GET,'filtered')) { if (x($_GET, 'filtered')) {
$ret['filtered'] = false; $ret['filtered'] = false;
} }
if (x($_GET,'updatedSince') AND !$global) { if (x($_GET, 'updatedSince') AND ! $global) {
$ret['updatedSince'] = false; $ret['updatedSince'] = false;
} }
$ret['startIndex'] = (int) $startIndex; $ret['startIndex'] = (int) $startIndex;
@ -182,134 +183,135 @@ function poco_init(App $a) {
'generation' => false 'generation' => false
); );
if ((! x($_GET,'fields')) || ($_GET['fields'] === '@all')) { if ((! x($_GET, 'fields')) || ($_GET['fields'] === '@all')) {
foreach ($fields_ret as $k => $v) { foreach ($fields_ret as $k => $v) {
$fields_ret[$k] = true; $fields_ret[$k] = true;
} }
} else { } else {
$fields_req = explode(',',$_GET['fields']); $fields_req = explode(',', $_GET['fields']);
foreach ($fields_req as $f) { foreach ($fields_req as $f) {
$fields_ret[trim($f)] = true; $fields_ret[trim($f)] = true;
} }
} }
if (is_array($r)) { if (is_array($contacts)) {
if (dbm::is_result($r)) { if (dbm::is_result($contacts)) {
foreach ($r as $rr) { foreach ($contacts as $contact) {
if (!isset($rr['generation'])) { if (! isset($contact['generation'])) {
if ($global) { if ($global) {
$rr['generation'] = 3; $contact['generation'] = 3;
} elseif ($system_mode) { } elseif ($system_mode) {
$rr['generation'] = 1; $contact['generation'] = 1;
} else { } else {
$rr['generation'] = 2; $contact['generation'] = 2;
} }
} }
if (($rr['about'] == "") AND isset($rr['pabout'])) { if (($contact['about'] == "") AND isset($contact['pabout'])) {
$rr['about'] = $rr['pabout']; $contact['about'] = $contact['pabout'];
} }
if ($rr['location'] == "") { if ($contact['location'] == "") {
if (isset($rr['plocation'])) { if (isset($contact['plocation'])) {
$rr['location'] = $rr['plocation']; $contact['location'] = $contact['plocation'];
} }
if (isset($rr['pregion']) AND ($rr['pregion'] != "")) { if (isset($contact['pregion']) AND ( $contact['pregion'] != "")) {
if ($rr['location'] != "") { if ($contact['location'] != "") {
$rr['location'] .= ", "; $contact['location'] .= ", ";
} }
$rr['location'] .= $rr['pregion']; $contact['location'] .= $contact['pregion'];
} }
if (isset($rr['pcountry']) AND ($rr['pcountry'] != "")) { if (isset($contact['pcountry']) AND ( $contact['pcountry'] != "")) {
if ($rr['location'] != "") { if ($contact['location'] != "") {
$rr['location'] .= ", "; $contact['location'] .= ", ";
} }
$rr['location'] .= $rr['pcountry']; $contact['location'] .= $contact['pcountry'];
} }
} }
if (($rr['gender'] == "") AND isset($rr['pgender'])) { if (($contact['gender'] == "") AND isset($contact['pgender'])) {
$rr['gender'] = $rr['pgender']; $contact['gender'] = $contact['pgender'];
} }
if (($rr['keywords'] == "") AND isset($rr['pub_keywords'])) { if (($contact['keywords'] == "") AND isset($contact['pub_keywords'])) {
$rr['keywords'] = $rr['pub_keywords']; $contact['keywords'] = $contact['pub_keywords'];
} }
if (isset($rr['account-type'])) { if (isset($contact['account-type'])) {
$rr['contact-type'] = $rr['account-type']; $contact['contact-type'] = $contact['account-type'];
} }
$about = Cache::get("about:".$rr['updated'].":".$rr['nurl']); $about = Cache::get("about:" . $contact['updated'] . ":" . $contact['nurl']);
if (is_null($about)) { if (is_null($about)) {
$about = bbcode($rr['about'], false, false); require_once 'include/bbcode.php';
Cache::set("about:".$rr['updated'].":".$rr['nurl'],$about); $about = bbcode($contact['about'], false, false);
Cache::set("about:" . $contact['updated'] . ":" . $contact['nurl'], $about);
} }
// Non connected persons can only see the keywords of a Diaspora account // Non connected persons can only see the keywords of a Diaspora account
if ($rr['network'] == NETWORK_DIASPORA) { if ($contact['network'] == NETWORK_DIASPORA) {
$rr['location'] = ""; $contact['location'] = "";
$about = ""; $about = "";
$rr['gender'] = ""; $contact['gender'] = "";
} }
$entry = array(); $entry = array();
if ($fields_ret['id']) { if ($fields_ret['id']) {
$entry['id'] = (int)$rr['id']; $entry['id'] = (int)$contact['id'];
} }
if ($fields_ret['displayName']) { if ($fields_ret['displayName']) {
$entry['displayName'] = $rr['name']; $entry['displayName'] = $contact['name'];
} }
if ($fields_ret['aboutMe']) { if ($fields_ret['aboutMe']) {
$entry['aboutMe'] = $about; $entry['aboutMe'] = $about;
} }
if ($fields_ret['currentLocation']) { if ($fields_ret['currentLocation']) {
$entry['currentLocation'] = $rr['location']; $entry['currentLocation'] = $contact['location'];
} }
if ($fields_ret['gender']) { if ($fields_ret['gender']) {
$entry['gender'] = $rr['gender']; $entry['gender'] = $contact['gender'];
} }
if ($fields_ret['generation']) { if ($fields_ret['generation']) {
$entry['generation'] = (int)$rr['generation']; $entry['generation'] = (int)$contact['generation'];
} }
if ($fields_ret['urls']) { if ($fields_ret['urls']) {
$entry['urls'] = array(array('value' => $rr['url'], 'type' => 'profile')); $entry['urls'] = array(array('value' => $contact['url'], 'type' => 'profile'));
if ($rr['addr'] && ($rr['network'] !== NETWORK_MAIL)) { if ($contact['addr'] && ($contact['network'] !== NETWORK_MAIL)) {
$entry['urls'][] = array('value' => 'acct:' . $rr['addr'], 'type' => 'webfinger'); $entry['urls'][] = array('value' => 'acct:' . $contact['addr'], 'type' => 'webfinger');
} }
} }
if ($fields_ret['preferredUsername']) { if ($fields_ret['preferredUsername']) {
$entry['preferredUsername'] = $rr['nick']; $entry['preferredUsername'] = $contact['nick'];
} }
if ($fields_ret['updated']) { if ($fields_ret['updated']) {
if (!$global) { if (! $global) {
$entry['updated'] = $rr['success_update']; $entry['updated'] = $contact['success_update'];
if ($rr['name-date'] > $entry['updated']) { if ($contact['name-date'] > $entry['updated']) {
$entry['updated'] = $rr['name-date']; $entry['updated'] = $contact['name-date'];
} }
if ($rr['uri-date'] > $entry['updated']) { if ($contact['uri-date'] > $entry['updated']) {
$entry['updated'] = $rr['uri-date']; $entry['updated'] = $contact['uri-date'];
} }
if ($rr['avatar-date'] > $entry['updated']) { if ($contact['avatar-date'] > $entry['updated']) {
$entry['updated'] = $rr['avatar-date']; $entry['updated'] = $contact['avatar-date'];
} }
} else { } else {
$entry['updated'] = $rr['updated']; $entry['updated'] = $contact['updated'];
} }
$entry['updated'] = date("c", strtotime($entry['updated'])); $entry['updated'] = date("c", strtotime($entry['updated']));
} }
if ($fields_ret['photos']) { if ($fields_ret['photos']) {
$entry['photos'] = array(array('value' => $rr['photo'], 'type' => 'profile')); $entry['photos'] = array(array('value' => $contact['photo'], 'type' => 'profile'));
} }
if ($fields_ret['network']) { if ($fields_ret['network']) {
$entry['network'] = $rr['network']; $entry['network'] = $contact['network'];
if ($entry['network'] == NETWORK_STATUSNET) { if ($entry['network'] == NETWORK_STATUSNET) {
$entry['network'] = NETWORK_OSTATUS; $entry['network'] = NETWORK_OSTATUS;
} }
if (($entry['network'] == "") AND ($rr['self'])) { if (($entry['network'] == "") AND ($contact['self'])) {
$entry['network'] = NETWORK_DFRN; $entry['network'] = NETWORK_DFRN;
} }
} }
if ($fields_ret['tags']) { if ($fields_ret['tags']) {
$tags = str_replace(","," ",$rr['keywords']); $tags = str_replace(",", " ", $contact['keywords']);
$tags = explode(" ", $tags); $tags = explode(" ", $tags);
$cleaned = array(); $cleaned = array();
@ -329,23 +331,23 @@ function poco_init(App $a) {
//if (isset($rr['paddress'])) //if (isset($rr['paddress']))
// $entry['address']['streetAddress'] = $rr['paddress']; // $entry['address']['streetAddress'] = $rr['paddress'];
if (isset($rr['plocation'])) { if (isset($contact['plocation'])) {
$entry['address']['locality'] = $rr['plocation']; $entry['address']['locality'] = $contact['plocation'];
} }
if (isset($rr['pregion'])) { if (isset($contact['pregion'])) {
$entry['address']['region'] = $rr['pregion']; $entry['address']['region'] = $contact['pregion'];
} }
// See above // See above
//if (isset($rr['ppostalcode'])) //if (isset($rr['ppostalcode']))
// $entry['address']['postalCode'] = $rr['ppostalcode']; // $entry['address']['postalCode'] = $rr['ppostalcode'];
if (isset($rr['pcountry'])) { if (isset($contact['pcountry'])) {
$entry['address']['country'] = $rr['pcountry']; $entry['address']['country'] = $contact['pcountry'];
} }
} }
if ($fields_ret['contactType']) { if ($fields_ret['contactType']) {
$entry['contactType'] = intval($rr['contact-type']); $entry['contactType'] = intval($contact['contact-type']);
} }
$ret['entry'][] = $entry; $ret['entry'][] = $entry;
} }
@ -359,7 +361,7 @@ function poco_init(App $a) {
if ($format === 'xml') { if ($format === 'xml') {
header('Content-type: text/xml'); header('Content-type: text/xml');
echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret))); echo replace_macros(get_markup_template('poco_xml.tpl'), array_xmlify(array('$response' => $ret)));
killme(); killme();
} }
if ($format === 'json') { if ($format === 'json') {