X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=4821a45d263bc0aa5a1bb12d05ce7e84e2a3c44c;hb=8c245a5d2f4e6882211ac17561f86537a7089c73;hp=b847f31dcb746fcabec2f974d02ed3dcbd7fb3d4;hpb=cbaf0f2dc9cbea06ca3496d60f69dfeb10352394;p=friendica.git
diff --git a/mod/message.php b/mod/message.php
index b847f31dcb..4821a45d26 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -1,11 +1,6 @@
get_baseurl() . ':' . $_SESSION['uid'] . ':' . $hash ;
+ $uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
if(! strlen($replyto))
$replyto = $uri;
$r = q("INSERT INTO `mail` ( `uid`, `from-name`, `from-photo`, `from-url`,
- `contact-id`, `title`, `body`, `delivered`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
- VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s' )",
- intval($_SESSION['uid']),
+ `contact-id`, `title`, `body`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
+ VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s', '%s', '%s' )",
+ intval(local_user()),
dbesc($me[0]['name']),
dbesc($me[0]['thumb']),
dbesc($me[0]['url']),
intval($recipient),
dbesc($subject),
dbesc($body),
- 0,
1,
0,
dbesc($uri),
@@ -65,27 +59,57 @@ function message_post(&$a) {
);
$r = q("SELECT * FROM `mail` WHERE `uri` = '%s' and `uid` = %d LIMIT 1",
dbesc($uri),
- intval($_SESSION['uid'])
+ intval(local_user())
);
if(count($r))
$post_id = $r[0]['id'];
- $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
- $proc_debug = get_config('system','proc_debug');
+ /**
+ *
+ * When a photo was uploaded into the message using the (profile wall) ajax
+ * uploader, The permissions are initially set to disallow anybody but the
+ * owner from seeing it. This is because the permissions may not yet have been
+ * set for the post. If it's private, the photo permissions should be set
+ * appropriately. But we didn't know the final permissions on the post until
+ * now. So now we'll look for links of uploaded messages that are in the
+ * post and set them to the same permissions as the post itself.
+ *
+ */
+
+ $match = null;
+
+ if(preg_match_all("/\[img\](.+?)\[\/img\]/",$body,$match)) {
+ $images = $match[1];
+ if(count($images)) {
+ foreach($images as $image) {
+ if(! stristr($image,$a->get_baseurl() . '/photo/'))
+ continue;
+ $image_uri = substr($image,strrpos($image,'/') + 1);
+ $image_uri = substr($image_uri,0, strpos($image_uri,'-'));
+ $r = q("UPDATE `photo` SET `allow_cid` = '%s'
+ WHERE `resource-id` = '%s' AND `album` = '%s' AND `uid` = %d ",
+ dbesc('<' . $recipient . '>'),
+ dbesc($image_uri),
+ dbesc( t('Wall Photos')),
+ intval(local_user())
+ );
+ }
+ }
+ }
if($post_id) {
- proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" $proc_debug &",
- array(),$foo));
+ proc_run('php',"include/notifier.php","mail","$post_id");
notice( t('Message sent.') . EOL );
}
else {
notice( t('Message could not be sent.') . EOL );
}
return;
-
}
function message_content(&$a) {
+
+ $o = '';
$o .= '';
if(! local_user()) {
@@ -112,7 +136,7 @@ function message_content(&$a) {
if($cmd === 'drop') {
$r = q("DELETE FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[2]),
- intval($_SESSION['uid'])
+ intval(local_user())
);
if($r) {
notice( t('Message deleted.') . EOL );
@@ -122,13 +146,13 @@ function message_content(&$a) {
else {
$r = q("SELECT `parent-uri` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[2]),
- intval($_SESSION['uid'])
+ intval(local_user())
);
if(count($r)) {
$parent = $r[0]['parent-uri'];
$r = q("DELETE FROM `mail` WHERE `parent-uri` = '%s' AND `uid` = %d ",
dbesc($parent),
- intval($_SESSION['uid'])
+ intval(local_user())
);
if($r)
notice( t('Conversation removed.') . EOL );
@@ -137,26 +161,17 @@ function message_content(&$a) {
}
}
- if(($a->argc > 2) && ($a->argv[1] === 'redeliver') && intval($a->argv[2])) {
- $post_id = intval($a->argv[2]);
- $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
- $proc_debug = get_config('system','proc_debug');
-
-
- proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" $proc_debug & ",
- array(),$foo));
- goaway($a->get_baseurl() . '/message' );
- }
-
-
if(($a->argc > 1) && ($a->argv[1] === 'new')) {
$tpl = load_view_file('view/msg-header.tpl');
-
- $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
- $select .= contact_select('messageto','message-to-select', false, 4, true);
+ $a->page['htmlhead'] .= replace_macros($tpl, array(
+ '$baseurl' => $a->get_baseurl(),
+ '$nickname' => $a->user['nickname']
+ ));
+
+ $select = contact_select('messageto','message-to-select', false, 4, true);
$tpl = load_view_file('view/prv_message.tpl');
$o .= replace_macros($tpl,array(
'$header' => t('Send Private Message'),
@@ -187,7 +202,7 @@ function message_content(&$a) {
$r = q("SELECT count(*) AS `total` FROM `mail`
WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC",
- intval($_SESSION['uid']),
+ intval(local_user()),
dbesc($myprofile)
);
if(count($r))
@@ -197,7 +212,7 @@ function message_content(&$a) {
`mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb`
FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC LIMIT %d , %d ",
- intval($_SESSION['uid']),
+ intval(local_user()),
dbesc($myprofile),
intval($a->pager['start']),
intval($a->pager['itemspage'])
@@ -214,7 +229,7 @@ function message_content(&$a) {
'$from_name' =>$rr['from-name'],
'$from_url' => $a->get_baseurl() . '/redir/' . $rr['contact-id'],
'$sparkle' => ' sparkle',
- '$from_photo' => $rr['from-photo'],
+ '$from_photo' => $rr['thumb'],
'$subject' => (($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . ''),
'$delete' => t('Delete conversation'),
'$body' => $rr['body'],
@@ -233,7 +248,7 @@ function message_content(&$a) {
$r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb`
FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
WHERE `mail`.`uid` = %d AND `mail`.`id` = %d LIMIT 1",
- intval($_SESSION['uid']),
+ intval(local_user()),
intval($a->argv[1])
);
if(count($r)) {
@@ -241,7 +256,7 @@ function message_content(&$a) {
$messages = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb`
FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
WHERE `mail`.`uid` = %d AND `mail`.`parent-uri` = '%s' ORDER BY `mail`.`created` ASC",
- intval($_SESSION['uid']),
+ intval(local_user()),
dbesc($r[0]['parent-uri'])
);
}
@@ -252,14 +267,17 @@ function message_content(&$a) {
$r = q("UPDATE `mail` SET `seen` = 1 WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc($r[0]['parent-uri']),
- intval($_SESSION['uid'])
+ intval(local_user())
);
require_once("include/bbcode.php");
$tpl = load_view_file('view/msg-header.tpl');
- $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+ $a->page['htmlhead'] .= replace_macros($tpl, array(
+ '$nickname' => $a->user['nickname'],
+ '$baseurl' => $a->get_baseurl()
+ ));
$tpl = load_view_file('view/mail_conv.tpl');
@@ -279,7 +297,7 @@ function message_content(&$a) {
'$sparkle' => $sparkle,
'$from_photo' => $message['from-photo'],
'$subject' => $message['title'],
- '$body' => bbcode($message['body']),
+ '$body' => smilies(bbcode($message['body'])),
'$delete' => t('Delete message'),
'$to_name' => $message['name'],
'$date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A')