diff --git a/docs/upgrades/upgrade_3.8.0-3.9.0.sql b/docs/upgrades/upgrade_3.8.0-3.9.0.sql
index 4c1f862b7..c4185bcdc 100644
--- a/docs/upgrades/upgrade_3.8.0-3.9.0.sql
+++ b/docs/upgrades/upgrade_3.8.0-3.9.0.sql
@@ -81,11 +81,14 @@ INSERT INTO international VALUES (13,'FAQ','English','Turn [top] link on?');
INSERT INTO international VALUES (14,'FAQ','English','Q');
INSERT INTO international VALUES (15,'FAQ','English','A');
INSERT INTO international VALUES (16,'FAQ','English','[top]');
-
-
-
-
-
+INSERT INTO international VALUES (509,'WebGUI','English','Discussion Layout');
+INSERT INTO international VALUES (510,'WebGUI','English','Flat');
+INSERT INTO international VALUES (511,'WebGUI','English','Threaded');
+INSERT INTO userProfileField VALUES ('discussionLayout','WebGUI::International::get(509)',1,0,'select','{\r\n threaded=>WebGUI::International::get(511),\r\n flat=>WebGUI::International::get(510)\r\n}','[threaded]',5,4,0);
+INSERT INTO international VALUES (512,'WebGUI','English','Next Thread');
+INSERT INTO international VALUES (513,'WebGUI','English','Previous Thread');
+delete from international where internationalId=10 and namespace='MessageBoard';
+delete from international where internationalId=14 and namespace='MessageBoard';
diff --git a/lib/WebGUI/Discussion.pm b/lib/WebGUI/Discussion.pm
index 18b8a5dff..e4777ed59 100644
--- a/lib/WebGUI/Discussion.pm
+++ b/lib/WebGUI/Discussion.pm
@@ -219,13 +219,12 @@ sub purge {
#-------------------------------------------------------------------
sub showMessage {
- my (@data, $html, %message, $defaultMid, $sql);
+ my (@data, $html, %message, $defaultMid, $sqlAdd);
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}";
+ $sqlAdd = " and subId=$session{form}{sid}";
}
- ($defaultMid) = WebGUI::SQL->quickArray($sql);
+ ($defaultMid) = WebGUI::SQL->quickArray("select min(messageId) from discussion where wobjectId=$session{form}{wid}".$sqlAdd);
$session{form}{mid} = $defaultMid if ($session{form}{mid} eq "");
%message = getMessage($session{form}{mid});
if ($message{messageId}) {
@@ -237,6 +236,18 @@ sub showMessage {
$html .= '';
$html .= '| ';
$html .= $message{message}.' ';
$html .= ' |
';
@@ -248,7 +259,7 @@ sub showMessage {
#-------------------------------------------------------------------
sub showReplyTree {
- my (@data, $html, %message);
+ my (@data, $html, %message, @data);
tie %message, 'Tie::CPHash';
%message = getMessage($session{form}{mid});
if ($message{messageId}) {
@@ -256,6 +267,17 @@ sub showReplyTree {
$html .= '|
';
+ @data = WebGUI::SQL->quickArray("select messageId,subject,username,dateOfPost,userId from discussion where messageId=$message{rid}");
+ $data[1] = WebGUI::HTML::filter($data[1],'all');
+ $html .= ''.substr($data[1],0,30).''.$data[2].
+ ' | '.
+ epochToHuman($data[3],"%z %Z").' | ';
$html .= traverseReplyTree($message{rid},0);
$html .= "";
}
@@ -264,7 +286,7 @@ sub showReplyTree {
#-------------------------------------------------------------------
sub showThreads {
- my ($sth, @data, $html, $sql);
+ my ($sth, %data, $html, $sql);
$html .= '';
$html .= '
@@ -275,19 +297,19 @@ sub showThreads {
}
$sql .= " and pid=0 order by messageId desc";
$sth = WebGUI::SQL->read($sql);
- while (@data = $sth->array) {
- $data[1] = WebGUI::HTML::filter($data[1],'all');
+ while (%data = $sth->hash) {
+ $data{subject} = WebGUI::HTML::filter($data{subject},'all');
$html .= ''.substr($data[1],0,30).
+ $data{messageId}.'&wid='.$session{form}{wid}.'&sid='.$session{form}{sid}).'">'.substr($data{subject},0,30).
'| '.$data[2].
- ' | '.epochToHuman($data[3],"%z %Z").
+ WebGUI::URL::page('op=viewProfile&uid='.$data{userId}).'">'.$data{username}.
+ ' | '.epochToHuman($data{dateOfPost},"%z %Z").
' |
';
- $html .= WebGUI::Discussion::traverseReplyTree($data[0],1);
+ $html .= WebGUI::Discussion::traverseReplyTree($data{messageId},1);
}
$html .= '
';
return $html;
diff --git a/lib/WebGUI/Wobject/MessageBoard.pm b/lib/WebGUI/Wobject/MessageBoard.pm
index efd948147..79e84b8c3 100644
--- a/lib/WebGUI/Wobject/MessageBoard.pm
+++ b/lib/WebGUI/Wobject/MessageBoard.pm
@@ -207,64 +207,20 @@ sub www_postReplySave {
#-------------------------------------------------------------------
sub www_showMessage {
- my (@data, $html, %message);
- tie %message, 'Tie::CPHash';
- %message = WebGUI::Discussion::getMessage($session{form}{mid});
- if ($message{messageId}) {
- $html .= ''.$message{subject}.'
';
- $html .= '';
- $html .= '
| ';
- $html .= $message{message};
- $html .= ' |
';
- $html .= '';
- $html .= '|
';
- @data = WebGUI::SQL->quickArray("select messageId,subject,username,dateOfPost,userId from discussion where messageId=$message{rid}");
- $data[1] = WebGUI::HTML::filter($data[1],'all');
- $html .= ''.substr($data[1],0,30).''.$data[2].
- ' | '.
- epochToHuman($data[3],"%z %Z").' | ';
- $html .= WebGUI::Discussion::traverseReplyTree($message{rid},1);
- $html .= "
";
- } else {
- $html = WebGUI::International::get(402);
+ my ($output, $submenu);
+ $submenu = ''.WebGUI::International::get(13,$namespace).'
';
+ if (_canEditMessage($_[0],$session{form}{mid})) {
+ $submenu .= ''.WebGUI::International::get(12,$namespace).'
';
+ $submenu .= ''.WebGUI::International::get(22,$namespace).'
';
}
- return $html;
+ $submenu .= ''.WebGUI::International::get(11,$namespace).'
';
+ $output = WebGUI::Discussion::showMessage($submenu);
+ $output .= WebGUI::Discussion::showReplyTree();
+ return $output;
}
#-------------------------------------------------------------------