From d967173b4d43b97b8ec766e920d250153f62de80 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 28 May 2002 02:39:01 +0000
Subject: [PATCH] Consolodating some discussion functionality.

---
 lib/WebGUI/Discussion.pm             | 39 +++++++++-------
 lib/WebGUI/Wobject/Article.pm        | 67 ++++++----------------------
 lib/WebGUI/Wobject/UserSubmission.pm | 43 +++++-------------
 3 files changed, 49 insertions(+), 100 deletions(-)

diff --git a/lib/WebGUI/Discussion.pm b/lib/WebGUI/Discussion.pm
index 1d8fc3962..18b8a5dff 100644
--- a/lib/WebGUI/Discussion.pm
+++ b/lib/WebGUI/Discussion.pm
@@ -219,22 +219,31 @@ sub purge {
 
 #-------------------------------------------------------------------
 sub showMessage {
-	my ($html, %message);
-	tie %message, 'Tie::CPHash';
-	%message = getMessage($session{form}{mid});
-	if ($message{messageId}) {
-        	$html = '<table width="100%" cellpadding=3 cellspacing=1 border=0><tr><td class="tableHeader">';
-        	$html .= '<b>'.WebGUI::International::get(237).'</b>'.$message{subject}.'<br>';
-        	$html .= '<b>'.WebGUI::International::get(238).'</b> <a href="'.WebGUI::URL::page('op=viewProfile&uid='.$message{userId}).'">'.$message{username}.'</a><br>';
-        	$html .= "<b>".WebGUI::International::get(239)."</b> ".epochToHuman($message{dateOfPost},"%z %Z")."<br>";
-        	$html .= "<b>".WebGUI::International::get(240)."</b> ".$message{wobjectId}."-".$message{rid}."-".$message{pid}."-".$message{messageId}."<br>";
-        	$html .= '</td></tr><tr><td class="tableData">';
-        	$html .= $message{message};
-        	$html .= '</td></tr></table>';
-	} else {
-		$html = WebGUI::International::get(402);
+        my (@data, $html, %message, $defaultMid, $sql);
+        tie %message, 'Tie::CPHash';
+	$sql = "select min(messageId) from discussion where wobjectId=$session{form}{wid}";
+	if ($session{form}{sid}) {
+		$sql .= " and subId=$session{form}{sid}";
 	}
-	return $html;
+        ($defaultMid) = WebGUI::SQL->quickArray($sql);
+        $session{form}{mid} = $defaultMid if ($session{form}{mid} eq "");
+        %message = getMessage($session{form}{mid});
+        if ($message{messageId}) {
+                $html .= '<h1>'.$message{subject}.'</h1>';
+                $html .= '<table width="100%" cellpadding=3 cellspacing=1 border=0><tr><td class="tableHeader">';
+                $html .= '<b>'.WebGUI::International::get(238).'</b> 
+			<a href="'.WebGUI::URL::page('op=viewProfile&uid='.$message{userId}).'">'.$message{username}.'</a><br>';
+                $html .= "<b>".WebGUI::International::get(239)."</b> ".epochToHuman($message{dateOfPost},"%z %Z")."<br>";
+                $html .= '</td>';
+                $html .= '<td rowspan=2 valign="top" class="tableMenu" nowrap>';
+		$html .= $_[0];
+                $html .= '</tr><tr><td class="tableData">';
+                $html .= $message{message}.'<p>';
+                $html .= '</td></tr></table>';
+        } else {
+                $html = WebGUI::International::get(402);
+        }
+        return $html;
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Wobject/Article.pm b/lib/WebGUI/Wobject/Article.pm
index 299b5a47b..787d3c63a 100644
--- a/lib/WebGUI/Wobject/Article.pm
+++ b/lib/WebGUI/Wobject/Article.pm
@@ -46,30 +46,6 @@ sub _canEditMessage {
         }
 }
 
-#-------------------------------------------------------------------
-sub _showReplies {
-        my ($sth, @data, $html);
-        $html .= '<table border=0 cellpadding=2 cellspacing=1 width="100%">';
-        $html .= '<tr><td class="tableHeader">'.WebGUI::International::get(229).'</td><td class="tableHeader">'.WebGUI::International::get(22,$namespace).'</td><td class="tableHeader">'.WebGUI::International::get(23,$namespace).'</td></tr>';
-        $sth = WebGUI::SQL->read("select messageId,subject,username,dateOfPost,userId from discussion where wobjectId=$session{form}{wid} and pid=0 order by messageId desc");
-        while (@data = $sth->array) {
-		$data[1] = WebGUI::HTML::filter($data[1],'all');
-                $html .= '<tr';
-		if ($data[0] == $session{form}{mid}) {
-			$html .= ' class="highlight"';
-		}
-		$html .= '><td class="tableData"><a href="'.WebGUI::URL::page('func=showMessage&mid='.
-                                $data[0].'&wid='.$session{form}{wid}).'">'.substr($data[1],0,30).
-                                '</a></td><td class="tableData"><a href="'.
-                                WebGUI::URL::page('op=viewProfile&uid='.$data[4]).'">'.$data[2].
-                                '</a></td><td class="tableData">'.epochToHuman($data[3],"%z %Z").
-                                '</td></tr>';
-                $html .= WebGUI::Discussion::traverseReplyTree($data[0],1);
-        }
-        $html .= '</table>';
-        return $html;
-}
-
 #-------------------------------------------------------------------
 sub duplicate {
 	my ($file, $w);
@@ -294,38 +270,21 @@ sub www_postReplySave {
 
 #-------------------------------------------------------------------
 sub www_showMessage {
-        my (@data, $html, %message, $defaultMid);
-        tie %message, 'Tie::CPHash';
-	($defaultMid) = WebGUI::SQL->quickArray("select min(messageId) from discussion where wobjectId=$session{form}{wid}");
+        my ($submenu, $output, $defaultMid);
+        ($defaultMid) = WebGUI::SQL->quickArray("select min(messageId) from discussion where wobjectId=$session{form}{wid}");
 	$session{form}{mid} = $defaultMid if ($session{form}{mid} eq "");
-        %message = WebGUI::Discussion::getMessage($session{form}{mid});
-        if ($message{messageId}) {
-                $html .= '<h1>'.$message{subject}.'</h1>';
-                $html .= '<table width="100%" cellpadding=3 cellspacing=1 border=0><tr><td class="tableHeader">';
-                $html .= '<b>'.WebGUI::International::get(22,$namespace).'</b> <a href="'.
-                        WebGUI::URL::page('op=viewProfile&uid='.$message{userId}).'">'.$message{username}.'</a><br>';
-                $html .= "<b>".WebGUI::International::get(23,$namespace)."</b> ".
-                        epochToHuman($message{dateOfPost},"%z %Z")."<br>";
-                $html .= '</td>';
-                $html .= '<td rowspan=2 valign="top" class="tableMenu" nowrap>';
-                $html .= '<a href="'.WebGUI::URL::page('func=postReply&mid='.$session{form}{mid}.
-                        '&wid='.$session{form}{wid})
-                        .'">'.WebGUI::International::get(24,$namespace).'</a><br>';
-		if (_canEditMessage($_[0],$session{form}{mid})) {
-                        $html .= '<a href="'.WebGUI::URL::page('func=editMessage&mid='.$session{form}{mid}.
-                                '&wid='.$session{form}{wid}).'">'.WebGUI::International::get(25,$namespace).'</a><br>';
-                        $html .= '<a href="'.WebGUI::URL::page('func=deleteMessage&mid='.$session{form}{mid}.
-                                '&wid='.$session{form}{wid}).'">'.WebGUI::International::get(26,$namespace).'</a><br>';
-                }
-                $html .= '<a href="'.WebGUI::URL::page().'">'.WebGUI::International::get(27,$namespace).'</a><br>';
-                $html .= '</tr><tr><td class="tableData">';
-                $html .= $message{message};
-                $html .= '</td></tr></table>';
-		$html .= _showReplies();
-        } else {
-                $html = WebGUI::International::get(402);
+        $submenu = '<a href="'.WebGUI::URL::page('func=postReply&mid='.$session{form}{mid}.'&wid='.$session{form}{wid})
+        	.'">'.WebGUI::International::get(24,$namespace).'</a><br>';
+	if (_canEditMessage($_[0],$session{form}{mid})) {
+        	$submenu .= '<a href="'.WebGUI::URL::page('func=editMessage&mid='.$session{form}{mid}.
+                	'&wid='.$session{form}{wid}).'">'.WebGUI::International::get(25,$namespace).'</a><br>';
+                $submenu .= '<a href="'.WebGUI::URL::page('func=deleteMessage&mid='.$session{form}{mid}.
+			'&wid='.$session{form}{wid}).'">'.WebGUI::International::get(26,$namespace).'</a><br>';
         }
-        return $html;
+        $submenu .= '<a href="'.WebGUI::URL::page().'">'.WebGUI::International::get(27,$namespace).'</a><br>';
+	$output = WebGUI::Discussion::showMessage($submenu);
+	$output .= WebGUI::Discussion::showThreads();
+        return $output;
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Wobject/UserSubmission.pm b/lib/WebGUI/Wobject/UserSubmission.pm
index 268e811e9..8bf83e4c9 100644
--- a/lib/WebGUI/Wobject/UserSubmission.pm
+++ b/lib/WebGUI/Wobject/UserSubmission.pm
@@ -560,40 +560,21 @@ sub www_postReplySave {
 
 #-------------------------------------------------------------------
 sub www_showMessage {
-        my (@data, $html, %message, $defaultMid);
-        tie %message, 'Tie::CPHash';
-        ($defaultMid) = WebGUI::SQL->quickArray("select min(messageId) from discussion where wobjectId=$session{form}{wid} and subId=$session{form}{sid}");
-        $session{form}{mid} = $defaultMid if ($session{form}{mid} eq "");
-        %message = WebGUI::Discussion::getMessage($session{form}{mid});
-        if ($message{messageId}) {
-                $html .= '<h1>'.$message{subject}.'</h1>';
-                $html .= '<table width="100%" cellpadding=3 cellspacing=1 border=0><tr><td class="tableHeader">';
-                $html .= '<b>'.WebGUI::International::get(40,$namespace).'</b> <a href="'.
-                        WebGUI::URL::page('op=viewProfile&uid='.$message{userId}).'">'.$message{username}.'</a><br>';
-                $html .= "<b>".WebGUI::International::get(41,$namespace)."</b> ".
-                        epochToHuman($message{dateOfPost},"%z %Z")."<br>";
-                $html .= '</td>';
-                $html .= '<td rowspan=2 valign="top" class="tableMenu" nowrap>';
-                $html .= '<a href="'.WebGUI::URL::page('func=postReply&mid='.$session{form}{mid}.
-                        '&wid='.$session{form}{wid}.'&sid='.$session{form}{sid})
+        my ($submenu, $output);
+        $submenu .= '<a href="'.WebGUI::URL::page('func=postReply&mid='.$session{form}{mid}.'&wid='.$session{form}{wid}.'&sid='.$session{form}{sid})
                         .'">'.WebGUI::International::get(39,$namespace).'</a><br>';
-                if (_canEditMessage($_[0],$session{form}{mid})) {
-                        $html .= '<a href="'.WebGUI::URL::page('func=editMessage&mid='.$session{form}{mid}.
-                                '&wid='.$session{form}{wid}.'&sid='.$session{form}{sid}).'">'.WebGUI::International::get(42,$namespace).'</a><br>';
-                        $html .= '<a href="'.WebGUI::URL::page('func=deleteMessage&mid='.$session{form}{mid}.
+        if (_canEditMessage($_[0],$session{form}{mid})) {
+        	$submenu .= '<a href="'.WebGUI::URL::page('func=editMessage&mid='.$session{form}{mid}.
+                	'&wid='.$session{form}{wid}.'&sid='.$session{form}{sid}).'">'.WebGUI::International::get(42,$namespace).'</a><br>';
+                $submenu .= '<a href="'.WebGUI::URL::page('func=deleteMessage&mid='.$session{form}{mid}.
                                 '&wid='.$session{form}{wid}.'&sid='.$session{form}{sid}).'">'.WebGUI::International::get(43,$namespace).'</a><br>';
-                }
-                $html .= '<a href="'.WebGUI::URL::page('func=viewSubmission&wid='.$session{form}{wid}.
-			'&sid='.$session{form}{sid}).'">'.WebGUI::International::get(45,$namespace).'</a><br>';
-                $html .= '<a href="'.WebGUI::URL::page().'">'.WebGUI::International::get(28,$namespace).'</a><br>';
-                $html .= '</tr><tr><td class="tableData">';
-                $html .= $message{message}.'<p>';
-                $html .= '</td></tr></table>';
-                $html .= WebGUI::Discussion::showThreads();
-        } else {
-                $html = WebGUI::International::get(402);
         }
-        return $html;
+        $submenu .= '<a href="'.WebGUI::URL::page('func=viewSubmission&wid='.$session{form}{wid}.
+		'&sid='.$session{form}{sid}).'">'.WebGUI::International::get(45,$namespace).'</a><br>';
+        $submenu .= '<a href="'.WebGUI::URL::page().'">'.WebGUI::International::get(28,$namespace).'</a><br>';
+	$output = WebGUI::Discussion::showMessage($submenu);
+        $output .= WebGUI::Discussion::showThreads();
+        return $output;
 }
 
 #-------------------------------------------------------------------