return -2;
}
+ $guid = get_guid(32);
+ $uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $guid;
+
$convid = 0;
$reply = false;
dbesc($replyto),
dbesc($replyto)
);
- if(count($r))
+ if (dbm::is_result($r))
$convid = $r[0]['convid'];
}
- $recip_host = substr($contact[0]['url'],strpos($contact[0]['url'],'://')+3);
- $recip_host = substr($recip_host,0,strpos($recip_host,'/'));
-
- $recip_handle = (($contact[0]['addr']) ? $contact[0]['addr'] : $contact[0]['nick'] . '@' . $recip_host);
- $sender_handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
-
- $msg_guid = get_guid(32);
- $uri = $recip_handle.':'.$msg_guid;
-
if(! $convid) {
// create a new conversation
+ $recip_host = substr($contact[0]['url'],strpos($contact[0]['url'],'://')+3);
+ $recip_host = substr($recip_host,0,strpos($recip_host,'/'));
+
+ $recip_handle = (($contact[0]['addr']) ? $contact[0]['addr'] : $contact[0]['nick'] . '@' . $recip_host);
+ $sender_handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
+
$conv_guid = get_guid(32);
$convuri = $recip_handle.':'.$conv_guid;
dbesc($conv_guid),
intval(local_user())
);
- if(count($r))
+ if (dbm::is_result($r))
$convid = $r[0]['id'];
}
`contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`)
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s' )",
intval(local_user()),
- dbesc($msg_guid),
+ dbesc($guid),
intval($convid),
dbesc($me[0]['name']),
dbesc($me[0]['thumb']),
dbesc($uri),
intval(local_user())
);
- if(count($r))
+ if (dbm::is_result($r))
$post_id = $r[0]['id'];
/**
}
if($post_id) {
- proc_run('php',"include/notifier.php","mail","$post_id");
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "mail", $post_id);
return intval($post_id);
} else {
return -3;
if(! strlen($subject))
$subject = t('[no subject]');
- $hash = random_string();
- $uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
+ $guid = get_guid(32);
+ $uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $guid;
$convid = 0;
$reply = false;
dbesc($conv_guid),
intval($recipient['uid'])
);
- if(count($r))
+ if (dbm::is_result($r))
$convid = $r[0]['id'];
if(! $convid) {
`contact-id`, `title`, `body`, `seen`, `reply`, `replied`, `uri`, `parent-uri`, `created`, `unknown`)
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
intval($recipient['uid']),
- dbesc(get_guid(32)),
+ dbesc($guid),
intval($convid),
dbesc($me['name']),
dbesc($me['photo']),