]> git.mxchange.org Git - friendica.git/blobdiff - include/socgraph.php
Show "Redmatrix" as network name.
[friendica.git] / include / socgraph.php
index 592779089785a4fc36bee616e0a0cf6fcd20670a..1e1b6076f25ded7178d63b0ae44ffaa6038b224b 100644 (file)
@@ -2,7 +2,6 @@
 
 require_once('include/datetime.php');
 
-
 /*
  * poco_load
  *
@@ -13,14 +12,17 @@ require_once('include/datetime.php');
  *
  * Once the global contact is stored add (if necessary) the contact linkage which associates
  * the given uid, cid to the global contact entry. There can be many uid/cid combinations
- * pointing to the same global contact id. 
+ * pointing to the same global contact id.
  *
  */
+
 
 
 
 function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
+
+       require_once("include/html2bbcode.php");
+
        $a = get_app();
 
        if($cid) {
@@ -40,7 +42,7 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
        if(! $url)
                return;
 
-       $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos' : '?fields=displayName,urls,photos') ;
+       $url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation' : '?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation') ;
 
        logger('poco_load: ' . $url, LOGGER_DEBUG);
 
@@ -68,106 +70,342 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
                $profile_photo = '';
                $connect_url = '';
                $name = '';
+               $network = '';
+               $updated = '0000-00-00 00:00:00';
+               $location = '';
+               $about = '';
+               $keywords = '';
+               $gender = '';
+               $generation = 0;
 
                $name = $entry->displayName;
 
-               foreach($entry->urls as $url) {
-                       if($url->type == 'profile') {
-                               $profile_url = $url->value;
-                               continue;
-                       }
-                       if($url->type == 'webfinger') {
-                               $connect_url = str_replace('acct:' , '', $url->value);
-                               continue;
+               if(isset($entry->urls)) {
+                       foreach($entry->urls as $url) {
+                               if($url->type == 'profile') {
+                                       $profile_url = $url->value;
+                                       continue;
+                               }
+                               if($url->type == 'webfinger') {
+                                       $connect_url = str_replace('acct:' , '', $url->value);
+                                       continue;
+                               }
                        }
-               } 
-               foreach($entry->photos as $photo) {
-                       if($photo->type == 'profile') {
-                               $profile_photo = $photo->value;
-                               continue;
+               }
+               if(isset($entry->photos)) {
+                       foreach($entry->photos as $photo) {
+                               if($photo->type == 'profile') {
+                                       $profile_photo = $photo->value;
+                                       continue;
+                               }
                        }
                }
 
-               if((! $name) || (! $profile_url) || (! $profile_photo))
-                       continue; 
-                
-               $x = q("select * from `gcontact` where `nurl` = '%s' limit 1",
+               if(isset($entry->updated))
+                       $updated = date("Y-m-d H:i:s", strtotime($entry->updated));
+
+               if(isset($entry->network))
+                       $network = $entry->network;
+
+               if(isset($entry->currentLocation))
+                       $location = $entry->currentLocation;
+
+               if(isset($entry->aboutMe))
+                       $about = html2bbcode($entry->aboutMe);
+
+               if(isset($entry->gender))
+                       $gender = $entry->gender;
+
+               if(isset($entry->generation) AND ($entry->generation > 0))
+                       $generation = ++$entry->generation;
+
+               if(isset($entry->tags))
+                       foreach($entry->tags as $tag)
+                               $keywords = implode(", ", $tag);
+
+               // If you query a Friendica server for its profiles, the network has to be Friendica
+               // To-Do: It could also be a Redmatrix server
+               //if ($uid == 0)
+               //      $network = NETWORK_DFRN;
+
+               poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid);
+
+               // Update the Friendica contacts. Diaspora is doing it via a message. (See include/diaspora.php)
+               if (($location != "") OR ($about != "") OR ($keywords != "") OR ($gender != ""))
+                       q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s'
+                               WHERE `nurl` = '%s' AND NOT `self` AND `network` = '%s'",
+                               dbesc($location),
+                               dbesc($about),
+                               dbesc($keywords),
+                               dbesc($gender),
+                               dbesc(normalise_link($profile_url)),
+                               dbesc(NETWORK_DFRN));
+       }
+       logger("poco_load: loaded $total entries",LOGGER_DEBUG);
+
+       q("DELETE FROM `glink` WHERE `cid` = %d AND `uid` = %d AND `zcid` = %d AND `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY",
+               intval($cid),
+               intval($uid),
+               intval($zcid)
+       );
+
+}
+
+function poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid = 0, $uid = 0, $zcid = 0) {
+
+       $a = get_app();
+
+       // Generation:
+       //  0: No definition
+       //  1: Profiles on this server
+       //  2: Contacts of profiles on this server
+       //  3: Contacts of contacts of profiles on this server
+       //  4: ...
+
+       $gcid = "";
+
+       if ($profile_url == "")
+               return $gcid;
+
+       // Don't store the statusnet connector as network
+       // We can't simply set this to NETWORK_OSTATUS since the connector could have fetched posts from friendica as well
+       if ($network == NETWORK_STATUSNET)
+               $network = "";
+
+       // The global contacts should contain the original picture, not the cached one
+       if (($generation != 1) AND stristr(normalise_link($profile_photo), normalise_link($a->get_baseurl()."/photo/")))
+               $profile_photo = "";
+
+       $r = q("SELECT `network` FROM `contact` WHERE `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
+               dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET)
+       );
+       if(count($r))
+               $network = $r[0]["network"];
+
+       if (($network == "") OR ($network == NETWORK_OSTATUS)) {
+               $r = q("SELECT `network`, `url` FROM `contact` WHERE `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1",
+                       dbesc($profile_url), dbesc(normalise_link($profile_url)), dbesc(NETWORK_STATUSNET)
+               );
+               if(count($r)) {
+                       $network = $r[0]["network"];
+                       $profile_url = $r[0]["url"];
+               }
+       }
+
+       $x = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
+               dbesc(normalise_link($profile_url))
+       );
+       if(count($x) AND ($network == "") AND ($x[0]["network"] != NETWORK_STATUSNET))
+               $network = $x[0]["network"];
+
+       if (($network == "") OR ($name == "") OR ($profile_photo == "")) {
+               require_once("include/Scrape.php");
+
+               $data = probe_url($profile_url);
+               $network = $data["network"];
+               $name = $data["name"];
+               $profile_url = $data["url"];
+               $profile_photo = $data["photo"];
+       }
+
+       if (count($x) AND ($x[0]["network"] == "") AND ($network != "")) {
+               q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
+                       dbesc($network),
                        dbesc(normalise_link($profile_url))
                );
