require_once('Scrape.php');
-function follow_post(&$a) {
+function follow_init(&$a) {
if(! local_user()) {
notice( t('Permission denied.') . EOL);
// NOTREACHED
}
- $url = $orig_url = notags(trim($_POST['url']));
+ $url = $orig_url = notags(trim($_REQUEST['url']));
// remove ajax junk, e.g. Twitter
// NOTREACHED
}
+
+ if(! $url) {
+ notice( t('Connect URL missing.') . EOL);
+ goaway($_SESSION['return_url']);
+ // NOTREACHED
+ }
+
+
$ret = probe_url($url);
if($ret['network'] === NETWORK_DFRN) {
}
$writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
+ $hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
+
if($ret['network'] === NETWORK_MAIL) {
$writeable = 1;
$new_relation = CONTACT_IS_FOLLOWER;
// create contact record
- $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
- `writable`, `blocked`, `readonly`, `pending` )
- VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+ $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
+ `writable`, `hidden`, `blocked`, `readonly`, `pending` )
+ VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0 ) ",
intval(local_user()),
dbesc(datetime_convert()),
dbesc($ret['url']),
+ dbesc(normalise_link($ret['url'])),
dbesc($ret['addr']),
dbesc($ret['alias']),
+ dbesc($ret['batch']),
dbesc($ret['notify']),
dbesc($ret['poll']),
+ dbesc($ret['poco']),
dbesc($ret['name']),
dbesc($ret['nick']),
dbesc($ret['photo']),
dbesc($ret['pubkey']),
intval($new_relation),
intval($ret['priority']),
- intval($writeable)
+ intval($writeable),
+ intval($hidden)
);
}
}
}
- goaway($a->get_baseurl() . '/contacts/' . $contact_id);
-// goaway($_SESSION['return_url']);
+ if(strstr($_SESSION['return_url'],'contacts'))
+ goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+
+ goaway($_SESSION['return_url']);
// NOTREACHED
}