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

more mail sync work

Browse Source
This commit is contained in:
redmatrix 2015-10-14 17:49:35 -07:00
parent b33a9a71f6
commit c8e3ea955d
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/identity.php
View File

@ -635,8 +635,12 @@ function identity_basic_export($channel_id, $items = false) {
$r = q("select * from conv where uid = %d", $r = q("select * from conv where uid = %d",
intval($channel_id) intval($channel_id)
); );
if($r) if($r) {
for($x = 0; $x < count($r); $x ++) {
$r[$x]['subject'] = base64url_decode(str_rot47($r[$x]['subject']));
}
$ret['conv'] = $r; $ret['conv'] = $r;
}
$r = q("select mail.*, conv.guid as conv_guid from mail left join conv on mail.convid = conv.id where mail.uid = %d", $r = q("select mail.*, conv.guid as conv_guid from mail left join conv on mail.convid = conv.id where mail.uid = %d",
@ -645,17 +649,11 @@ function identity_basic_export($channel_id, $items = false) {
if($r) { if($r) {
$m = array(); $m = array();
foreach($r as $rr) { foreach($r as $rr) {
$m[] = mail_encode($rr,true);
} }
$ret['mail'] = $m; $ret['mail'] = $m;
} }
$r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d", $r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d",
intval($channel_id) intval($channel_id)
); );

1
include/import.php
View File

@ -848,6 +848,7 @@ function import_mail($channel,$mails) {
$m = get_mail_elements($mail); $m = get_mail_elements($mail);
if(! $m) if(! $m)
continue; continue;
if($mail['conv_guid']) { if($mail['conv_guid']) {
$x = q("select id from conv where guid = '%s' and uid = %d limit 1", $x = q("select id from conv where guid = '%s' and uid = %d limit 1",
dbesc($mail['conv_guid']), dbesc($mail['conv_guid']),