diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-23 21:01:59 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-23 21:01:59 -0700 |
| commit | 1a0655f34ea9979c7a08d21344d3e0eb9eb3246d (patch) | |
| tree | 5dde4224a3c762bcc1935b2e67464939e57a60d2 /include/diaspora.php | |
| parent | cb76fb8b9b659c4ec06e359f375a35a534927b99 (diff) | |
| download | volse-hubzilla-1a0655f34ea9979c7a08d21344d3e0eb9eb3246d.tar.gz volse-hubzilla-1a0655f34ea9979c7a08d21344d3e0eb9eb3246d.tar.bz2 volse-hubzilla-1a0655f34ea9979c7a08d21344d3e0eb9eb3246d.zip | |
more work on mail flags
Diffstat (limited to 'include/diaspora.php')
| -rwxr-xr-x | include/diaspora.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 997cbb187..ef02b5fc0 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1723,14 +1723,14 @@ function diaspora_conversation($importer,$xml,$msg) { if($body) $body = str_rot47(base64url_encode($body)); - q("insert into mail ( `channel_id`, `convid`, `from_xchan`,`to_xchan`,`title`,`body`,`mail_flags`,`mid`,`parent_mid`,`created`) values ( %d, %d, '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s')", + q("insert into mail ( `channel_id`, `convid`, `from_xchan`,`to_xchan`,`title`,`body`,`mail_obscured`,`mid`,`parent_mid`,`created`) values ( %d, %d, '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s')", intval($importer['channel_id']), intval($conversation['id']), dbesc($person['xchan_hash']), dbesc($importer['channel_hash']), dbesc($subject), dbesc($body), - intval(MAIL_OBSCURED), + intval(1), dbesc($msg_guid), dbesc($parent_uri), dbesc($msg_created_at) @@ -1855,14 +1855,14 @@ function diaspora_message($importer,$xml,$msg) { if($body) $body = str_rot47(base64url_encode($body)); - q("insert into mail ( `channel_id`, `convid`, `from_xchan`,`to_xchan`,`title`,`body`,`mail_flags`,`mid`,`parent_mid`,`created`) values ( %d, %d, '%s', '%s', '%s', '%s', '%d','%s','%s','%s')", + q("insert into mail ( `channel_id`, `convid`, `from_xchan`,`to_xchan`,`title`,`body`,`mail_obscured`,`mid`,`parent_mid`,`created`) values ( %d, %d, '%s', '%s', '%s', '%s', '%d','%s','%s','%s')", intval($importer['channel_id']), intval($conversation['id']), dbesc($person['xchan_hash']), dbesc($importer['xchan_hash']), dbesc($subject), dbesc($body), - intval(MAIL_OBSCURED), + intval(1), dbesc($msg_guid), dbesc($parent_uri), dbesc($msg_created_at) @@ -2897,7 +2897,7 @@ function diaspora_send_mail($item,$owner,$contact) { 'participant_handles' => xmlify($cnv['recips']) ); - if(array_key_exists('mail_flags',$item) && ($item['mail_flags'] & MAIL_OBSCURED)) { + if(array_key_exists('mail_obscured',$item) && intval($item['mail_obscured'])) { if($item['title']) $item['title'] = base64url_decode(str_rot47($item['title'])); if($item['body']) |