+       }
 
-               if(count($x)) {
-                       $gcid = $x[0]['id'];
+       if (($name == "") OR ($profile_photo == ""))
+               return $gcid;
 
-                       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",
-                                       dbesc($name),
-                                       dbesc($profile_photo),
-                                       dbesc($connect_url),
-                                       dbesc($profile_url),
-                                       dbesc(normalise_link($profile_url))
-                               );
-                       }
-               }
-               else {
-                       q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`,`connect`)
-                               values ( '%s', '%s', '%s', '%s','%s') ",
+       if (!in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
+               return $gcid;
+
+       logger("profile-check generation: ".$generation." Network: ".$network." URL: ".$profile_url." name: ".$name." avatar: ".$profile_photo, LOGGER_DEBUG);
+
+       if(count($x)) {
+               $gcid = $x[0]['id'];
+
+               if (($location == "") AND ($x[0]['location'] != ""))
+                       $location = $x[0]['location'];
+
+               if (($about == "") AND ($x[0]['about'] != ""))
+                       $about = $x[0]['about'];
+
+               if (($gender == "") AND ($x[0]['gender'] != ""))
+                       $gender = $x[0]['gender'];
+
+               if (($keywords == "") AND ($x[0]['keywords'] != ""))
+                       $keywords = $x[0]['keywords'];
+
+               if (($generation == 0) AND ($x[0]['generation'] > 0))
+                       $generation = $x[0]['generation'];
+
+               if($x[0]['name'] != $name || $x[0]['photo'] != $profile_photo || $x[0]['updated'] < $updated) {
+                       q("UPDATE `gcontact` SET `name` = '%s', `network` = '%s', `photo` = '%s', `connect` = '%s', `url` = '%s',
+                               `updated` = '%s', `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s', `generation` = %d
+                               WHERE (`generation` >= %d OR `generation` = 0) AND `nurl` = '%s'",
                                dbesc($name),
-                               dbesc($profile_url),
-                               dbesc(normalise_link($profile_url)),
+                               dbesc($network),
                                dbesc($profile_photo),
-                               dbesc($connect_url)
-                       );
-                       $x = q("select * from `gcontact` where `nurl` = '%s' limit 1",
+                               dbesc($connect_url),
+                               dbesc($profile_url),
+                               dbesc($updated),
+                               dbesc($location),
+                               dbesc($about),
+                               dbesc($keywords),
+                               dbesc($gender),
+                               intval($generation),
+                               intval($generation),
                                dbesc(normalise_link($profile_url))
                        );
