Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / include / message.php

diff --git a/include/message.php b/include/message.php
index ac14571721580f421d3b3f650d21f2a937cf969b..e5ebe6f9158ac1f895d65ba53d998bb6462f6417 100644 (file)
--- a/include/message.php
+++ b/include/message.php
@@ -26,6 +26,9 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
                return -2;
        }
 
+       $guid = get_guid(32);
+       $uri = 'urn:X-dfrn:' . App::get_baseurl() . ':' . local_user() . ':' . $guid;
+
        $convid = 0;
        $reply = false;
 
@@ -38,23 +41,20 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
                        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(App::get_baseurl(), strpos(App::get_baseurl(),'://') + 3);
+
                $conv_guid = get_guid(32);
                $convuri = $recip_handle.':'.$conv_guid;
 
@@ -74,7 +74,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
                        dbesc($conv_guid),
                        intval(local_user())
                );
-               if(count($r))
+               if (dbm::is_result($r))
                        $convid = $r[0]['id'];
        }
 
@@ -92,7 +92,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
                `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']),
@@ -113,7 +113,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
                dbesc($uri),
                intval(local_user())
        );
-       if(count($r))
+       if (dbm::is_result($r))
                $post_id = $r[0]['id'];
 
        /**
@@ -134,7 +134,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
                $images = $match[1];
                if(count($images)) {
                        foreach($images as $image) {
-                               if(! stristr($image,$a->get_baseurl() . '/photo/'))
+                               if(! stristr($image,App::get_baseurl() . '/photo/'))
                                        continue;
                                $image_uri = substr($image,strrpos($image,'/') + 1);
                                $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
@@ -150,7 +150,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
        }
 
        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;
@@ -164,16 +164,13 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 
 function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 
-       $a = get_app();
-
-
        if(! $recipient) return -1;
 
        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:' . App::get_baseurl() . ':' . local_user() . ':' . $guid;
 
        $convid = 0;
        $reply = false;
@@ -187,7 +184,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 
        $conv_guid = get_guid(32);
 
-       $recip_handle = $recipient['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
+       $recip_handle = $recipient['nickname'] . '@' . substr(App::get_baseurl(), strpos(App::get_baseurl(),'://') + 3);
 
        $sender_nick = basename($replyto);
        $sender_host = substr($replyto,strpos($replyto,'://')+3);
@@ -210,7 +207,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
                dbesc($conv_guid),
                intval($recipient['uid'])
        );
-       if(count($r))
+       if (dbm::is_result($r))
                $convid = $r[0]['id'];
 
        if(! $convid) {
@@ -222,7 +219,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
                `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']),