diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-03 18:12:02 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-03 18:12:02 +0200 |
| commit | adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936 (patch) | |
| tree | 2d5e256b6bb001397939debad609789367745fc9 /include/message.php | |
| parent | 2ce1e3678acd59409f1013433db99df6624c2895 (diff) | |
| parent | f3cb17ac3b007afd2dc5bf7cdad8a054b4d7fcd8 (diff) | |
| download | volse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.tar.gz volse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.tar.bz2 volse-hubzilla-adfc748bfa724ad8cc9d4ebf6f9d095fc56fb936.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/message.php')
| -rw-r--r-- | include/message.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/message.php b/include/message.php index 5720d2da4..396e3162c 100644 --- a/include/message.php +++ b/include/message.php @@ -75,13 +75,16 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' $handles = $recip_handle . ';' . $sender_handle; + if($subject) + $nsubject = str_rot47(base64url_encode($subject)); + $r = q("insert into conv (uid,guid,creator,created,updated,subject,recips) values(%d, '%s', '%s', '%s', '%s', '%s', '%s') ", intval(local_channel()), dbesc($conv_guid), dbesc($sender_handle), dbesc(datetime_convert()), dbesc(datetime_convert()), - dbesc($subject), + dbesc($nsubject), dbesc($handles) ); @@ -212,6 +215,12 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' intval($channel['channel_id']), dbesc('<' . $channel['channel_hash'] . '>') ); + $r = q("UPDATE attach SET allow_cid = '%s' WHERE hash = '%s' AND is_photo = 1 and uid = %d and allow_cid = '%s'", + dbesc('<' . $recipient . '>'), + dbesc($image_uri), + intval($channel['channel_id']), + dbesc('<' . $channel['channel_hash'] . '>') + ); } } |