X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=9cc2e2826cf0e5d6eae7d45a6609d2e52cefda77;hb=723aca6109f57e68654c978169b57b73ab25330f;hp=45908d2332248ee32c383f8dbe9cc1d156061f28;hpb=db89a1eb449d60c02d727f0118919872ceee9be9;p=friendica.git
diff --git a/mod/message.php b/mod/message.php
index 45908d2332..9cc2e2826c 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -1,6 +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),
@@ -62,7 +64,7 @@ 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'];
@@ -82,6 +84,8 @@ function message_post(&$a) {
}
function message_content(&$a) {
+
+ $o = '';
$o .= '';
if(! local_user()) {
@@ -92,7 +96,7 @@ function message_content(&$a) {
$myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
- $tpl = file_get_contents('view/mail_head.tpl');
+ $tpl = load_view_file('view/mail_head.tpl');
$header = replace_macros($tpl, array(
'$messages' => t('Messages'),
'$inbox' => t('Inbox'),
@@ -101,14 +105,14 @@ function message_content(&$a) {
));
- if(($a->argc == 3) && ($a->argv[1] == 'drop' || $a->argv[1] == 'dropconv')) {
+ if(($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) {
if(! intval($a->argv[2]))
return;
$cmd = $a->argv[1];
- if($cmd == 'drop') {
+ 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 );
@@ -118,13 +122,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 );
@@ -133,25 +137,15 @@ 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_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &",
- array(),$foo));
- goaway($a->get_baseurl() . '/message' );
- }
-
-
- if(($a->argc > 1) && ($a->argv[1] == 'new')) {
+ if(($a->argc > 1) && ($a->argv[1] === 'new')) {
- $tpl = file_get_contents('view/msg-header.tpl');
+ $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);
- $tpl = file_get_contents('view/prv_message.tpl');
+ $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'),
'$to' => t('To:'),
@@ -170,7 +164,7 @@ function message_content(&$a) {
return $o;
}
- if(($a->argc == 1) || ($a->argc == 2 && $a->argv[1] == 'sent')) {
+ if(($a->argc == 1) || ($a->argc == 2 && $a->argv[1] === 'sent')) {
$o .= $header;
@@ -181,7 +175,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))
@@ -191,7 +185,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'])
@@ -201,13 +195,14 @@ function message_content(&$a) {
return $o;
}
- $tpl = file_get_contents('view/mail_list.tpl');
+ $tpl = load_view_file('view/mail_list.tpl');
foreach($r as $rr) {
$o .= replace_macros($tpl, array(
'$id' => $rr['id'],
'$from_name' =>$rr['from-name'],
'$from_url' => $a->get_baseurl() . '/redir/' . $rr['contact-id'],
- '$from_photo' => $rr['from-photo'],
+ '$sparkle' => ' sparkle',
+ '$from_photo' => $rr['thumb'],
'$subject' => (($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . ''),
'$delete' => t('Delete conversation'),
'$body' => $rr['body'],
@@ -226,7 +221,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)) {
@@ -234,7 +229,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'])
);
}
@@ -245,26 +240,37 @@ 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 = file_get_contents('view/msg-header.tpl');
+ $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 = file_get_contents('view/mail_conv.tpl');
+ $tpl = load_view_file('view/mail_conv.tpl');
foreach($messages as $message) {
+ if($message['from-url'] == $myprofile) {
+ $from_url = $myprofile;
+ $sparkle = '';
+ }
+ else {
+ $from_url = $a->get_baseurl() . '/redir/' . $message['contact-id'];
+ $sparkle = ' sparkle';
+ }
$o .= replace_macros($tpl, array(
'$id' => $message['id'],
'$from_name' =>$message['from-name'],
- '$from_url' => (($message['from-url'] == $myprofile)
- ? $myprofile : $a->get_baseurl() . '/redir/' . $message['contact-id']),
+ '$from_url' => $from_url,
+ '$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')
@@ -273,7 +279,7 @@ function message_content(&$a) {
}
$select = $message['name'] . '';
$parent = '';
- $tpl = file_get_contents('view/prv_message.tpl');
+ $tpl = load_view_file('view/prv_message.tpl');
$o .= replace_macros($tpl,array(
'$header' => t('Send Reply'),
'$to' => t('To:'),