X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoco.php;h=761a9c2b80858bf0d4ea79250798e35748899e9a;hb=56c3b3f653bfe2d789470c9bb8434845d3387745;hp=97f518a1a55cbcc1a8fc02b6f605f5e35a824a17;hpb=8f253f6c1288534c50fac34f05afb1a2c07c9335;p=friendica.git diff --git a/mod/poco.php b/mod/poco.php index 97f518a1a5..761a9c2b80 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -4,7 +4,10 @@ // https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html use Friendica\App; +use Friendica\Core\Cache; use Friendica\Core\Config; +use Friendica\Database\DBM; +use Friendica\Protocol\PortableContact; function poco_init(App $a) { $system_mode = false; @@ -18,7 +21,7 @@ function poco_init(App $a) { } if (! x($user)) { $c = q("SELECT * FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1"); - if (! dbm::is_result($c)) { + if (! DBM::is_result($c)) { http_status_exit(401); } $system_mode = true; @@ -30,9 +33,8 @@ function poco_init(App $a) { $global = false; if ($a->argc > 1 && $a->argv[1] === '@server') { - require_once 'include/socgraph.php'; // List of all servers that this server knows - $ret = poco_serverlist(); + $ret = PortableContact::serverlist(); header('Content-type: application/json'); echo json_encode($ret); killme(); @@ -55,12 +57,12 @@ function poco_init(App $a) { $cid = intval($a->argv[4]); } - if (! $system_mode AND ! $global) { + if (! $system_mode && ! $global) { $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", dbesc($user) ); - if (! dbm::is_result($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) { + if (! DBM::is_result($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) { http_status_exit(404); } @@ -100,7 +102,7 @@ function poco_init(App $a) { dbesc(NETWORK_STATUSNET) ); } - if (dbm::is_result($contacts)) { + if (DBM::is_result($contacts)) { $totalResults = intval($contacts[0]['total']); } else { $totalResults = 0; @@ -150,23 +152,23 @@ function poco_init(App $a) { } logger("Query done", LOGGER_DEBUG); - $ret = array(); + $ret = []; if (x($_GET, 'sorted')) { $ret['sorted'] = false; } if (x($_GET, 'filtered')) { $ret['filtered'] = false; } - if (x($_GET, 'updatedSince') AND ! $global) { + if (x($_GET, 'updatedSince') && ! $global) { $ret['updatedSince'] = false; } $ret['startIndex'] = (int) $startIndex; $ret['itemsPerPage'] = (int) $itemsPerPage; $ret['totalResults'] = (int) $totalResults; - $ret['entry'] = array(); + $ret['entry'] = []; - $fields_ret = array( + $fields_ret = [ 'id' => false, 'displayName' => false, 'urls' => false, @@ -181,7 +183,7 @@ function poco_init(App $a) { 'address' => false, 'contactType' => false, 'generation' => false - ); + ]; if ((! x($_GET, 'fields')) || ($_GET['fields'] === '@all')) { foreach ($fields_ret as $k => $v) { @@ -195,7 +197,7 @@ function poco_init(App $a) { } if (is_array($contacts)) { - if (dbm::is_result($contacts)) { + if (DBM::is_result($contacts)) { foreach ($contacts as $contact) { if (! isset($contact['generation'])) { if ($global) { @@ -207,21 +209,21 @@ function poco_init(App $a) { } } - if (($contact['about'] == "") AND isset($contact['pabout'])) { + if (($contact['about'] == "") && isset($contact['pabout'])) { $contact['about'] = $contact['pabout']; } if ($contact['location'] == "") { if (isset($contact['plocation'])) { $contact['location'] = $contact['plocation']; } - if (isset($contact['pregion']) AND ( $contact['pregion'] != "")) { + if (isset($contact['pregion']) && ( $contact['pregion'] != "")) { if ($contact['location'] != "") { $contact['location'] .= ", "; } $contact['location'] .= $contact['pregion']; } - if (isset($contact['pcountry']) AND ( $contact['pcountry'] != "")) { + if (isset($contact['pcountry']) && ( $contact['pcountry'] != "")) { if ($contact['location'] != "") { $contact['location'] .= ", "; } @@ -229,10 +231,10 @@ function poco_init(App $a) { } } - if (($contact['gender'] == "") AND isset($contact['pgender'])) { + if (($contact['gender'] == "") && isset($contact['pgender'])) { $contact['gender'] = $contact['pgender']; } - if (($contact['keywords'] == "") AND isset($contact['pub_keywords'])) { + if (($contact['keywords'] == "") && isset($contact['pub_keywords'])) { $contact['keywords'] = $contact['pub_keywords']; } if (isset($contact['account-type'])) { @@ -252,7 +254,7 @@ function poco_init(App $a) { $contact['gender'] = ""; } - $entry = array(); + $entry = []; if ($fields_ret['id']) { $entry['id'] = (int)$contact['id']; } @@ -272,9 +274,9 @@ function poco_init(App $a) { $entry['generation'] = (int)$contact['generation']; } if ($fields_ret['urls']) { - $entry['urls'] = array(array('value' => $contact['url'], 'type' => 'profile')); + $entry['urls'] = [['value' => $contact['url'], 'type' => 'profile']]; if ($contact['addr'] && ($contact['network'] !== NETWORK_MAIL)) { - $entry['urls'][] = array('value' => 'acct:' . $contact['addr'], 'type' => 'webfinger'); + $entry['urls'][] = ['value' => 'acct:' . $contact['addr'], 'type' => 'webfinger']; } } if ($fields_ret['preferredUsername']) { @@ -299,14 +301,14 @@ function poco_init(App $a) { $entry['updated'] = date("c", strtotime($entry['updated'])); } if ($fields_ret['photos']) { - $entry['photos'] = array(array('value' => $contact['photo'], 'type' => 'profile')); + $entry['photos'] = [['value' => $contact['photo'], 'type' => 'profile']]; } if ($fields_ret['network']) { $entry['network'] = $contact['network']; if ($entry['network'] == NETWORK_STATUSNET) { $entry['network'] = NETWORK_OSTATUS; } - if (($entry['network'] == "") AND ($contact['self'])) { + if (($entry['network'] == "") && ($contact['self'])) { $entry['network'] = NETWORK_DFRN; } } @@ -314,7 +316,7 @@ function poco_init(App $a) { $tags = str_replace(",", " ", $contact['keywords']); $tags = explode(" ", $tags); - $cleaned = array(); + $cleaned = []; foreach ($tags as $tag) { $tag = trim(strtolower($tag)); if ($tag != "") { @@ -322,10 +324,10 @@ function poco_init(App $a) { } } - $entry['tags'] = array($cleaned); + $entry['tags'] = [$cleaned]; } if ($fields_ret['address']) { - $entry['address'] = array(); + $entry['address'] = []; // Deactivated. It just reveals too much data. (Although its from the default profile) //if (isset($rr['paddress'])) @@ -352,7 +354,7 @@ function poco_init(App $a) { $ret['entry'][] = $entry; } } else { - $ret['entry'][] = array(); + $ret['entry'][] = []; } } else { http_status_exit(500); @@ -361,7 +363,7 @@ function poco_init(App $a) { if ($format === '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(['$response' => $ret])); killme(); } if ($format === 'json') {