quickfix for private messages - needs a lot more work

1 files changed, 26 insertions, 24 deletions

diff --git a/mod/message.php b/mod/message.php
index 9cf4b6987..9f62f6b61 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -25,11 +25,7 @@ function message_content(&$a) {
 		$cipher = 'aes256';
 
 
-	$tpl = get_markup_template('mail_head.tpl');
-	$header = replace_macros($tpl, array(
-		'$messages' => t('Messages'),
-		'$tab_content' => $tab_content
-	));
+
 
 	if((argc() == 3) && (argv(1) === 'dropconv')) {
 		if(! intval(argv(2)))
@@ -42,9 +38,6 @@ function message_content(&$a) {
 	}
 	if(argc() == 1) {
 
-		// list messages
-
-		$o .= $header;
 
 		// private_messages_list() can do other more complicated stuff, for now keep it simple
 
@@ -55,24 +48,33 @@ function message_content(&$a) {
 			return $o;
 		}
 
-		$tpl = get_markup_template('mail_list.tpl');
+		$messages = array();
+
 		foreach($r as $rr) {
-			
-			$o .= replace_macros($tpl, array(
-				'$id'         => $rr['id'],
-				'$from_name'  => $rr['from']['xchan_name'],
-				'$from_url'   => chanlink_hash($rr['from_xchan']),
-				'$from_photo' => $rr['from']['xchan_photo_s'],
-				'$to_name'    => $rr['to']['xchan_name'],
-				'$to_url'     => chanlink_hash($rr['to_xchan']),
-				'$to_photo'   => $rr['to']['xchan_photo_s'],
-				'$subject'    => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
-				'$delete'     => t('Delete conversation'),
-				'$body'       => smilies(bbcode($rr['body'])),
-				'$date'       => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], t('D, d M Y - g:i A')),
-				'$seen'       => $rr['seen']
-			));
+			$messages[] = array(
+				'id'         => $rr['id'],
+				'from_name'  => $rr['from']['xchan_name'],
+				'from_url'   => chanlink_hash($rr['from_xchan']),
+				'from_photo' => $rr['from']['xchan_photo_s'],
+				'to_name'    => $rr['to']['xchan_name'],
+				'to_url'     => chanlink_hash($rr['to_xchan']),
+				'to_photo'   => $rr['to']['xchan_photo_s'],
+				'subject'    => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
+				'delete'     => t('Delete conversation'),
+				'body'       => smilies(bbcode($rr['body'])),
+				'date'       => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], t('D, d M Y - g:i A')),
+				'seen'       => $rr['seen']
+			);
 		}
+
+
+		$tpl = get_markup_template('mail_head.tpl');
+		$o = replace_macros($tpl, array(
+			'$header' => t('Messages'),
+			'$messages' => $messages
+		));
+
+
 		$o .= alt_pager($a,count($r));	
 		return $o;
 	}