- $contact = $r[0];
- $contact_id = $r[0]['id'];
-
- require_once("Photo.php");
-
- $photos = import_profile_photo($ret['photo'],local_user(),$contact_id);
-
- $r = q("UPDATE `contact` SET `photo` = '%s',
- `thumb` = '%s',
- `micro` = '%s',
- `name-date` = '%s',
- `uri-date` = '%s',
- `avatar-date` = '%s'
- WHERE `id` = %d LIMIT 1
- ",
- dbesc($photos[0]),
- dbesc($photos[1]),
- dbesc($photos[2]),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- intval($contact_id)
- );
-
-
- // pull feed and consume it, which should subscribe to the hub.
-
- proc_run('php',"include/poller.php","$contact_id");
-
- // create a follow slap
-
- $tpl = load_view_file('view/follow_slap.tpl');
- $slap = replace_macros($tpl, array(
- '$name' => $a->user['username'],
- '$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'],
- '$photo' => $a->contact['photo'],
- '$thumb' => $a->contact['thumb'],
- '$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
- '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':follow:' . random_string(),
- '$title' => '',
- '$type' => 'text',
- '$content' => t('following'),
- '$nick' => $a->user['nickname'],
- '$verb' => ACTIVITY_FOLLOW,
- '$ostat_follow' => ''
+ $myaddr = $r[0]["url"];
+ $gcontact_id = 0;
+
+ // Makes the connection request for friendica contacts easier
+ $_SESSION["fastlane"] = $ret["url"];
+
+ $r = q("SELECT `id`, `location`, `about`, `keywords` FROM `gcontact` WHERE `nurl` = '%s'",
+ normalise_link($ret["url"]));
+
+ if (!$r)
+ $r = array(array("location" => "", "about" => "", "keywords" => ""));
+ else
+ $gcontact_id = $r[0]["id"];
+
+ if($ret['network'] === NETWORK_DIASPORA) {
+ $r[0]["location"] = "";
+ $r[0]["about"] = "";
+ }
+
+ $header = $ret["name"];
+
+ if ($ret["addr"] != "")
+ $header .= " <".$ret["addr"].">";
+
+ //$header .= " (".network_to_name($ret['network'], $ret['url']).")";
+ $header = t("Connect/Follow");
+
+ $o = replace_macros($tpl,array(
+ '$header' => htmlentities($header),
+ //'$photo' => proxy_url($ret["photo"], false, PROXY_SIZE_SMALL),
+ '$desc' => "",
+ '$pls_answer' => t('Please answer the following:'),
+ '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'),t('Yes'))),
+ '$add_note' => t('Add a personal note:'),
+ '$page_desc' => "",
+ '$friendica' => "",
+ '$statusnet' => "",
+ '$diaspora' => "",
+ '$diasnote' => "",
+ '$your_address' => t('Your Identity Address:'),
+ '$invite_desc' => "",
+ '$emailnet' => "",
+ '$submit' => $submit,
+ '$cancel' => t('Cancel'),
+ '$nickname' => "",
+ '$name' => $ret["name"],
+ '$url' => $ret["url"],
+ '$zrl' => zrl($ret["url"]),
+ '$url_label' => t("Profile URL"),
+ '$myaddr' => $myaddr,
+ '$request' => $request,
+ /*'$location' => bbcode($r[0]["location"]),
+ '$location_label' => t("Location:"),
+ '$about' => bbcode($r[0]["about"], false, false),
+ '$about_label' => t("About:"), */
+ '$keywords' => $r[0]["keywords"],
+ '$keywords_label' => t("Tags:")