require_once('include/Scrape.php');
require_once('include/follow.php');
+require_once('include/contact_selectors.php');
function follow_content(&$a) {
$uid = local_user();
$url = notags(trim($_REQUEST['url']));
- $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND
+ // There is a current issue. It seems as if you can't start following a Friendica that is following you
+ // With Diaspora this works - but Friendica is special, it seems ...
+ $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND ((`rel` != %d) OR (`network` = '%s')) AND
(`nurl` = '%s' OR `alias` = '%s' OR `alias` = '%s') AND
`network` != '%s' LIMIT 1",
- intval(local_user()), dbesc(normalise_link($url)),
+ intval(local_user()), dbesc(CONTACT_IS_FOLLOWER), dbesc(NETWORK_DFRN), dbesc(normalise_link($url)),
dbesc(normalise_link($url)), dbesc($url), dbesc(NETWORK_STATUSNET));
if ($r) {
$ret = probe_url($url);
+ if ($ret["network"] == NETWORK_PHANTOM) {
+ notice( t("The network type couldn't be detected. Contact can't be added.") . EOL);
+ goaway($_SESSION['return_url']);
+ // NOTREACHED
+ }
+
+ if ($ret["network"] == NETWORK_MAIL)
+ $ret["url"] = $ret["addr"];
+
if($ret['network'] === NETWORK_DFRN) {
$request = $ret["request"];
$tpl = get_markup_template('dfrn_request.tpl');
// 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"]));
+
+ $header = $ret["name"];
+
+ if ($ret["addr"] != "")
+ $header .= " <".$ret["addr"].">";
+
+ $header .= " (".network_to_name($ret['network']).")";
+
$o = replace_macros($tpl,array(
- '$header' => $ret["name"]." (".$ret["addr"].")",
+ '$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
+ '$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"],
+ '$url_label' => t("Profile URL"),
+ '$myaddr' => $myaddr,
+ '$request' => $request,
+ '$location' => bbcode($r[0]["location"]),
+ '$location_label' => t("Location:"),
+ '$about' => bbcode($r[0]["about"]),
+ '$about_label' => t("About:"),
+ '$keywords' => bbcode($r[0]["keywords"]),
+ '$keywords_label' => t("Tags:")
));
return $o;
}