|
|
|
|
@ -90,6 +90,58 @@ function message_content(&$a) {
|
|
|
|
|
|
|
|
|
|
$myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname']; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$tpl = file_get_contents('view/mail_head.tpl'); |
|
|
|
|
$header = replace_macros($tpl, array( |
|
|
|
|
'$messages' => t('Messages'), |
|
|
|
|
'$inbox' => t('Inbox'), |
|
|
|
|
'$outbox' => t('Outbox'), |
|
|
|
|
'$new' => t('New Message') |
|
|
|
|
)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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') { |
|
|
|
|
$r = q("DELETE FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1", |
|
|
|
|
intval($a->argv[2]), |
|
|
|
|
intval($_SESSION['uid']) |
|
|
|
|
); |
|
|
|
|
if($r) { |
|
|
|
|
notice( t('Message deleted.') . EOL ); |
|
|
|
|
} |
|
|
|
|
goaway($a->get_baseurl() . '/message' ); |
|
|
|
|
} |
|
|
|
|
else { |
|
|
|
|
$r = q("SELECT `parent-uri` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1", |
|
|
|
|
intval($a->argv[2]), |
|
|
|
|
intval($_SESSION['uid']) |
|
|
|
|
); |
|
|
|
|
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']) |
|
|
|
|
); |
|
|
|
|
if($r) |
|
|
|
|
notice( t('Conversation removed.') . EOL ); |
|
|
|
|
} |
|
|
|
|
goaway($a->get_baseurl() . '/message' ); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
if(($a->argc > 2) && ($a->argv[1] == 'redeliver') && intval($a->argv[2])) { |
|
|
|
|
$url = $a->get_baseurl(); |
|
|
|
|
$post_id = intval($a->argv[2]); |
|
|
|
|
proc_close(proc_open("php include/notifier.php \"$url\" \"mail\" \"$post_id\" > mail.log &", |
|
|
|
|
array(),$foo)); |
|
|
|
|
goaway($a->get_baseurl() . '/message' ); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(($a->argc > 1) && ($a->argv[1] == 'new')) { |
|
|
|
|
|
|
|
|
|
$tpl = file_get_contents('view/jot-header.tpl'); |
|
|
|
|
@ -98,12 +150,15 @@ function message_content(&$a) {
|
|
|
|
|
|
|
|
|
|
$select .= contact_select('messageto','message-to-select', false, 4, true); |
|
|
|
|
$tpl = file_get_contents('view/prv_message.tpl'); |
|
|
|
|
$o = replace_macros($tpl,array( |
|
|
|
|
$o .= replace_macros($tpl,array( |
|
|
|
|
'$header' => t('Send Private Message'), |
|
|
|
|
'$to' => t('To:'), |
|
|
|
|
'$subject' => t('Subject:'), |
|
|
|
|
'$subjtxt' => '', |
|
|
|
|
'$readonly' => '', |
|
|
|
|
'$yourmessage' => t('Your message:'), |
|
|
|
|
'$select' => $select, |
|
|
|
|
'$parent' => '', |
|
|
|
|
'$upload' => t('Upload photo'), |
|
|
|
|
'$insert' => t('Insert web link'), |
|
|
|
|
'$wait' => t('Please wait') |
|
|
|
|
@ -113,19 +168,27 @@ function message_content(&$a) {
|
|
|
|
|
return $o; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if($a->argc == 1) { |
|
|
|
|
if(($a->argc == 1) || ($a->argc == 2 && $a->argv[1] == 'sent')) { |
|
|
|
|
|
|
|
|
|
$o .= $header; |
|
|
|
|
|
|
|
|
|
if($a->argc == 2) |
|
|
|
|
$eq = '='; // I'm not going to bother escaping this. |
|
|
|
|
else |
|
|
|
|
$eq = '!='; // or this. |
|
|
|
|
|
|
|
|
|
$r = q("SELECT count(*) AS `total` FROM `mail` |
|
|
|
|
WHERE `mail`.`uid` = %d AND `from-url` != '%s' ", |
|
|
|
|
WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC", |
|
|
|
|
intval($_SESSION['uid']), |
|
|
|
|
dbesc($myprofile) |
|
|
|
|
); |
|
|
|
|
if(count($r)) |
|
|
|
|
$a->set_pager_total($r[0]['total']); |
|
|
|
|
|
|
|
|
|
$r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` |
|
|
|
|
$r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, |
|
|
|
|
`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` != '%s' LIMIT %d , %d ", |
|
|
|
|
WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC LIMIT %d , %d ", |
|
|
|
|
intval($_SESSION['uid']), |
|
|
|
|
dbesc($myprofile), |
|
|
|
|
intval($a->pager['start']), |
|
|
|
|
@ -143,13 +206,88 @@ function message_content(&$a) {
|
|
|
|
|
'$from_name' =>$rr['from-name'], |
|
|
|
|
'$from_url' => $a->get_baseurl() . '/redir/' . $rr['contact-id'], |
|
|
|
|
'$from_photo' => $rr['from-photo'], |
|
|
|
|
'$subject' => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'), |
|
|
|
|
'$subject' => (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'), |
|
|
|
|
'$delete' => t('Delete conversation'), |
|
|
|
|
'$body' => $rr['body'], |
|
|
|
|
'$to_name' => $rr['name'], |
|
|
|
|
'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'],'D, d M Y - g:i A') |
|
|
|
|
'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'],'D, d M Y - g:i A') |
|
|
|
|
)); |
|
|
|
|
} |
|
|
|
|
$o .= paginate($a); |
|
|
|
|
return $o; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(($a->argc > 1) && (intval($a->argv[1]))) { |
|
|
|
|
|
|
|
|
|
$o .= $header; |
|
|
|
|
|
|
|
|
|
$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($a->argv[1]) |
|
|
|
|
); |
|
|
|
|
if(count($r)) { |
|
|
|
|
$contact_id = $r[0]['contact-id']; |
|
|
|
|
$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']), |
|
|
|
|
dbesc($r[0]['parent-uri']) |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
if(! count($messages)) { |
|
|
|
|
notice( t('Message not available.') . EOL ); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$r = q("UPDATE `mail` SET `seen` = 1 WHERE `parent-uri` = '%s' AND `uid` = %d", |
|
|
|
|
dbesc($r[0]['parent-uri']), |
|
|
|
|
intval($_SESSION['uid']) |
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
require_once("include/bbcode.php"); |
|
|
|
|
|
|
|
|
|
$tpl = file_get_contents('view/jot-header.tpl'); |
|
|
|
|
|
|
|
|
|
$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl())); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$tpl = file_get_contents('view/mail_conv.tpl'); |
|
|
|
|
foreach($messages as $message) { |
|
|
|
|
$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_photo' => $message['from-photo'], |
|
|
|
|
'$subject' => $message['title'], |
|
|
|
|
'$body' => 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') |
|
|
|
|
)); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
$select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />'; |
|
|
|
|
$parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />'; |
|
|
|
|
$tpl = file_get_contents('view/prv_message.tpl'); |
|
|
|
|
$o .= replace_macros($tpl,array( |
|
|
|
|
'$header' => t('Send Reply'), |
|
|
|
|
'$to' => t('To:'), |
|
|
|
|
'$subject' => t('Subject:'), |
|
|
|
|
'$subjtxt' => $message['title'], |
|
|
|
|
'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ', |
|
|
|
|
'$yourmessage' => t('Your message:'), |
|
|
|
|
'$select' => $select, |
|
|
|
|
'$parent' => $parent, |
|
|
|
|
'$upload' => t('Upload photo'), |
|
|
|
|
'$insert' => t('Insert web link'), |
|
|
|
|
'$wait' => t('Please wait') |
|
|
|
|
|
|
|
|
|
)); |
|
|
|
|
|
|
|
|
|
return $o; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
Mike Macgirvin
12 years ago