From 56fc81f57e07f4208c639fee71105b66471846ef Mon Sep 17 00:00:00 2001 From: Mike Macgirvin Date: Fri, 30 Jul 2010 21:22:52 -0700 Subject: [PATCH] mail more or less working --- mod/dfrn_notify.php | 2 +- mod/message.php | 152 +++++++++++++++++++++++++++++++++++++++++-- mod/ping.php | 10 ++- view/mail_conv.tpl | 15 +++++ view/mail_head.tpl | 9 +++ view/mail_list.tpl | 10 ++- view/prv_message.tpl | 4 +- view/style.css | 75 +++++++++++++++++++++ 8 files changed, 263 insertions(+), 14 deletions(-) create mode 100644 view/mail_conv.tpl create mode 100644 view/mail_head.tpl diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index fdf9a21084..38756f724e 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -5,7 +5,7 @@ require_once('include/items.php'); function dfrn_notify_post(&$a) { -dbg(3); + $dfrn_id = notags(trim($_POST['dfrn_id'])); $challenge = notags(trim($_POST['challenge'])); $data = $_POST['data']; diff --git a/mod/message.php b/mod/message.php index eb18bac898..e1a86727bc 100644 --- a/mod/message.php +++ b/mod/message.php @@ -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'] : '' . $rr['title'] . ''), + '$subject' => (($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . ''), + '$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'] . ''; + $parent = ''; + $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; + } + } \ No newline at end of file diff --git a/mod/ping.php b/mod/ping.php index bc160ade7f..ea5c308a30 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -25,9 +25,15 @@ function ping_init(&$a) { ); $intro = $r[0]['total']; - // TODO - $mail = 0; + $myurl = $a->get_baseurl() . '/profile/' . $user['nickname'] ; + $r = q("SELECT COUNT(*) AS `total` FROM `mail` + WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ", + intval($_SESSION['uid']), + dbesc($myurl) + ); + $mail = $r[0]['total']; + header("Content-type: text/xml"); echo "\r\n$intro$mail$network$home\r\n"; diff --git a/view/mail_conv.tpl b/view/mail_conv.tpl new file mode 100644 index 0000000000..3c26a9c543 --- /dev/null +++ b/view/mail_conv.tpl @@ -0,0 +1,15 @@ +
+
+ $from_name +
+
+
$from_name
+
$date
+
$subject
+
$body
+
+
+
$delete
+ +
+
diff --git a/view/mail_head.tpl b/view/mail_head.tpl new file mode 100644 index 0000000000..dd53d621ab --- /dev/null +++ b/view/mail_head.tpl @@ -0,0 +1,9 @@ +

$messages

+ +
+
diff --git a/view/mail_list.tpl b/view/mail_list.tpl index d5a79ef351..ee64f15e0f 100644 --- a/view/mail_list.tpl +++ b/view/mail_list.tpl @@ -1,9 +1,13 @@
$from_name -
$from_name
-
$date
-
$subject
+
+
$from_name
+
$date
+
$subject
+
+
$delete
+
diff --git a/view/prv_message.tpl b/view/prv_message.tpl index 64c36b9989..cf6ff50eec 100644 --- a/view/prv_message.tpl +++ b/view/prv_message.tpl @@ -4,11 +4,13 @@
+$parent +
$to
$select
$subject
- +
$yourmessage
diff --git a/view/style.css b/view/style.css index ba5102fd31..6d634b7761 100644 --- a/view/style.css +++ b/view/style.css @@ -1074,4 +1074,79 @@ input#dfrn-url { #prvmail-end { clear: both; +} + +.mail-list-sender, +.mail-list-detail { + float: left; +} +.mail-list-detail { + margin-left: 20px; +} + +.mail-list-subject { + font-size: 1.1em; + margin-top: 10px; +} + +.mail-list-outside-wrapper-end { + clear: both; +} + +.mail-list-outside-wrapper { + margin-top: 30px; +} + +.mail-list-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} + +.mail-list-delete-icon { + border: none; +} + + + + + +.mail-conv-sender, +.mail-conv-detail { + float: left; +} +.mail-conv-detail { + margin-left: 20px; + width: 500px; +} + +.mail-conv-subject { + font-size: 1.1em; + margin-top: 10px; +} + +.mail-conv-outside-wrapper-end { + clear: both; +} + +.mail-conv-outside-wrapper { + margin-top: 30px; +} + +.mail-conv-delete-wrapper { + float: right; + margin-right: 30px; + margin-top: 15px; +} + +.mail-conv-delete-icon { + border: none; +} + +.message-links ul { + list-style-type: none; +} + +.message-links li { + margin-top: 10px; } \ No newline at end of file