From b3e6a1d2832be024819328e51e9e1df4c25b560f Mon Sep 17 00:00:00 2001 From: Adam Magness Date: Mon, 15 Jan 2018 12:14:09 -0500 Subject: [PATCH] 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;