-                       if(count($x))
-                               $gcid = $x[0]['id'];
                }
-               if(! $gcid)
-                       return;
+       } else {
+               q("INSERT INTO `gcontact` (`name`,`network`, `url`,`nurl`,`photo`,`connect`, `updated`, `location`, `about`, `keywords`, `gender`, `generation`)
+                       VALUES ('%s', '%s', '%s', '%s', '%s','%s', '%s', '%s', '%s', '%s', '%s', %d)",
+                       dbesc($name),
+                       dbesc($network),
+                       dbesc($profile_url),
+                       dbesc(normalise_link($profile_url)),
+                       dbesc($profile_photo),
+                       dbesc($connect_url),
+                       dbesc($updated),
+                       dbesc($location),
+                       dbesc($about),
+                       dbesc($keywords),
+                       dbesc($gender),
+                       intval($generation)
+               );
+               $x = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
+                       dbesc(normalise_link($profile_url))
+               );
+               if(count($x))
+                       $gcid = $x[0]['id'];
+       }
+
+       if(! $gcid)
+               return $gcid;
 
-               $r = q("select * from glink where `cid` = %d and `uid` = %d and `gcid` = %d and `zcid` = %d limit 1",
+       $r = q("SELECT * FROM `glink` WHERE `cid` = %d AND `uid` = %d AND `gcid` = %d AND `zcid` = %d LIMIT 1",
+               intval($cid),
+               intval($uid),
+               intval($gcid),
+               intval($zcid)
+       );
+       if(! count($r)) {
+               q("INSERT INTO `glink` (`cid`,`uid`,`gcid`,`zcid`, `updated`) VALUES (%d,%d,%d,%d, '%s') ",
+                       intval($cid),
+                       intval($uid),
+                       intval($gcid),
+                       intval($zcid),
+                       dbesc(datetime_convert())
+               );
+       } else {
+               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),
                        intval($gcid),
                        intval($zcid)
                );
-               if(! count($r)) {
-                       q("insert into glink ( `cid`,`uid`,`gcid`,`zcid`, `updated`) values (%d,%d,%d,%d, '%s') ",
-                               intval($cid),
-                               intval($uid),
-                               intval($gcid),
-                               intval($zcid),
-                               dbesc(datetime_convert())
-                       );
-               }
-               else {
-                       q("update glink set updated = '%s' where `cid` = %d and `uid` = %d and `gcid` = %d and zcid = %d limit 1",
-                               dbesc(datetime_convert()),
-                               intval($cid),
-                               intval($uid),
-                               intval($gcid),
-                               intval($zcid)
-                       );
-               }
-
        }
