X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsocgraph.php;h=daec03726eb939085b5ea2a1f651d4e095d5b8a4;hb=6b8585d48d67d109102e33a32311d76a45762667;hp=4d24bff286cbe668813b5d7f73f96e1e7a4c9664;hpb=0d5b8dfafde4d66c8cd6978ad83e639938aaf3bd;p=friendica.git

diff --git a/include/socgraph.php b/include/socgraph.php
index 4d24bff286..daec03726e 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -1,8 +1,6 @@
 <?php
 
 require_once('include/datetime.php');
-require_once('include/zot.php');
-
 
 /*
  * poco_load
@@ -94,8 +92,8 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 		}
 
 		if((! $name) || (! $profile_url) || (! $profile_photo))
-			continue; 
-		 
+			continue;
+
 		$x = q("select * from `gcontact` where `nurl` = '%s' limit 1",
 			dbesc(normalise_link($profile_url))
 		);
@@ -104,8 +102,8 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 			$gcid = $x[0]['id'];
 
 			if($x[0]['name'] != $name || $x[0]['photo'] != $profile_photo) {
-				q("update gcontact set `name` = '%s', `photo` = '%s', `connect` = '%s', `url` = '%s' 
-					where `nurl` = '%s' limit 1",
+				q("update gcontact set `name` = '%s', `photo` = '%s', `connect` = '%s', `url` = '%s'
+					where `nurl` = '%s'",
 					dbesc($name),
 					dbesc($profile_photo),
 					dbesc($connect_url),
@@ -148,7 +146,7 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 			);
 		}
 		else {
-			q("update glink set updated = '%s' where `cid` = %d and `uid` = %d and `gcid` = %d and zcid = %d limit 1",
+			q("update glink set updated = '%s' where `cid` = %d and `uid` = %d and `gcid` = %d and zcid = %d",
 				dbesc(datetime_convert()),
 				intval($cid),
 				intval($uid),
@@ -172,7 +170,7 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 function count_common_friends($uid,$cid) {
 
 	$r = q("SELECT count(*) as `total`
-		FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
+		FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
 		where `glink`.`cid` = %d and `glink`.`uid` = %d
 		and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d ) ",
 		intval($cid),
@@ -197,7 +195,7 @@ function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) {
 		$sql_extra = " order by `gcontact`.`name` asc "; 
 
 	$r = q("SELECT `gcontact`.* 
-		FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
+		FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
 		where `glink`.`cid` = %d and `glink`.`uid` = %d
 		and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d ) 
 		$sql_extra limit %d, %d",
@@ -217,7 +215,7 @@ function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) {
 function count_common_friends_zcid($uid,$zcid) {
 
 	$r = q("SELECT count(*) as `total` 
-		FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
+		FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
 		where `glink`.`zcid` = %d
 		and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) ",
 		intval($zcid),
@@ -238,7 +236,7 @@ function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = fal
 		$sql_extra = " order by `gcontact`.`name` asc "; 
 
 	$r = q("SELECT `gcontact`.* 
-		FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
+		FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
 		where `glink`.`zcid` = %d
 		and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) 
 		$sql_extra limit %d, %d",
@@ -256,7 +254,7 @@ function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = fal
 function count_all_friends($uid,$cid) {
 
 	$r = q("SELECT count(*) as `total`
-		FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
+		FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
 		where `glink`.`cid` = %d and `glink`.`uid` = %d ",
 		intval($cid),
 		intval($uid)
@@ -272,7 +270,7 @@ function count_all_friends($uid,$cid) {
 function all_friends($uid,$cid,$start = 0, $limit = 80) {
 
 	$r = q("SELECT `gcontact`.* 
-		FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
+		FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
 		where `glink`.`cid` = %d and `glink`.`uid` = %d 
 		order by `gcontact`.`name` asc LIMIT %d, %d ",
 		intval($cid),
@@ -292,7 +290,7 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 		return array();
 
 	$r = q("SELECT count(glink.gcid) as `total`, gcontact.* from gcontact 
-		left join glink on glink.gcid = gcontact.id 
+		INNER JOIN glink on glink.gcid = gcontact.id 
 		where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d )
 		and not gcontact.name in ( select name from contact where uid = %d )
 		and not gcontact.id in ( select gcid from gcign where uid = %d )
@@ -309,7 +307,7 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 		return $r;
 
 	$r2 = q("SELECT gcontact.* from gcontact 
-		left join glink on glink.gcid = gcontact.id 
+		INNER JOIN glink on glink.gcid = gcontact.id 
 		where glink.uid = 0 and glink.cid = 0 and glink.zcid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d )
 		and not gcontact.name in ( select name from contact where uid = %d )
 		and not gcontact.id in ( select gcid from gcign where uid = %d )