// Makes the connection request for friendica contacts easier
$_SESSION["fastlane"] = $ret["url"];
+ $r = q("SELECT `location`, `about`, `keywords` FROM `gcontact` WHERE `nurl` = '%s'",
+ normalise_link($ret["url"]));
+
+ if (!$r)
+ $r = array(array("location" => "", "about" => "", "keywords" => ""));
+
+ 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']).")";
+ $header .= " (".network_to_name($ret['network'], $ret['url']).")";
$o = replace_macros($tpl,array(
'$header' => htmlentities($header),
- '$photo' => $ret["photo"],
- '$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' => t('Submit Request'),
- '$cancel' => t('Cancel'),
- '$nickname' => "",
- '$name' => $ret["name"],
- '$url' => $ret["url"],
- '$myaddr' => $myaddr,
- '$request' => $request
+ '$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' => t('Submit Request'),
+ '$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:")
));
return $o;
}