X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fpoco.php;h=557f401eae7d7daf706191806b1da8f96b24329c;hb=63610c7b73fcaf862adbf880d4968dd2b1678d9b;hp=4b04d70138198851e02346ff7d91a45fa1c75bd9;hpb=0c67c89715df801e0c887be50c9739db3bae7ca3;p=friendica.git

diff --git a/mod/poco.php b/mod/poco.php
index 4b04d70138..557f401eae 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -1,6 +1,7 @@
 <?php
+// See here for a documentation for portable contacts:
+// https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html
 
-if(! function_exists('poco_init')) {
 function poco_init(&$a) {
 	require_once("include/bbcode.php");
 
@@ -44,7 +45,7 @@ function poco_init(&$a) {
 			where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1",
 			dbesc($user)
 		);
-		if(! count($r) || $r[0]['hidewall'] || $r[0]['hide-friends'])
+		if(! dbm::is_result($r) || $r[0]['hidewall'] || $r[0]['hide-friends'])
 			http_status_exit(404);
 
 		$user = $r[0];
@@ -82,7 +83,7 @@ function poco_init(&$a) {
 			dbesc(NETWORK_STATUSNET)
 		);
 	}
-	if(count($r))
+	if(dbm::is_result($r))
 		$totalResults = intval($r[0]['total']);
 	else
 		$totalResults = 0;
@@ -105,9 +106,11 @@ function poco_init(&$a) {
 		);
 	} elseif($system_mode) {
 		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`
+		$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`, `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`.`is-default`
 			AND `contact`.`uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) LIMIT %d, %d",
 			intval($startIndex),
@@ -156,6 +159,7 @@ function poco_init(&$a) {
 		'gender' => false,
 		'tags' => false,
 		'address' => false,
+		'contactType' => false,
 		'generation' => false
 	);
 
@@ -169,7 +173,7 @@ function poco_init(&$a) {
 	}
 
 	if(is_array($r)) {
-		if(count($r)) {
+		if(dbm::is_result($r)) {
 			foreach($r as $rr) {
 				if (!isset($rr['generation'])) {
 					if ($global)
@@ -208,6 +212,9 @@ function poco_init(&$a) {
 				if (($rr['keywords'] == "") AND isset($rr['pub_keywords']))
 					$rr['keywords'] = $rr['pub_keywords'];
 
+				if (isset($rr['account-type']))
+					$rr['contact-type'] = $rr['account-type'];
+
 				$about = Cache::get("about:".$rr['updated'].":".$rr['nurl']);
 				if (is_null($about)) {
 					$about = bbcode($rr['about'], false, false);
@@ -301,6 +308,9 @@ function poco_init(&$a) {
 						 $entry['address']['country'] = $rr['pcountry'];
 				}
 
+				if($fields_ret['contactType'])
+					$entry['contactType'] = intval($rr['contact-type']);
+
 				$ret['entry'][] = $entry;
 			}
 		}
@@ -325,5 +335,5 @@ function poco_init(&$a) {
 	else
 		http_status_exit(500);
 
-}
+
 }