Update functions and calls

Update functions and calls.
This commit is contained in:
Adam Magness 2018-01-15 12:14:09 -05:00
parent d5623d28d5
commit b3e6a1d283
4 changed files with 74 additions and 66 deletions

View file

@ -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));

View file

@ -1,13 +1,15 @@
<?php
/**
* @file mod/message.php
*/
use Friendica\App;
use Friendica\Content\Smilies;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Model\Mail;
require_once 'include/acl_selectors.php';
require_once 'include/message.php';
require_once 'include/conversation.php';
function message_init(App $a)
@ -57,7 +59,7 @@ function message_post(App $a)
$body = x($_REQUEST, 'body') ? escape_tags(trim($_REQUEST['body'])) : '';
$recipient = x($_REQUEST, 'messageto') ? intval($_REQUEST['messageto']) : 0;
$ret = send_message($recipient, $body, $subject, $replyto);
$ret = Mail::send($recipient, $body, $subject, $replyto);
$norecip = false;
switch ($ret) {

View file

@ -5,10 +5,9 @@
use Friendica\App;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Mail;
use Friendica\Model\Profile;
require_once 'include/message.php';
function wallmessage_post(App $a) {
$replyto = Profile::getMyURL();
@ -50,7 +49,7 @@ function wallmessage_post(App $a) {
return;
}
$ret = send_wallmessage($user, $body, $subject, $replyto);
$ret = Mail::sendWall($user, $body, $subject, $replyto);
switch($ret){
case -1:

View file

@ -11,13 +11,22 @@ use Friendica\Database\DBM;
use dba;
require_once 'include/dba.php';
require_once 'include/datetime.php';
/**
* Class to handle private messages
*/
class Mail
{
function send_message($recipient = 0, $body = '', $subject = '', $replyto = '')
/**
* Send private message
*
* @param integer $recipient recipient id, default 0
* @param string $body message body, default empty
* @param string $subject message subject, default empty
* @param string $replyto reply to
*/
public static function send($recipient = 0, $body = '', $subject = '', $replyto = '')
{
$a = get_app();
@ -29,13 +38,8 @@ class Mail
$subject = t('[no subject]');
}
$me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
intval(local_user())
);
$contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($recipient),
intval(local_user())
);
$me = dba::selectFirst('contact', [], ['uid' => 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;