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

fix mail attachment and photo permissions. issue #202

Browse Source
This commit is contained in:
Mario Vavti 2015-12-02 11:34:40 +01:00
parent 857e13e9b8
commit bb995f1bb6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/message.php
View File

@ -13,6 +13,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
$ret = array('success' => false); $ret = array('success' => false);
$a = get_app(); $a = get_app();
$observer_hash = get_observer_hash();
if(! $recipient) { if(! $recipient) {
$ret['message'] = t('No recipient provided.'); $ret['message'] = t('No recipient provided.');
@ -148,8 +149,8 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
$match = null; $match = null;
$images = null; $images = null;
if(preg_match_all("/\[zmg\](.*?)\[\/zmg\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match)) if(preg_match_all("/\[zmg\=([0-9]*)x([0-9]*)\](.*?)\[\/zmg\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match))
$images = $match[1]; $images = $match[3];
$match = false; $match = false;
@ -230,7 +231,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
dbesc($image_uri), dbesc($image_uri),
intval($channel['channel_id']), intval($channel['channel_id']),
dbesc('<' . $channel['channel_hash'] . '>') 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'", $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('<' . $recipient . '>'),
dbesc($image_uri), dbesc($image_uri),
@ -239,7 +240,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
); );
} }
} }
if($attaches) { if($attaches) {
foreach($attaches as $attach) { foreach($attaches as $attach) {
$hash = substr($attach,0,strpos($attach,',')); $hash = substr($attach,0,strpos($attach,','));