From d5623d28d5833c93dd5e47d11ed9edb24b19e488 Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 15 Jan 2018 11:43:25 -0500 Subject: [PATCH 1/6] Create Mail class create mail class and functions from include/message.php --- src/Model/Mail.php | 224 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) create mode 100644 src/Model/Mail.php diff --git a/src/Model/Mail.php b/src/Model/Mail.php new file mode 100644 index 0000000000..ae30859be1 --- /dev/null +++ b/src/Model/Mail.php @@ -0,0 +1,224 @@ +user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); + + $conv_guid = get_guid(32); + $convuri = $recip_handle . ':' . $conv_guid; + + $handles = $recip_handle . ';' . $sender_handle; + + $fields = array('uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle, + 'created' => datetime_convert(), 'updated' => datetime_convert(), + 'subject' => $subject, 'recips' => $handles); + if (dba::insert('conv', $fields)) { + $convid = dba::lastInsertId(); + } + } + + if (!$convid) { + logger('send message: conversation not found.'); + return -4; + } + + if (!strlen($replyto)) { + $replyto = $convuri; + } + + $post_id = null; + $result = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, + `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($guid), + intval($convid), + dbesc($me[0]['name']), + dbesc($me[0]['thumb']), + dbesc($me[0]['url']), + intval($recipient), + dbesc($subject), + dbesc($body), + 1, + intval($reply), + 0, + dbesc($uri), + dbesc($replyto), + datetime_convert() + ); + if ($result) { + $post_id = dba::lastInsertId(); + } + + /** + * + * When a photo was uploaded into the message using the (profile wall) ajax + * uploader, The permissions are initially set to disallow anybody but the + * owner from seeing it. This is because the permissions may not yet have been + * set for the post. If it's private, the photo permissions should be set + * appropriately. But we didn't know the final permissions on the post until + * now. So now we'll look for links of uploaded messages that are in the + * post and set them to the same permissions as the post itself. + * + */ + $match = null; + if (preg_match_all("/\[img\](.*?)\[\/img\]/", $body, $match)) { + $images = $match[1]; + if (count($images)) { + foreach ($images as $image) { + if (!stristr($image, System::baseUrl() . '/photo/')) { + continue; + } + $image_uri = substr($image, strrpos($image, '/') + 1); + $image_uri = substr($image_uri, 0, strpos($image_uri, '-')); + q("UPDATE `photo` SET `allow_cid` = '%s' + WHERE `resource-id` = '%s' AND `album` = '%s' AND `uid` = %d ", + dbesc('<' . $recipient . '>'), + dbesc($image_uri), + dbesc( t('Wall Photos')), + intval(local_user()) + ); + } + } + } + + if ($post_id) { + Worker::add(PRIORITY_HIGH, "Notifier", "mail", $post_id); + return intval($post_id); + } else { + return -3; + } + } + + function send_wallmessage($recipient = '', $body = '', $subject = '', $replyto = '') + { + if (!$recipient) { + return -1; + } + + if (!strlen($subject)) { + $subject = t('[no subject]'); + } + + $guid = get_guid(32); + $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid; + + $me = Probe::uri($replyto); + + if (!$me['name']) { + return -2; + } + + $conv_guid = get_guid(32); + + $recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); + + $sender_nick = basename($replyto); + $sender_host = substr($replyto, strpos($replyto, '://') + 3); + $sender_host = substr($sender_host, 0, strpos($sender_host, '/')); + $sender_handle = $sender_nick . '@' . $sender_host; + + $handles = $recip_handle . ';' . $sender_handle; + + $convid = null; + $fields = array('uid' => $recipient['uid'], 'guid' => $conv_guid, 'creator' => $sender_handle, + 'created' => datetime_convert(), 'updated' => datetime_convert(), + 'subject' => $subject, 'recips' => $handles); + if (dba::insert('conv', $fields)) { + $convid = dba::lastInsertId(); + } + + if (!$convid) { + logger('send message: conversation not found.'); + return -4; + } + + q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, + `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($guid), + intval($convid), + dbesc($me['name']), + dbesc($me['photo']), + dbesc($me['url']), + 0, + dbesc($subject), + dbesc($body), + 0, + 0, + 0, + dbesc($uri), + dbesc($replyto), + datetime_convert(), + 1 + ); + + return 0; + } +} From b3e6a1d2832be024819328e51e9e1df4c25b560f Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 15 Jan 2018 12:14:09 -0500 Subject: [PATCH 2/6] Update functions and calls Update functions and calls. --- include/api.php | 4 +- mod/message.php | 8 +-- mod/wallmessage.php | 5 +- src/Model/Mail.php | 123 +++++++++++++++++++++++--------------------- 4 files changed, 74 insertions(+), 66 deletions(-) diff --git a/include/api.php b/include/api.php index 9d3bae70a7..da7a83f51c 100644 --- a/include/api.php +++ b/include/api.php @@ -16,6 +16,7 @@ use Friendica\Core\Worker; use Friendica\Database\DBM; use Friendica\Model\Contact; use Friendica\Model\Group; +use Friendica\Model\Mail; use Friendica\Model\Photo; use Friendica\Model\User; use Friendica\Network\FKOAuth1; @@ -42,7 +43,6 @@ require_once 'include/security.php'; require_once 'include/html2bbcode.php'; require_once 'mod/wall_upload.php'; require_once 'mod/proxy.php'; -require_once 'include/message.php'; require_once 'include/like.php'; require_once 'include/plaintext.php'; @@ -3644,7 +3644,7 @@ function api_direct_messages_new($type) } } - $id = send_message($recipient['cid'], $_POST['text'], $sub, $replyto); + $id = Mail::send($recipient['cid'], $_POST['text'], $sub, $replyto); if ($id > -1) { $r = q("SELECT * FROM `mail` WHERE id=%d", intval($id)); diff --git a/mod/message.php b/mod/message.php index 9e0cb32c0e..04073139f3 100644 --- a/mod/message.php +++ b/mod/message.php @@ -1,13 +1,15 @@ local_user(), 'self' => true]); + $contact = dba::selectFirst('contact', [], ['id' => $recipient, 'uid' => local_user()]); if (!(count($me) && (count($contact)))) { return -2; @@ -74,9 +78,9 @@ class Mail $handles = $recip_handle . ';' . $sender_handle; - $fields = array('uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle, + $fields = ['uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle, 'created' => datetime_convert(), 'updated' => datetime_convert(), - 'subject' => $subject, 'recips' => $handles); + 'subject' => $subject, 'recips' => $handles]; if (dba::insert('conv', $fields)) { $convid = dba::lastInsertId(); } @@ -92,26 +96,28 @@ class Mail } $post_id = null; - $result = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, - `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($guid), - intval($convid), - dbesc($me[0]['name']), - dbesc($me[0]['thumb']), - dbesc($me[0]['url']), - intval($recipient), - dbesc($subject), - dbesc($body), - 1, - intval($reply), - 0, - dbesc($uri), - dbesc($replyto), - datetime_convert() + $success = dba::insert( + 'mail', + [ + 'uid' => local_user(), + 'guid' => $guid, + 'convid' => $convid, + 'from-name' => $me[0]['name'], + 'from-photo' => $me[0]['thumb'], + 'from-url' => $me[0]['url'], + `contact-id` => $recipient, + `title` => $subject, + `body` => $body, + `seen` => true, + `reply` => $reply, + `replied` => false, + `uri` => $uri, + `parent-uri` => $replyto, + `created` => datetime_convert() + ] ); - if ($result) { + + if ($success) { $post_id = dba::lastInsertId(); } @@ -136,13 +142,7 @@ class Mail } $image_uri = substr($image, strrpos($image, '/') + 1); $image_uri = substr($image_uri, 0, strpos($image_uri, '-')); - q("UPDATE `photo` SET `allow_cid` = '%s' - WHERE `resource-id` = '%s' AND `album` = '%s' AND `uid` = %d ", - dbesc('<' . $recipient . '>'), - dbesc($image_uri), - dbesc( t('Wall Photos')), - intval(local_user()) - ); + dba::update('photo', ['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_uri, 'album' => 'Wall Photos', 'uid' => local_user()]); } } } @@ -155,7 +155,13 @@ class Mail } } - function send_wallmessage($recipient = '', $body = '', $subject = '', $replyto = '') + /** + * @param string $recipient recipient, default empty + * @param string $body message body, default empty + * @param string $subject message subject, default empty + * @param string $replyto reply to, default empty + */ + public static function sendWall($recipient = '', $body = '', $subject = '', $replyto = '') { if (!$recipient) { return -1; @@ -186,9 +192,9 @@ class Mail $handles = $recip_handle . ';' . $sender_handle; $convid = null; - $fields = array('uid' => $recipient['uid'], 'guid' => $conv_guid, 'creator' => $sender_handle, + $fields = ['uid' => $recipient['uid'], 'guid' => $conv_guid, 'creator' => $sender_handle, 'created' => datetime_convert(), 'updated' => datetime_convert(), - 'subject' => $subject, 'recips' => $handles); + 'subject' => $subject, 'recips' => $handles]; if (dba::insert('conv', $fields)) { $convid = dba::lastInsertId(); } @@ -198,25 +204,26 @@ class Mail return -4; } - q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, - `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($guid), - intval($convid), - dbesc($me['name']), - dbesc($me['photo']), - dbesc($me['url']), - 0, - dbesc($subject), - dbesc($body), - 0, - 0, - 0, - dbesc($uri), - dbesc($replyto), - datetime_convert(), - 1 + dba::insert( + 'mail', + [ + `uid` => $recipient['uid'], + `guid` => $guid, + `convid` => $convid, + `from-name` => $me['name'], + `from-photo` => $me['photo'], + `from-url` => $me['url'], + `contact-id` => 0, + `title` => $subject, + `body` => $body, + `seen` => false, + `reply` => false, + `replied` => false, + `uri` => $uri, + `parent-uri` => $replyto, + `created` => datetime_convert(), + `unknown` => true + ] ); return 0; From ebd071d181bf56a09bb348daad71d4c55f8249a5 Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 15 Jan 2018 12:14:37 -0500 Subject: [PATCH 3/6] Remove old file remove include/message.php --- include/message.php | 213 -------------------------------------------- 1 file changed, 213 deletions(-) delete mode 100644 include/message.php diff --git a/include/message.php b/include/message.php deleted file mode 100644 index 4404163dc3..0000000000 --- a/include/message.php +++ /dev/null @@ -1,213 +0,0 @@ -user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); - - $conv_guid = get_guid(32); - $convuri = $recip_handle . ':' . $conv_guid; - - $handles = $recip_handle . ';' . $sender_handle; - - $fields = array('uid' => local_user(), 'guid' => $conv_guid, 'creator' => $sender_handle, - 'created' => datetime_convert(), 'updated' => datetime_convert(), - 'subject' => $subject, 'recips' => $handles); - if (dba::insert('conv', $fields)) { - $convid = dba::lastInsertId(); - } - } - - if (!$convid) { - logger('send message: conversation not found.'); - return -4; - } - - if (!strlen($replyto)) { - $replyto = $convuri; - } - - $post_id = null; - $result = q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, - `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($guid), - intval($convid), - dbesc($me[0]['name']), - dbesc($me[0]['thumb']), - dbesc($me[0]['url']), - intval($recipient), - dbesc($subject), - dbesc($body), - 1, - intval($reply), - 0, - dbesc($uri), - dbesc($replyto), - datetime_convert() - ); - if ($result) { - $post_id = dba::lastInsertId(); - } - - /** - * - * When a photo was uploaded into the message using the (profile wall) ajax - * uploader, The permissions are initially set to disallow anybody but the - * owner from seeing it. This is because the permissions may not yet have been - * set for the post. If it's private, the photo permissions should be set - * appropriately. But we didn't know the final permissions on the post until - * now. So now we'll look for links of uploaded messages that are in the - * post and set them to the same permissions as the post itself. - * - */ - $match = null; - if (preg_match_all("/\[img\](.*?)\[\/img\]/", $body, $match)) { - $images = $match[1]; - if (count($images)) { - foreach ($images as $image) { - if (!stristr($image, System::baseUrl() . '/photo/')) { - continue; - } - $image_uri = substr($image, strrpos($image, '/') + 1); - $image_uri = substr($image_uri, 0, strpos($image_uri, '-')); - q("UPDATE `photo` SET `allow_cid` = '%s' - WHERE `resource-id` = '%s' AND `album` = '%s' AND `uid` = %d ", - dbesc('<' . $recipient . '>'), - dbesc($image_uri), - dbesc( t('Wall Photos')), - intval(local_user()) - ); - } - } - } - - if ($post_id) { - Worker::add(PRIORITY_HIGH, "Notifier", "mail", $post_id); - return intval($post_id); - } else { - return -3; - } -} - -function send_wallmessage($recipient = '', $body = '', $subject = '', $replyto = '') -{ - if (!$recipient) { - return -1; - } - - if (!strlen($subject)) { - $subject = t('[no subject]'); - } - - $guid = get_guid(32); - $uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid; - - $me = Probe::uri($replyto); - - if (!$me['name']) { - return -2; - } - - $conv_guid = get_guid(32); - - $recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); - - $sender_nick = basename($replyto); - $sender_host = substr($replyto, strpos($replyto, '://') + 3); - $sender_host = substr($sender_host, 0, strpos($sender_host, '/')); - $sender_handle = $sender_nick . '@' . $sender_host; - - $handles = $recip_handle . ';' . $sender_handle; - - $convid = null; - $fields = array('uid' => $recipient['uid'], 'guid' => $conv_guid, 'creator' => $sender_handle, - 'created' => datetime_convert(), 'updated' => datetime_convert(), - 'subject' => $subject, 'recips' => $handles); - if (dba::insert('conv', $fields)) { - $convid = dba::lastInsertId(); - } - - if (!$convid) { - logger('send message: conversation not found.'); - return -4; - } - - q("INSERT INTO `mail` ( `uid`, `guid`, `convid`, `from-name`, `from-photo`, `from-url`, - `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($guid), - intval($convid), - dbesc($me['name']), - dbesc($me['photo']), - dbesc($me['url']), - 0, - dbesc($subject), - dbesc($body), - 0, - 0, - 0, - dbesc($uri), - dbesc($replyto), - datetime_convert(), - 1 - ); - - return 0; -} From 753996c86f0ddc3aa54c3fbd52a66626d89933aa Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 15 Jan 2018 12:23:18 -0500 Subject: [PATCH 4/6] Fix backticks backtick to single quote in dba calls --- src/Model/Mail.php | 50 +++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Model/Mail.php b/src/Model/Mail.php index d789d69de0..d5105ac21c 100644 --- a/src/Model/Mail.php +++ b/src/Model/Mail.php @@ -105,15 +105,15 @@ class Mail 'from-name' => $me[0]['name'], 'from-photo' => $me[0]['thumb'], 'from-url' => $me[0]['url'], - `contact-id` => $recipient, - `title` => $subject, - `body` => $body, - `seen` => true, - `reply` => $reply, - `replied` => false, - `uri` => $uri, - `parent-uri` => $replyto, - `created` => datetime_convert() + 'contact-id' => $recipient, + 'title' => $subject, + 'body' => $body, + 'seen' => true, + 'reply' => $reply, + 'replied' => false, + 'uri' => $uri, + 'parent-uri' => $replyto, + 'created' => datetime_convert() ] ); @@ -207,22 +207,22 @@ class Mail dba::insert( 'mail', [ - `uid` => $recipient['uid'], - `guid` => $guid, - `convid` => $convid, - `from-name` => $me['name'], - `from-photo` => $me['photo'], - `from-url` => $me['url'], - `contact-id` => 0, - `title` => $subject, - `body` => $body, - `seen` => false, - `reply` => false, - `replied` => false, - `uri` => $uri, - `parent-uri` => $replyto, - `created` => datetime_convert(), - `unknown` => true + 'uid' => $recipient['uid'], + 'guid' => $guid, + 'convid' => $convid, + 'from-name' => $me['name'], + 'from-photo' => $me['photo'], + 'from-url' => $me['url'], + 'contact-id' => 0, + 'title' => $subject, + 'body' => $body, + 'seen' => false, + 'reply' => false, + 'replied' => false, + 'uri' => $uri, + 'parent-uri' => $replyto, + 'created' => datetime_convert(), + 'unknown' => true ] ); From 1bea697fb8fbb6f5a90c24eddf04a0c7fc98d304 Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 15 Jan 2018 12:28:07 -0500 Subject: [PATCH 5/6] Replace integers put integers back where booleans --- src/Model/Mail.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Model/Mail.php b/src/Model/Mail.php index d5105ac21c..f1021bb772 100644 --- a/src/Model/Mail.php +++ b/src/Model/Mail.php @@ -108,9 +108,9 @@ class Mail 'contact-id' => $recipient, 'title' => $subject, 'body' => $body, - 'seen' => true, + 'seen' => 1, 'reply' => $reply, - 'replied' => false, + 'replied' => 0, 'uri' => $uri, 'parent-uri' => $replyto, 'created' => datetime_convert() @@ -216,13 +216,13 @@ class Mail 'contact-id' => 0, 'title' => $subject, 'body' => $body, - 'seen' => false, - 'reply' => false, - 'replied' => false, + 'seen' => 0, + 'reply' => 0, + 'replied' => 0, 'uri' => $uri, 'parent-uri' => $replyto, 'created' => datetime_convert(), - 'unknown' => true + 'unknown' => 1 ] ); From 8c878a7ad3a3c6bfa0b8217e854e0e2629804059 Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 15 Jan 2018 12:37:44 -0500 Subject: [PATCH 6/6] Remove indexes remove [0] from selectFirst objects --- src/Model/Mail.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Model/Mail.php b/src/Model/Mail.php index f1021bb772..a0474f7557 100644 --- a/src/Model/Mail.php +++ b/src/Model/Mail.php @@ -67,10 +67,10 @@ class Mail if (!$convid) { // create a new conversation - $recip_host = substr($contact[0]['url'], strpos($contact[0]['url'], '://') + 3); + $recip_host = substr($contact['url'], strpos($contact['url'], '://') + 3); $recip_host = substr($recip_host, 0, strpos($recip_host, '/')); - $recip_handle = (($contact[0]['addr']) ? $contact[0]['addr'] : $contact[0]['nick'] . '@' . $recip_host); + $recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host); $sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); $conv_guid = get_guid(32); @@ -102,9 +102,9 @@ class Mail 'uid' => local_user(), 'guid' => $guid, 'convid' => $convid, - 'from-name' => $me[0]['name'], - 'from-photo' => $me[0]['thumb'], - 'from-url' => $me[0]['url'], + 'from-name' => $me['name'], + 'from-photo' => $me['thumb'], + 'from-url' => $me['url'], 'contact-id' => $recipient, 'title' => $subject, 'body' => $body,