-       logger("poco_load: loaded $total entries",LOGGER_DEBUG);
 
-       q("delete from glink where `cid` = %d and `uid` = %d and `zcid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY",
-               intval($cid),
-               intval($uid),
-               intval($zcid)
+       // For unknown reasons there are sometimes duplicates
+       q("DELETE FROM `gcontact` WHERE `nurl` = '%s' AND `id` != %d AND
+               NOT EXISTS (SELECT `gcid` FROM `glink` WHERE `gcid` = `gcontact`.`id`)",
+               dbesc(normalise_link($profile_url)),
+               intval($gcid)
        );
 
+       return $gcid;
 }
 
+function poco_contact_from_body($body, $created, $cid, $uid) {
+       preg_replace_callback("/\[share(.*?)\].*?\[\/share\]/ism",
+               function ($match) use ($created, $cid, $uid){
+                       return(sub_poco_from_share($match, $created, $cid, $uid));
+               }, $body);
+}
+
+function sub_poco_from_share($share, $created, $cid, $uid) {
+        $profile = "";
+        preg_match("/profile='(.*?)'/ism", $share[1], $matches);
+        if ($matches[1] != "")
+                $profile = $matches[1];
+
+        preg_match('/profile="(.*?)"/ism', $share[1], $matches);
+        if ($matches[1] != "")
+                $profile = $matches[1];
+
+       if ($profile == "")
+               return;
+
+       logger("prepare poco_check for profile ".$profile, LOGGER_DEBUG);
+        poco_check($profile, "", "", "", "", "", "", "", "", $created, 3, $cid, $uid);
+}
+
+function poco_store($item) {
+
+       // Isn't it public?
+       if ($item['private'])
+               return;
+
+       // Or is it from a network where we don't store the global contacts?
+       if (!in_array($item["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_STATUSNET, "")))
+               return;
+
+       // Is it a global copy?
+       $store_gcontact = ($item["uid"] == 0);
+
+       // Is it a comment on a global copy?
+       if (!$store_gcontact AND ($item["uri"] != $item["parent-uri"])) {
+               $q = q("SELECT `id` FROM `item` WHERE `uri`='%s' AND `uid` = 0", $item["parent-uri"]);
+               $store_gcontact = count($q);
+       }
+
+       if (!$store_gcontact)
+               return;
+
+       // "3" means: We don't know this contact directly (Maybe a reshared item)
+       $generation = 3;
+       $network = "";
+       $profile_url = $item["author-link"];
+
+       // Is it a user from our server?
+       $q = q("SELECT `id` FROM `contact` WHERE `self` AND `nurl` = '%s' LIMIT 1",
+               dbesc(normalise_link($item["author-link"])));
+       if (count($q)) {
+               logger("Our user (generation 1): ".$item["author-link"], LOGGER_DEBUG);
+               $generation = 1;
+               $network = NETWORK_DFRN;
+       } else { // Is it a contact from a user on our server?
+               $q = q("SELECT `network`, `url` FROM `contact` WHERE `uid` != 0 AND `network` != ''
+                       AND (`nurl` = '%s' OR `alias` IN ('%s', '%s')) AND `network` != '%s' LIMIT 1",
+                       dbesc(normalise_link($item["author-link"])),
+                       dbesc(normalise_link($item["author-link"])),
+                       dbesc($item["author-link"]),
+                       dbesc(NETWORK_STATUSNET));
+               if (count($q)) {
+                       $generation = 2;
+                       $network = $q[0]["network"];
+                       $profile_url = $q[0]["url"];
+                       logger("Known contact (generation 2): ".$profile_url, LOGGER_DEBUG);
+               }
+       }
+
+       if ($generation == 3)
+               logger("Unknown contact (generation 3): ".$item["author-link"], LOGGER_DEBUG);
+
+       poco_check($profile_url, $item["author-name"], $network, $item["author-avatar"], "", "", "", "", "", $item["received"], $generation, $item["contact-id"], $item["uid"]);
+
+       // Maybe its a body with a shared item? Then extract a global contact from it.
+       poco_contact_from_body($item["body"], $item["received"], $item["contact-id"], $item["uid"]);
+}
 
 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),
@@ -189,10 +427,10 @@ function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) {
        if($shuffle)
                $sql_extra = " order by rand() ";
        else
-               $sql_extra = " order by `gcontact`.`name` asc "; 
+               $sql_extra = " order by `gcontact`.`name` asc ";
 
-       $r = q("SELECT `gcontact`.* 
-               FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
+       $r = q("SELECT `gcontact`.*
+               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",
@@ -211,8 +449,8 @@ 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`
+       $r = q("SELECT count(*) as `total`
+               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),
@@ -225,15 +463,15 @@ function count_common_friends_zcid($uid,$zcid) {
 
 }
 
-function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle) {
+function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = false) {
 
        if($shuffle)
                $sql_extra = " order by rand() ";
        else
-               $sql_extra = " order by `gcontact`.`name` asc "; 
+               $sql_extra = " order by `gcontact`.`name` asc ";
 
-       $r = q("SELECT `gcontact`.* 
-               FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
+       $r = q("SELECT `gcontact`.*
+               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",
@@ -251,7 +489,7 @@ function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle) {
 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)
@@ -266,9 +504,9 @@ 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`
-               where `glink`.`cid` = %d and `glink`.`uid` = %d 
+       $r = q("SELECT `gcontact`.*
+               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),
                intval($uid),
@@ -286,16 +524,31 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
        if(! $uid)
                return array();
 
-       $r = q("SELECT count(glink.gcid) as `total`, gcontact.* from gcontact 
-               left join glink on glink.gcid = gcontact.id 
+       $network = array(NETWORK_DFRN);
+
+       if (get_config('system','diaspora_enabled'))
+               $network[] = NETWORK_DIASPORA;
+
+       if (!get_config('system','ostatus_disabled'))
+               $network[] = NETWORK_OSTATUS;
+
+       $sql_network = implode("', '", $network);
+       //$sql_network = "'".$sql_network."', ''";
+       $sql_network = "'".$sql_network."'";
+
+       $r = q("SELECT count(glink.gcid) as `total`, gcontact.* from gcontact
+               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 )
-               group by glink.gcid order by total desc limit %d, %d ",
+               AND `gcontact`.`updated` != '0000-00-00 00:00:00'
+               AND `gcontact`.`network` IN (%s)
+               group by glink.gcid order by gcontact.updated desc,total desc limit %d, %d ",
                intval($uid),
                intval($uid),
                intval($uid),
                intval($uid),
+               $sql_network,
                intval($start),
                intval($limit)
        );
@@ -303,22 +556,30 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
        if(count($r) && count($r) >= ($limit -1))
                return $r;
 
-       $r2 = q("SELECT gcontact.* from gcontact 
-               left join glink on glink.gcid = gcontact.id 
+       $r2 = q("SELECT gcontact.* from gcontact
+               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 )
+               AND `gcontact`.`updated` != '0000-00-00 00:00:00'
+               AND `gcontact`.`network` IN (%s)
                order by rand() limit %d, %d ",
                intval($uid),
                intval($uid),
                intval($uid),
+               $sql_network,
                intval($start),
                intval($limit)
        );
 
+       $list = array();
+       foreach ($r2 AS $suggestion)
+               $list[$suggestion["nurl"]] = $suggestion;
 
-       return array_merge($r,$r2);
+       foreach ($r AS $suggestion)
+               $list[$suggestion["nurl"]] = $suggestion;
 
+       return $list;
 }
 
 function update_suggestions() {