harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	install/update.php
This commit is contained in:
redmatrix 2015-10-15 16:02:37 -07:00
commit 7517c76ae4
5 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -50,7 +50,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H');
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1156 );
define ( 'DB_UPDATE_VERSION', 1157 );
/**
* @brief Constant with a HTML line break.

31
include/message.php
View File

@ -49,6 +49,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
// look for any existing conversation structure
$conv_guid = '';
if(strlen($replyto)) {
$r = q("select convid from mail where channel_id = %d and ( mid = '%s' or parent_mid = '%s' ) limit 1",
@ -56,8 +57,9 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
dbesc($replyto),
dbesc($replyto)
);
if($r)
if($r) {
$convid = $r[0]['convid'];
}
}
if(! $convid) {
@ -89,12 +91,15 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
dbesc($handles)
);
$r = q("select * from conv where guid = '%s' and uid = %d limit 1",
dbesc($conv_guid),
intval(local_channel())
);
if($r)
if($r) {
$convid = $r[0]['id'];
$retconv = $r[0];
}
}
if(! $convid) {
@ -102,6 +107,16 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
return $ret;
}
if(! $conv_guid) {
$r = q("select * from conv where id = %d and uid = %d limit 1",
intval($convid),
intval(local_channel())
);
if($r) {
$conv_guid = $r[0]['guid'];
$retconv = $r[0];
}
}
// generate a unique message_id
@ -197,8 +212,11 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
dbesc($mid),
intval($channel['channel_id'])
);
if($r)
if($r) {
$post_id = $r[0]['id'];
$retmail = $r;
$retmail['conv_guid'] = $conv_guid;
}
else {
$ret['message'] = t('Stored post could not be verified.');
return $ret;
@ -242,6 +260,10 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
$ret['success'] = true;
$ret['message_item'] = intval($post_id);
if($retconv)
$ret['conv'] = $retconv;
if($retmail)
$ret['mail'] = $retmail;
return $ret;
}
@ -369,11 +391,12 @@ function private_messages_drop($channel_id, $messageitem_id, $drop_conversation
if($drop_conversation) {
// find the parent_id
$p = q("SELECT parent_mid FROM mail WHERE id = %d AND channel_id = %d LIMIT 1",
$p = q("SELECT parent_mid, convid FROM mail WHERE id = %d AND channel_id = %d LIMIT 1",
intval($messageitem_id),
intval($channel_id)
);
if($p) {
$r = q("DELETE FROM mail WHERE parent_mid = '%s' AND channel_id = %d ",
dbesc($p[0]['parent_mid']),
intval($channel_id)

7
install/update.php
View File

@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1156 );
define( 'UPDATE_VERSION' , 1157 );
/**
*
@ -1885,3 +1885,8 @@ function update_r1155() {
return UPDATE_FAILED;
}
function update_r1156() {
return UPDATE_SUCCESS;
}

5
mod/mail.php
View File

@ -97,7 +97,10 @@ function mail_post(&$a) {
$ret = send_message(0, $recipient, $body, $subject, $replyto, $expires);
if(! $ret['success']) {
if($ret['success']) {
build_sync_packet(0,array('conv' => array($ret['conv']),'mail' => array(encode_mail($ret['mail'],true))));
}
else {
notice($ret['message']);
}

2
version.inc
View File

@ -1 +1 @@
2015-10-14.1185
2015-10-15.1186