function salmon_return($val) {
- if($val >= 400)
+ if ($val >= 400)
$err = 'Error';
- if($val >= 200 && $val < 300)
+ if ($val >= 200 && $val < 300)
$err = 'OK';
logger('mod-salmon returns ' . $val);
}
-function salmon_post(&$a) {
+function salmon_post(App $a) {
$xml = file_get_contents('php://input');
$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
dbesc($nick)
);
- if(! count($r))
+ if (! dbm::is_result($r)) {
http_status_exit(500);
+ }
$importer = $r[0];
// figure out where in the DOM tree our data is hiding
- if($dom->provenance->data)
+ if ($dom->provenance->data)
$base = $dom->provenance;
- elseif($dom->env->data)
+ elseif ($dom->env->data)
$base = $dom->env;
- elseif($dom->data)
+ elseif ($dom->data)
$base = $dom;
- if(! $base) {
+ if (! $base) {
logger('mod-salmon: unable to locate salmon data in xml ');
http_status_exit(400);
}
// decode the data
$data = base64url_decode($data);
- $author = ostatus_salmon_author($data,$importer);
+ $author = ostatus::salmon_author($data,$importer);
$author_link = $author["author-link"];
- if(! $author_link) {
+ if (! $author_link) {
logger('mod-salmon: Could not retrieve author URI.');
http_status_exit(400);
}
$key = get_salmon_key($author_link,$keyhash);
- if(! $key) {
+ if (! $key) {
logger('mod-salmon: Could not retrieve author key.');
http_status_exit(400);
}
$verify = rsa_verify($compliant_format,$signature,$pubkey);
- if(! $verify) {
+ if (! $verify) {
logger('mod-salmon: message did not verify using protocol. Trying padding hack.');
$verify = rsa_verify($signed_data,$signature,$pubkey);
}
- if(! $verify) {
+ if (! $verify) {
logger('mod-salmon: message did not verify using padding. Trying old statusnet hack.');
$verify = rsa_verify($stnet_signed_data,$signature,$pubkey);
}
- if(! $verify) {
+ if (! $verify) {
logger('mod-salmon: Message did not verify. Discarding.');
http_status_exit(400);
}
dbesc(normalise_link($author_link)),
intval($importer['uid'])
);
- if(! count($r)) {
+ if (! dbm::is_result($r)) {
logger('mod-salmon: Author unknown to us.');
- if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
+ if (get_pconfig($importer['uid'],'system','ostatus_autofriend')) {
$result = new_contact($importer['uid'],$author_link);
- if($result['success']) {
- $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
+ if ($result['success']) {
+ $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')
AND `uid` = %d LIMIT 1",
dbesc(NETWORK_OSTATUS),
dbesc($author_link),
// Have we ignored the person?
// If so we can not accept this post.
- //if((count($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
- if(count($r) && $r[0]['blocked']) {
+ //if ((dbm::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+ if (dbm::is_result($r) && $r[0]['blocked']) {
logger('mod-salmon: Ignoring this author.');
http_status_exit(202);
// NOTREACHED
// Placeholder for hub discovery.
$hub = '';
- $contact_rec = ((count($r)) ? $r[0] : null);
+ $contact_rec = ((dbm::is_result($r)) ? $r[0] : null);
- ostatus_import($data,$importer,$contact_rec, $hub);
+ ostatus::import($data,$importer,$contact_rec, $hub);
http_status_exit(200);
}