X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoco.php;h=ae03aef2cdba27e352834301bde64db12b1149dc;hb=e61d6e030eefa00685020f44601d3363814a5dae;hp=c8d8f72e830bde688a4f503783b3156df0533447;hpb=583c2ce13e710433d30490bae6b37e536c8e8596;p=friendica.git diff --git a/mod/poco.php b/mod/poco.php index c8d8f72e83..ae03aef2cd 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -5,7 +5,7 @@ function poco_init(&$a) { $system_mode = false; - if(intval(get_config('system','block_public'))) + if(intval(get_config('system','block_public')) || (get_config('system','block_local_dir'))) http_status_exit(401); @@ -61,21 +61,20 @@ function poco_init(&$a) { $update_limit = date("Y-m-d H:i:s",strtotime($_GET['updatedSince'])); if ($global) { - $r = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `network` IN ('%s')", + //$r = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND ((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) AND `network` IN ('%s')", + $r = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure` AND `network` IN ('%s', '%s', '%s')", dbesc($update_limit), - dbesc(NETWORK_DFRN) - ); - } elseif($system_mode) { - $r = q("SELECT count(*) AS `total` FROM `contact` WHERE `self` = 1 AND `network` IN ('%s', '%s', '%s', '%s', '') - AND `uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) ", dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), - dbesc(NETWORK_OSTATUS), - dbesc(NETWORK_STATUSNET) - ); + dbesc(NETWORK_OSTATUS) + ); + } elseif($system_mode) { + $r = 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) "); } else { $r = q("SELECT count(*) AS `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0 - AND `network` IN ('%s', '%s', '%s', '%s', '') $sql_extra", + AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`) + AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra", intval($user['uid']), dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), @@ -93,29 +92,33 @@ function poco_init(&$a) { $startIndex = 0; $itemsPerPage = ((x($_GET,'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults); - if ($global) { - $r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND `network` IN ('%s') LIMIT %d, %d", + logger("Start global query", LOGGER_DEBUG); + //$r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND `network` IN ('%s') AND ((`last_contact` >= `last_failure`) OR (`updated` > `last_failure`)) LIMIT %d, %d", + $r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND `network` IN ('%s', '%s', '%s') AND `updated` > `last_failure` + ORDER BY `updated` DESC LIMIT %d, %d", dbesc($update_limit), dbesc(NETWORK_DFRN), + dbesc(NETWORK_DIASPORA), + dbesc(NETWORK_OSTATUS), intval($startIndex), intval($itemsPerPage) ); } elseif($system_mode) { - $r = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`, `profile`.`gender` AS `pgender` + logger("Start system mode query", LOGGER_DEBUG); + $r = 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`.`postal-code` AS `ppostalcode`, `profile`.`country-name` AS `pcountry` FROM `contact` INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid` - WHERE `self` = 1 AND `network` IN ('%s', '%s', '%s', '%s', '') AND `profile`.`is-default` + WHERE `self` = 1 AND `profile`.`is-default` AND `contact`.`uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) LIMIT %d, %d", - dbesc(NETWORK_DFRN), - dbesc(NETWORK_DIASPORA), - dbesc(NETWORK_OSTATUS), - dbesc(NETWORK_STATUSNET), intval($startIndex), intval($itemsPerPage) ); } else { + 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 - AND `network` IN ('%s', '%s', '%s', '%s', '') $sql_extra LIMIT %d, %d", + AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`) + AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra LIMIT %d, %d", intval($user['uid']), dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), @@ -125,6 +128,7 @@ function poco_init(&$a) { intval($itemsPerPage) ); } + logger("Query done", LOGGER_DEBUG); $ret = array(); if(x($_GET,'sorted')) @@ -134,9 +138,9 @@ function poco_init(&$a) { if(x($_GET,'updatedSince') AND !$global) $ret['updatedSince'] = false; - $ret['startIndex'] = (string) $startIndex; - $ret['itemsPerPage'] = (string) $itemsPerPage; - $ret['totalResults'] = (string) $totalResults; + $ret['startIndex'] = (int) $startIndex; + $ret['itemsPerPage'] = (int) $itemsPerPage; + $ret['totalResults'] = (int) $totalResults; $ret['entry'] = array(); @@ -151,7 +155,9 @@ function poco_init(&$a) { 'currentLocation' => false, 'network' => false, 'gender' => false, - 'tags' => false + 'tags' => false, + 'address' => false, + 'generation' => false ); if((! x($_GET,'fields')) || ($_GET['fields'] === '@all')) @@ -166,11 +172,36 @@ function poco_init(&$a) { if(is_array($r)) { if(count($r)) { foreach($r as $rr) { + if (!isset($rr['generation'])) { + if ($global) + $rr['generation'] = 3; + elseif ($system_mode) + $rr['generation'] = 1; + else + $rr['generation'] = 2; + } + if (($rr['about'] == "") AND isset($rr['pabout'])) $rr['about'] = $rr['pabout']; - if (($rr['location'] == "") AND isset($rr['plocation'])) - $rr['location'] = $rr['plocation']; + if ($rr['location'] == "") { + if (isset($rr['plocation'])) + $rr['location'] = $rr['plocation']; + + if (isset($rr['pregion']) AND ($rr['pregion'] != "")) { + if ($rr['location'] != "") + $rr['location'] .= ", "; + + $rr['location'] .= $rr['pregion']; + } + + if (isset($rr['pcountry']) AND ($rr['pcountry'] != "")) { + if ($rr['location'] != "") + $rr['location'] .= ", "; + + $rr['location'] .= $rr['pcountry']; + } + } if (($rr['gender'] == "") AND isset($rr['pgender'])) $rr['gender'] = $rr['pgender']; @@ -178,17 +209,32 @@ function poco_init(&$a) { if (($rr['keywords'] == "") AND isset($rr['pub_keywords'])) $rr['keywords'] = $rr['pub_keywords']; + $about = Cache::get("about:".$rr['updated'].":".$rr['nurl']); + if (is_null($about)) { + $about = bbcode($rr['about'], false, false); + Cache::set("about:".$rr['updated'].":".$rr['nurl'],$about); + } + + // Non connected persons can only see the keywords of a Diaspora account + if ($rr['network'] == NETWORK_DIASPORA) { + $rr['location'] = ""; + $about = ""; + $rr['gender'] = ""; + } + $entry = array(); if($fields_ret['id']) - $entry['id'] = $rr['id']; + $entry['id'] = (int)$rr['id']; if($fields_ret['displayName']) $entry['displayName'] = $rr['name']; if($fields_ret['aboutMe']) - $entry['aboutMe'] = bbcode($rr['about'], false, false); + $entry['aboutMe'] = $about; if($fields_ret['currentLocation']) $entry['currentLocation'] = $rr['location']; if($fields_ret['gender']) $entry['gender'] = $rr['gender']; + if($fields_ret['generation']) + $entry['generation'] = (int)$rr['generation']; if($fields_ret['urls']) { $entry['urls'] = array(array('value' => $rr['url'], 'type' => 'profile')); if($rr['addr'] && ($rr['network'] !== NETWORK_MAIL)) @@ -235,6 +281,26 @@ function poco_init(&$a) { $entry['tags'] = array($cleaned); } + if($fields_ret['address']) { + $entry['address'] = array(); + + // Deactivated. It just reveals too much data. (Although its from the default profile) + //if (isset($rr['paddress'])) + // $entry['address']['streetAddress'] = $rr['paddress']; + + if (isset($rr['plocation'])) + $entry['address']['locality'] = $rr['plocation']; + + if (isset($rr['pregion'])) + $entry['address']['region'] = $rr['pregion']; + + // See above + //if (isset($rr['ppostalcode'])) + // $entry['address']['postalCode'] = $rr['ppostalcode']; + + if (isset($rr['pcountry'])) + $entry['address']['country'] = $rr['pcountry']; + } $ret['entry'][] = $entry; } @@ -245,6 +311,8 @@ function poco_init(&$a) { else http_status_exit(500); + logger("End of poco", LOGGER_DEBUG); + if($format === 'xml') { header('Content-type: text/xml'); echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret)));