}
if (!$system_mode && !$global) {
- $user = DBA::fetchFirst("SELECT `user`.`uid`, `user`.`nickname` FROM `user`
- INNER JOIN `profile` ON `user`.`uid` = `profile`.`uid`
- WHERE `user`.`nickname` = ? AND NOT `profile`.`hide-friends`",
- $nickname);
+ $user = DBA::selectFirst('owner-view', ['uid', 'nickname'], ['nickname' => $nickname, 'hide-friends' => false]);
if (!DBA::isResult($user)) {
throw new \Friendica\Network\HTTPException\NotFoundException();
}
$totalResults = DBA::count('profile', ['net-publish' => true]);
} else {
$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 NOT `failed`
AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra",
intval($user['uid']),
DBA::escape(Protocol::DFRN),
);
} elseif ($system_mode) {
Logger::log("Start system mode query", Logger::DEBUG);
- $contacts = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`,
- `profile`.`address` AS `paddress`, `profile`.`region` AS `pregion`,
- `profile`.`postal-code` AS `ppostalcode`, `profile`.`country-name` AS `pcountry`, `user`.`account-type`
- FROM `contact` INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid`
- INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
- WHERE `self` = 1 AND `profile`.`net-publish`
- LIMIT %d, %d",
- intval($startIndex),
- intval($itemsPerPage)
- );
+ $contacts = DBA::selectToArray('owner-view', [], ['net-publish' => true], ['limit' => [$startIndex, $itemsPerPage]]);
} else {
Logger::log("Start query for user " . $user['nickname'], Logger::DEBUG);
$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 NOT `failed`
AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra LIMIT %d, %d",
intval($user['uid']),
DBA::escape(Protocol::DFRN),
}
}
- if (is_array($contacts)) {
- if (DBA::isResult($contacts)) {
- foreach ($contacts as $contact) {
- if (!isset($contact['updated'])) {
- $contact['updated'] = '';
- }
+ if (!is_array($contacts)) {
+ throw new \Friendica\Network\HTTPException\InternalServerErrorException();
+ }
- if (! isset($contact['generation'])) {
- if ($global) {
- $contact['generation'] = 3;
- } elseif ($system_mode) {
- $contact['generation'] = 1;
- } else {
- $contact['generation'] = 2;
- }
- }
+ if (DBA::isResult($contacts)) {
+ foreach ($contacts as $contact) {
+ if (!isset($contact['updated'])) {
+ $contact['updated'] = '';
+ }
- if (($contact['about'] == "") && isset($contact['pabout'])) {
- $contact['about'] = $contact['pabout'];
+ if (! isset($contact['generation'])) {
+ if ($global) {
+ $contact['generation'] = 3;
+ } elseif ($system_mode) {
+ $contact['generation'] = 1;
+ } else {
+ $contact['generation'] = 2;
}
- if ($contact['location'] == "") {
- if (isset($contact['plocation'])) {
- $contact['location'] = $contact['plocation'];
- }
- if (isset($contact['pregion']) && ( $contact['pregion'] != "")) {
- if ($contact['location'] != "") {
- $contact['location'] .= ", ";
- }
- $contact['location'] .= $contact['pregion'];
- }
+ }
- if (isset($contact['pcountry']) && ( $contact['pcountry'] != "")) {
- if ($contact['location'] != "") {
- $contact['location'] .= ", ";
- }
- $contact['location'] .= $contact['pcountry'];
- }
- }
+ if (($contact['keywords'] == "") && isset($contact['pub_keywords'])) {
+ $contact['keywords'] = $contact['pub_keywords'];
+ }
+ if (isset($contact['account-type'])) {
+ $contact['contact-type'] = $contact['account-type'];
+ }
+ $about = DI::cache()->get("about:" . $contact['updated'] . ":" . $contact['nurl']);
+ if (is_null($about)) {
+ $about = BBCode::convert($contact['about'], false);
+ DI::cache()->set("about:" . $contact['updated'] . ":" . $contact['nurl'], $about);
+ }
- if (($contact['keywords'] == "") && isset($contact['pub_keywords'])) {
- $contact['keywords'] = $contact['pub_keywords'];
- }
- if (isset($contact['account-type'])) {
- $contact['contact-type'] = $contact['account-type'];
- }
- $about = DI::cache()->get("about:" . $contact['updated'] . ":" . $contact['nurl']);
- if (is_null($about)) {
- $about = BBCode::convert($contact['about'], false);
- DI::cache()->set("about:" . $contact['updated'] . ":" . $contact['nurl'], $about);
- }
+ // Non connected persons can only see the keywords of a Diaspora account
+ if ($contact['network'] == Protocol::DIASPORA) {
+ $contact['location'] = "";
+ $about = "";
+ }
- // Non connected persons can only see the keywords of a Diaspora account
- if ($contact['network'] == Protocol::DIASPORA) {
- $contact['location'] = "";
- $about = "";
+ $entry = [];
+ if ($fields_ret['id']) {
+ $entry['id'] = (int)$contact['id'];
+ }
+ if ($fields_ret['displayName']) {
+ $entry['displayName'] = $contact['name'];
+ }
+ if ($fields_ret['aboutMe']) {
+ $entry['aboutMe'] = $about;
+ }
+ if ($fields_ret['currentLocation']) {
+ $entry['currentLocation'] = $contact['location'];
+ }
+ if ($fields_ret['generation']) {
+ $entry['generation'] = (int)$contact['generation'];
+ }
+ if ($fields_ret['urls']) {
+ $entry['urls'] = [['value' => $contact['url'], 'type' => 'profile']];
+ if ($contact['addr'] && ($contact['network'] !== Protocol::MAIL)) {
+ $entry['urls'][] = ['value' => 'acct:' . $contact['addr'], 'type' => 'webfinger'];
}
+ }
+ if ($fields_ret['preferredUsername']) {
+ $entry['preferredUsername'] = $contact['nick'];
+ }
+ if ($fields_ret['updated']) {
+ if (! $global) {
+ $entry['updated'] = $contact['success_update'];
- $entry = [];
- if ($fields_ret['id']) {
- $entry['id'] = (int)$contact['id'];
- }
- if ($fields_ret['displayName']) {
- $entry['displayName'] = $contact['name'];
- }
- if ($fields_ret['aboutMe']) {
- $entry['aboutMe'] = $about;
- }
- if ($fields_ret['currentLocation']) {
- $entry['currentLocation'] = $contact['location'];
- }
- if ($fields_ret['generation']) {
- $entry['generation'] = (int)$contact['generation'];
- }
- if ($fields_ret['urls']) {
- $entry['urls'] = [['value' => $contact['url'], 'type' => 'profile']];
- if ($contact['addr'] && ($contact['network'] !== Protocol::MAIL)) {
- $entry['urls'][] = ['value' => 'acct:' . $contact['addr'], 'type' => 'webfinger'];
+ if ($contact['name-date'] > $entry['updated']) {
+ $entry['updated'] = $contact['name-date'];
}
- }
- if ($fields_ret['preferredUsername']) {
- $entry['preferredUsername'] = $contact['nick'];
- }
- if ($fields_ret['updated']) {
- if (! $global) {
- $entry['updated'] = $contact['success_update'];
-
- if ($contact['name-date'] > $entry['updated']) {
- $entry['updated'] = $contact['name-date'];
- }
- if ($contact['uri-date'] > $entry['updated']) {
- $entry['updated'] = $contact['uri-date'];
- }
- if ($contact['avatar-date'] > $entry['updated']) {
- $entry['updated'] = $contact['avatar-date'];
- }
- } else {
- $entry['updated'] = $contact['updated'];
+ if ($contact['uri-date'] > $entry['updated']) {
+ $entry['updated'] = $contact['uri-date'];
}
- $entry['updated'] = date("c", strtotime($entry['updated']));
+ if ($contact['avatar-date'] > $entry['updated']) {
+ $entry['updated'] = $contact['avatar-date'];
+ }
+ } else {
+ $entry['updated'] = $contact['updated'];
}
- if ($fields_ret['photos']) {
- $entry['photos'] = [['value' => $contact['photo'], 'type' => 'profile']];
+ $entry['updated'] = date("c", strtotime($entry['updated']));
+ }
+ if ($fields_ret['photos']) {
+ $entry['photos'] = [['value' => $contact['photo'], 'type' => 'profile']];
+ }
+ if ($fields_ret['network']) {
+ $entry['network'] = $contact['network'];
+ if ($entry['network'] == Protocol::STATUSNET) {
+ $entry['network'] = Protocol::OSTATUS;
}
- if ($fields_ret['network']) {
- $entry['network'] = $contact['network'];
- if ($entry['network'] == Protocol::STATUSNET) {
- $entry['network'] = Protocol::OSTATUS;
- }
- if (($entry['network'] == "") && ($contact['self'])) {
- $entry['network'] = Protocol::DFRN;
- }
+ if (($entry['network'] == "") && ($contact['self'])) {
+ $entry['network'] = Protocol::DFRN;
}
- if ($fields_ret['tags']) {
- $tags = str_replace(",", " ", $contact['keywords']);
- $tags = explode(" ", $tags);
-
- $cleaned = [];
- foreach ($tags as $tag) {
- $tag = trim(strtolower($tag));
- if ($tag != "") {
- $cleaned[] = $tag;
- }
+ }
+ if ($fields_ret['tags']) {
+ $tags = str_replace(",", " ", $contact['keywords']);
+ $tags = explode(" ", $tags);
+
+ $cleaned = [];
+ foreach ($tags as $tag) {
+ $tag = trim(strtolower($tag));
+ if ($tag != "") {
+ $cleaned[] = $tag;
}
-
- $entry['tags'] = [$cleaned];
}
- if ($fields_ret['address']) {
- $entry['address'] = [];
- // Deactivated. It just reveals too much data. (Although its from the default profile)
- //if (isset($rr['paddress']))
- // $entry['address']['streetAddress'] = $rr['paddress'];
+ $entry['tags'] = [$cleaned];
+ }
+ if ($fields_ret['address']) {
+ $entry['address'] = [];
- if (isset($contact['plocation'])) {
- $entry['address']['locality'] = $contact['plocation'];
- }
- if (isset($contact['pregion'])) {
- $entry['address']['region'] = $contact['pregion'];
- }
- // See above
- //if (isset($rr['ppostalcode']))
- // $entry['address']['postalCode'] = $rr['ppostalcode'];
+ // Deactivated. It just reveals too much data. (Although its from the default profile)
+ //if (isset($rr['address']))
+ // $entry['address']['streetAddress'] = $rr['address'];
- if (isset($contact['pcountry'])) {
- $entry['address']['country'] = $contact['pcountry'];
- }
+ if (isset($contact['locality'])) {
+ $entry['address']['locality'] = $contact['locality'];
+ }
+ if (isset($contact['region'])) {
+ $entry['address']['region'] = $contact['region'];
}
+ // See above
+ //if (isset($rr['postal-code']))
+ // $entry['address']['postalCode'] = $rr['postal-code'];
- if ($fields_ret['contactType']) {
- $entry['contactType'] = intval($contact['contact-type']);
+ if (isset($contact['country'])) {
+ $entry['address']['country'] = $contact['country'];
}
- $ret['entry'][] = $entry;
}
- } else {
- $ret['entry'][] = [];
+
+ if ($fields_ret['contactType']) {
+ $entry['contactType'] = intval($contact['contact-type']);
+ }
+ $ret['entry'][] = $entry;
}
} else {
- throw new \Friendica\Network\HTTPException\InternalServerErrorException();
+ $ret['entry'][] = [];
}
Logger::log("End of poco", Logger::DEBUG);
projects / friendica.git / blobdiff