X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=9cc2e2826cf0e5d6eae7d45a6609d2e52cefda77;hb=723aca6109f57e68654c978169b57b73ab25330f;hp=1524bfd369e9012e42b131ba36a5f009743c24b4;hpb=f0b640058427aff2d9d60899f9005980ab89c0ef;p=friendica.git diff --git a/mod/message.php b/mod/message.php index 1524bfd369..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), @@ -65,16 +64,15 @@ 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'); if($post_id) { - proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" $proc_debug &", + proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &", array(),$foo)); notice( t('Message sent.') . EOL ); } @@ -114,7 +112,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 ); @@ -124,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 ); @@ -139,18 +137,6 @@ 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')) { @@ -189,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)) @@ -199,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']) @@ -216,7 +202,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'], @@ -235,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)) { @@ -243,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']) ); } @@ -254,14 +240,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'); @@ -281,7 +270,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')