mail more or less working

8 files changed, 262 insertions, 13 deletions

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index fdf9a2108..38756f724 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 eb18bac89..e1a86727b 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'] : '<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;
+	}
+
 }
\ No newline at end of file
diff --git a/mod/ping.php b/mod/ping.php
index bc160ade7..ea5c308a3 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 "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\r\n<result><intro>$intro</intro><mail>$mail</mail><net>$network</net><home>$home</home></result>\r\n";
 
diff --git a/view/mail_conv.tpl b/view/mail_conv.tpl
new file mode 100644
index 000000000..3c26a9c54
--- /dev/null
+++ b/view/mail_conv.tpl
@@ -0,0 +1,15 @@
+<div class="mail-conv-outside-wrapper">
+	<div class="mail-conv-sender" >
+		<a href="$from_url" class="mail-conv-sender-url" ><img class="mail-conv-sender-photo" src="$from_photo" alt="$from_name" /></a>
+	</div>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >$from_name</div>
+		<div class="mail-conv-date">$date</div>
+		<div class="mail-conv-subject">$subject</div>
+		<div class="mail-conv-body">$body</div>
+	</div>
+</div>
+<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$id" ><a href="message/drop/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="mail-conv-delete-icon-$id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+
+<div class="mail-conv-outside-wrapper-end"></div>
+<hr class="mail-conv-break" />
diff --git a/view/mail_head.tpl b/view/mail_head.tpl
new file mode 100644
index 000000000..dd53d621a
--- /dev/null
+++ b/view/mail_head.tpl
@@ -0,0 +1,9 @@
+<h3>$messages</h3>
+
+<div class="message-links">
+<ul>
+<li><a href="message" class="message-link-inbox">$inbox</a></li>
+<li><a href="message/sent" class="message-link-outbox">$outbox</li>
+<li><a href="message/new" class="message-link-new">$new</li>
+<ul>
+</div>
diff --git a/view/mail_list.tpl b/view/mail_list.tpl
index d5a79ef35..ee64f15e0 100644
--- a/view/mail_list.tpl
+++ b/view/mail_list.tpl
@@ -1,9 +1,13 @@
 <div class="mail-list-outside-wrapper">
 	<div class="mail-list-sender" >
 		<a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="$from_photo" alt="$from_name" /></a>
+	</div>
+	<div class="mail-list-detail">
 		<div class="mail-list-sender-name" >$from_name</div>
+		<div class="mail-list-date">$date</div>
+		<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
 	</div>
-	<div class="mail-list-date">$date</div>
-	<div class="mail-list-subject"><a href="message/$id" class="mail-list-link">$subject</a></div>
 </div>
+<div class="mail-list-delete-wrapper" id="mail-list-delete-wrapper-$id" ><a href="message/dropconv/$id" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" id="mail-list-delete-icon-$id" class="mail-list-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-list-delete-end"></div>
+
 <div class="mail-list-outside-wrapper-end"></div>
diff --git a/view/prv_message.tpl b/view/prv_message.tpl
index 64c36b998..cf6ff50ee 100644
--- a/view/prv_message.tpl
+++ b/view/prv_message.tpl
@@ -4,11 +4,13 @@
 <div id="prvmail-wrapper" >
 <form id="prvmail-form" action="message" method="post" >
 
+$parent
+
 <div id="prvmail-to-label">$to</div>
 $select
 
 <div id="prvmail-subject-label">$subject</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" />
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="$subjtxt" $readonly />
 
 <div id="prvmail-message-label">$yourmessage</div>
 <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" ></textarea>
diff --git a/view/style.css b/view/style.css
index ba5102fd3..6d634b776 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