diff --git a/docs/upgrades/upgrade_3.7.0-3.8.0.sql b/docs/upgrades/upgrade_3.7.0-3.8.0.sql
index 0154b5d76..3909175e8 100644
--- a/docs/upgrades/upgrade_3.7.0-3.8.0.sql
+++ b/docs/upgrades/upgrade_3.7.0-3.8.0.sql
@@ -63,7 +63,10 @@ alter table DownloadManager_file change widgetId wobjectId int not null;
delete from International where helpId=13 and namespace='DownloadManager';
INSERT INTO international VALUES (22,'DownloadManager','English','Proceed to add download?');
-
+insert into wobject (wobjectId, pageId, title, displayTitle, processMacros, description, dateAdded, addedBy, namespace, lastEdited, editedBy, templatePosition, sequenceNumber, startDate, endDate) select widgetId, pageId, title, displayTitle, processMacros, description, dateAdded, addedBy, namespace, lastEdited, editedBy, templatePosition, sequenceNumber, dateAdded, 1336444487 from widget where namespace='MessageBoard';
+delete from widget where namespace='MessageBoard';
+alter table MessageBoard change widgetId wobjectId int not null;
+alter table discussion change widgetId wobjectId int not null;
diff --git a/lib/WebGUI/Discussion.pm b/lib/WebGUI/Discussion.pm
index f72048c5b..df33431ec 100644
--- a/lib/WebGUI/Discussion.pm
+++ b/lib/WebGUI/Discussion.pm
@@ -51,7 +51,7 @@ sub duplicate {
my ($sth, %data, $newMessageId, $oldSubId, $newSubId);
$oldSubId = $_[2] || 0;
$newSubId = $_[3] || 0;
- $sth = WebGUI::SQL->read("select * from discussion where widgetId=$_[0] and pid=0 and subId=$oldSubId order by messageId");
+ $sth = WebGUI::SQL->read("select * from discussion where wobjectId=$_[0] and pid=0 and subId=$oldSubId order by messageId");
while (%data = $sth->hash) {
$newMessageId = getNextId("messageId");
WebGUI::SQL->write("insert into discussion values ($newMessageId, $newMessageId, $_[1], 0, $data{userId}, ".quote($data{username}).", ".quote($data{subject}).", ".quote($data{message}).", $data{dateOfPost}, $newSubId)");
@@ -213,8 +213,8 @@ sub postReplySave {
}
#-------------------------------------------------------------------
-sub purgeWidget {
- WebGUI::SQL->write("delete from discussion where widgetId=$_[0]",$_[1]);
+sub purge {
+ WebGUI::SQL->write("delete from discussion where wobjectId=$_[0]");
}
#-------------------------------------------------------------------
@@ -226,8 +226,8 @@ sub showMessage {
$html = '|
| ';
$html .= $message{message};
$html .= ' |
';
@@ -266,7 +266,7 @@ sub traverseReplyTree {
if ($session{form}{mid} eq $data[0]) {
$html .= ' class="highlight"';
}
- $html .= '>'.$depth.''.substr($data[1],0,30).' | '.$data[2].' | '.epochToHuman($data[3],"%M/%D %H:%n%p").' | ';
+ $html .= '>'.$depth.''.substr($data[1],0,30).' | '.$data[2].' | '.epochToHuman($data[3],"%z %Z").' | ';
$html .= traverseReplyTree($data[0],$_[1]+1);
}
$sth->finish;
diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm
index 967b89f1a..236fa531d 100644
--- a/lib/WebGUI/HTMLForm.pm
+++ b/lib/WebGUI/HTMLForm.pm
@@ -359,7 +359,9 @@ sub group {
$name = shift;
$label = shift;
$value = shift;
- $value = [7] if ($value eq ""); #doing long form otherwise arrayRef didn't work
+ if ($$value[0] eq "") { #doing long form otherwise arrayRef didn't work
+ $value = [7];
+ }
$size = shift || 1;
$multiple = shift;
$multiple = ' multiple="1" ' if ($multiple);
diff --git a/lib/WebGUI/Widget/MessageBoard.pm b/lib/WebGUI/Widget/MessageBoard.pm
deleted file mode 100644
index 089036dd3..000000000
--- a/lib/WebGUI/Widget/MessageBoard.pm
+++ /dev/null
@@ -1,410 +0,0 @@
-package WebGUI::Widget::MessageBoard;
-
-our $namespace = "MessageBoard";
-
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2002 Plain Black Software.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com info@plainblack.com
-#-------------------------------------------------------------------
-
-use strict;
-use Tie::CPHash;
-use WebGUI::DateTime;
-use WebGUI::Discussion;
-use WebGUI::HTML;
-use WebGUI::International;
-use WebGUI::Macro;
-use WebGUI::Privilege;
-use WebGUI::Session;
-use WebGUI::Shortcut;
-use WebGUI::SQL;
-use WebGUI::URL;
-use WebGUI::Utility;
-use WebGUI::Widget;
-
-#-------------------------------------------------------------------
-sub duplicate {
- my (%data, $newWidgetId, $pageId);
- tie %data, 'Tie::CPHash';
- %data = getProperties($namespace,$_[0]);
- $pageId = $_[1] || $data{pageId};
- $newWidgetId = create($pageId,$namespace,$data{title},$data{displayTitle},
- $data{description},$data{processMacros},$data{templatePosition});
- WebGUI::SQL->write("insert into MessageBoard values ($newWidgetId, $data{groupToPost}, '$data{messagesPerPage}', '$data{editTimeout}', $data{groupToModerate})");
- WebGUI::Discussion::duplicate($_[0],$newWidgetId);
-}
-
-#-------------------------------------------------------------------
-sub purge {
- purgeWidget($_[0],$_[1],$namespace);
- WebGUI::Discussion::purgeWidget($_[0],$_[1]);
-}
-
-#-------------------------------------------------------------------
-sub widgetName {
- return WebGUI::International::get(2,$namespace);
-}
-
-#-------------------------------------------------------------------
-sub www_add {
- my ($output, %hash, @array);
- tie %hash, "Tie::IxHash";
- if (WebGUI::Privilege::canEditPage()) {
- $output = helpLink(1,$namespace);
- $output .= ''.WebGUI::International::get(1,$namespace).'
';
- $output .= formHeader();
- $output .= WebGUI::Form::hidden("widget",$namespace);
- $output .= WebGUI::Form::hidden("func","addSave");
- $output .= '';
- $output .= tableFormRow(WebGUI::International::get(99),
- WebGUI::Form::text("title",20,128,'Message Board'));
- $output .= tableFormRow(WebGUI::International::get(174),WebGUI::Form::checkbox("displayTitle",1,1));
- $output .= tableFormRow(WebGUI::International::get(175),WebGUI::Form::checkbox("processMacros",1));
- %hash = WebGUI::Widget::getPositions();
- $output .= tableFormRow(WebGUI::International::get(363),
- WebGUI::Form::selectList("templatePosition",\%hash));
- $output .= tableFormRow(WebGUI::International::get(85),
- WebGUI::Form::textArea("description",'',50,5,1));
- $output .= tableFormRow(WebGUI::International::get(3,$namespace),
- WebGUI::Form::groupList("groupToPost",2));
- $output .= tableFormRow(WebGUI::International::get(21,$namespace),
- WebGUI::Form::groupList("groupToModerate",4));
- $output .= tableFormRow(WebGUI::International::get(4,$namespace),
- WebGUI::Form::text("messagesPerPage",20,2,30));
- $output .= tableFormRow(WebGUI::International::get(5,$namespace),
- WebGUI::Form::text("editTimeout",20,3,1));
- $output .= formSave();
- $output .= '
';
- return $output;
- } else {
- return WebGUI::Privilege::insufficient();
- }
- return $output;
-}
-
-#-------------------------------------------------------------------
-sub www_addSave {
- my ($widgetId);
- if (WebGUI::Privilege::canEditPage()) {
- $widgetId = create($session{page}{pageId},$session{form}{widget},$session{form}{title},$session{form}{displayTitle},$session{form}{description},$session{form}{processMacros},$session{form}{templatePosition});
- WebGUI::SQL->write("insert into MessageBoard values ($widgetId, $session{form}{groupToPost}, '$session{form}{messagesPerPage}', '$session{form}{editTimeout}', $session{form}{groupToModerate})");
- return "";
- } else {
- return WebGUI::Privilege::insufficient();
- }
-}
-
-#-------------------------------------------------------------------
-sub www_copy {
- if (WebGUI::Privilege::canEditPage()) {
- duplicate($session{form}{wid});
- return "";
- } else {
- return WebGUI::Privilege::insufficient();
- }
-}
-
-#-------------------------------------------------------------------
-sub www_deleteMessage {
- my (%board, %message);
- tie %board, 'Tie::CPHash';
- tie %message, 'Tie::CPHash';
- %board = getProperties($namespace,$session{form}{wid});
- %message = WebGUI::Discussion::getMessage($session{form}{mid});
- if ((time()-$message{dateOfPost}) < 3600*$board{editTimeout} && $message{userId} eq $session{user}{userId} ||
- WebGUI::Privilege::isInGroup($board{groupToModerate})) {
- return WebGUI::Discussion::deleteMessage();
- } else {
- return WebGUI::Privilege::insufficient();
- }
-}
-
-#-------------------------------------------------------------------
-sub www_deleteMessageConfirm {
- my (%board,%message);
- tie %board, 'Tie::CPHash';
- tie %message, 'Tie::CPHash';
- %board = getProperties($namespace,$session{form}{wid});
- %message = WebGUI::Discussion::getMessage($session{form}{mid});
- if ((time()-$message{dateOfPost}) < 3600*$board{editTimeout} && $message{userId} eq $session{user}{userId} ||
- WebGUI::Privilege::isInGroup($board{groupToModerate})) {
- return WebGUI::Discussion::deleteMessageConfirm();
- } else {
- return WebGUI::Privilege::insufficient();
- }
-}
-
-#-------------------------------------------------------------------
-sub www_edit {
- my ($output, %board, %hash, @array);
- tie %hash, "Tie::IxHash";
- if (WebGUI::Privilege::canEditPage()) {
- tie %board, 'Tie::CPHash';
- %board = getProperties($namespace,$session{form}{wid});
- $output = helpLink(1,$namespace);
- $output .= ''.WebGUI::International::get(6,$namespace).'
';
- $output .= formHeader();
- $output .= WebGUI::Form::hidden("wid",$session{form}{wid});
- $output .= WebGUI::Form::hidden("func","editSave");
- $output .= '';
- $output .= tableFormRow(WebGUI::International::get(99),
- WebGUI::Form::text("title",20,128,$board{title}));
- $output .= tableFormRow(WebGUI::International::get(174),
- WebGUI::Form::checkbox("displayTitle","1",$board{displayTitle}));
- $output .= tableFormRow(WebGUI::International::get(175),
- WebGUI::Form::checkbox("processMacros","1",$board{processMacros}));
- %hash = WebGUI::Widget::getPositions();
- $array[0] = $board{templatePosition};
- $output .= tableFormRow(WebGUI::International::get(363),
- WebGUI::Form::selectList("templatePosition",\%hash,\@array));
- $output .= tableFormRow(WebGUI::International::get(85),
- WebGUI::Form::textArea("description",$board{description},50,5,1));
- $output .= tableFormRow(WebGUI::International::get(3,$namespace),
- WebGUI::Form::groupList("groupToPost",$board{groupToPost}));
- $output .= tableFormRow(WebGUI::International::get(21,$namespace),
- WebGUI::Form::groupList("groupToModerate",$board{groupToModerate}));
- $output .= tableFormRow(WebGUI::International::get(4,$namespace),
- WebGUI::Form::text("messagesPerPage",20,2,$board{messagesPerPage}));
- $output .= tableFormRow(WebGUI::International::get(5,$namespace),
- WebGUI::Form::text("editTimeout",20,2,$board{editTimeout}));
- $output .= formSave();
- $output .= '
';
- return $output;
- } else {
- return WebGUI::Privilege::insufficient();
- }
- return $output;
-}
-
-#-------------------------------------------------------------------
-sub www_editSave {
- if (WebGUI::Privilege::canEditPage()) {
- update();
- WebGUI::SQL->write("update MessageBoard set groupToPost=$session{form}{groupToPost}, messagesPerPage=$session{form}{messagesPerPage}, editTimeout=$session{form}{editTimeout}, groupToModerate=$session{form}{groupToModerate} where widgetId=$session{form}{wid}");
- return "";
- } else {
- return WebGUI::Privilege::insufficient();
- }
-}
-
-#-------------------------------------------------------------------
-sub www_editMessage {
- my (%board,%message);
- tie %board, 'Tie::CPHash';
- tie %message, 'Tie::CPHash';
- %board = getProperties($namespace,$session{form}{wid});
- %message = WebGUI::Discussion::getMessage($session{form}{mid});
- if ((time()-$message{dateOfPost}) < 3600*$board{editTimeout} && $message{userId} eq $session{user}{userId} ||
- WebGUI::Privilege::isInGroup($board{groupToModerate})) {
- return WebGUI::Discussion::editMessage();
- } else {
- return WebGUI::Privilege::insufficient();
- }
-}
-
-#-------------------------------------------------------------------
-sub www_editMessageSave {
- my (%board,%message);
- tie %board, 'Tie::CPHash';
- tie %message, 'Tie::CPHash';
- %board = getProperties($namespace,$session{form}{wid});
- %message = WebGUI::Discussion::getMessage($session{form}{mid});
- if ((time()-$message{dateOfPost}) < 3600*$board{editTimeout} && $message{userId} eq $session{user}{userId} ||
- WebGUI::Privilege::isInGroup($board{groupToModerate})) {
- WebGUI::Discussion::editMessageSave();
- return www_showMessage();
- } else {
- return WebGUI::Privilege::insufficient();
- }
-}
-
-#-------------------------------------------------------------------
-sub www_postNewMessage {
- my (%board);
- tie %board, 'Tie::CPHash';
- %board = getProperties($namespace,$session{form}{wid});
- if (WebGUI::Privilege::isInGroup($board{groupToPost},$session{user}{userId})) {
- return WebGUI::Discussion::postNewMessage();
- } else {
- return WebGUI::Privilege::insufficient();
- }
-}
-
-#-------------------------------------------------------------------
-sub www_postNewMessageSave {
- my (%board);
- tie %board, 'Tie::CPHash';
- %board = getProperties($namespace,$session{form}{wid});
- if (WebGUI::Privilege::isInGroup($board{groupToPost},$session{user}{userId})) {
- return WebGUI::Discussion::postNewMessageSave();
- } else {
- return WebGUI::Privilege::insufficient();
- }
-}
-
-#-------------------------------------------------------------------
-sub www_postReply {
- my (%board);
- tie %board, 'Tie::CPHash';
- %board = getProperties($namespace,$session{form}{wid});
- if (WebGUI::Privilege::isInGroup($board{groupToPost},$session{user}{userId})) {
- return WebGUI::Discussion::postReply();
- } else {
- return WebGUI::Privilege::insufficient();
- }
-}
-
-#-------------------------------------------------------------------
-sub www_postReplySave {
- my (%board);
- tie %board, 'Tie::CPHash';
- %board = getProperties($namespace,$session{form}{wid});
- if (WebGUI::Privilege::isInGroup($board{groupToPost},$session{user}{userId})) {
- WebGUI::Discussion::postReplySave();
- return www_showMessage();
- } else {
- return WebGUI::Privilege::insufficient();
- }
-}
-
-#-------------------------------------------------------------------
-sub www_showMessage {
- my (@data, $html, %board, %message);
- tie %message, 'Tie::CPHash';
- tie %board, 'Tie::CPHash';
- %message = WebGUI::Discussion::getMessage($session{form}{mid});
- %board = getProperties($namespace,$session{form}{wid});
- 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],"%M/%D %H:%n%p").' | ';
- $html .= WebGUI::Discussion::traverseReplyTree($message{rid},1);
- $html .= "
";
- } else {
- $html = WebGUI::International::get(402);
- }
- return $html;
-}
-
-#-------------------------------------------------------------------
-sub www_view {
- my ($sth, @data, $html, %board, $itemsPerPage, $i, $pn, $lastId, @last, $replies);
- tie %board, 'Tie::CPHash';
- %board = getProperties($namespace,$_[0]);
- $itemsPerPage = $board{messagesPerPage};
- if ($session{form}{pn} < 1) {
- $pn = 0;
- } else {
- $pn = $session{form}{pn};
- }
- if ($board{displayTitle}) {
- $html = ''.$board{title}.'
';
- }
- if ($board{description} ne "") {
- $html .= $board{description}.'';
- }
- if ($board{processMacros}) {
- $html = WebGUI::Macro::process($html);
- }
- $html .= '
';
- $html .= '';
- $html .= '|
';
- $sth = WebGUI::SQL->read("select messageId,subject,username,dateOfPost,userId from discussion where widgetId=$_[0] and pid=0 order by messageId desc");
- while (@data = $sth->array) {
- $data[1] = WebGUI::HTML::filter($data[1],'all');
- if ($i >= ($itemsPerPage*$pn) && $i < ($itemsPerPage*($pn+1))) {
- @last = WebGUI::SQL->quickArray("select messageId,dateOfPost,username,subject,userId from discussion where widgetId=$_[0] and rid=$data[0] order by dateOfPost desc");
- $last[3] = WebGUI::HTML::filter($last[3],'all');
- ($replies) = WebGUI::SQL->quickArray("select count(*) from discussion where rid=$data[0]");
- $replies -= 1;
- $html .= '| '.substr($data[1],0,30).
- ' | '.$data[2].
- ' | '.epochToHuman($data[3],"%M/%D %H:%n%p").
- ' | '.$replies.
- ' | '.
- substr($last[3],0,30).' @ '.epochToHuman($last[1],"%M/%D %H:%n%p").
- ' by '.$last[2].
- ' |
';
- }
- $i++;
- }
- $html .= '
';
- if ($i > $itemsPerPage) {
- $html .= '';
- }
- return $html;
-}
-
-1;
diff --git a/lib/WebGUI/Wobject/MessageBoard.pm b/lib/WebGUI/Wobject/MessageBoard.pm
new file mode 100644
index 000000000..efd948147
--- /dev/null
+++ b/lib/WebGUI/Wobject/MessageBoard.pm
@@ -0,0 +1,336 @@
+package WebGUI::Wobject::MessageBoard;
+
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2002 Plain Black Software.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#-------------------------------------------------------------------
+# http://www.plainblack.com info@plainblack.com
+#-------------------------------------------------------------------
+
+use strict;
+use Tie::CPHash;
+use WebGUI::DateTime;
+use WebGUI::Discussion;
+use WebGUI::HTML;
+use WebGUI::HTMLForm;
+use WebGUI::Icon;
+use WebGUI::International;
+use WebGUI::Privilege;
+use WebGUI::Session;
+use WebGUI::SQL;
+use WebGUI::URL;
+use WebGUI::Utility;
+use WebGUI::Wobject;
+
+our @ISA = qw(WebGUI::Wobject);
+our $namespace = "MessageBoard";
+our $name = WebGUI::International::get(2,$namespace);
+
+#-------------------------------------------------------------------
+sub _canEditMessage {
+ my (%message);
+ tie %message, 'Tie::CPHash';
+ %message = WebGUI::Discussion::getMessage($_[1]);
+ if (
+ (time()-$message{dateOfPost}) < 3600*$_[0]->get("editTimeout")
+ && $message{userId} eq $session{user}{userId}
+ || WebGUI::Privilege::isInGroup($_[0]->get("groupToModerate"))
+ ) {
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
+#-------------------------------------------------------------------
+sub duplicate {
+ my ($w);
+ $w = $_[0]->SUPER::duplicate($_[1]);
+ $w = WebGUI::Wobject::MessageBoard->new({wobjectId=>$w,namespace=>$namespace});
+ $w->set({
+ groupToPost=>$_[0]->get("groupToPost"),
+ messagesPerPage=>$_[0]->get("messagesPerPage"),
+ editTimeout=>$_[0]->get("editTimeout"),
+ groupToModerate=>$_[0]->get("groupToModerate")
+ });
+ WebGUI::Discussion::duplicate($_[0]->get("wobjectId"),$w->get("wobjectId"));
+}
+
+#-------------------------------------------------------------------
+sub new {
+ my ($self, $class, $property);
+ $class = shift;
+ $property = shift;
+ $self = WebGUI::Wobject->new($property);
+ bless $self, $class;
+}
+
+#-------------------------------------------------------------------
+sub purge {
+ WebGUI::Discussion::purge($_[0]->get("wobjectId"));
+ $_[0]->SUPER::purge();
+}
+
+#-------------------------------------------------------------------
+sub set {
+ $_[0]->SUPER::set($_[1],[qw(editTimeout groupToPost groupToModerate messagesPerPage)]);
+}
+
+#-------------------------------------------------------------------
+sub www_copy {
+ if (WebGUI::Privilege::canEditPage()) {
+ $_[0]->duplicate;
+ return "";
+ } else {
+ return WebGUI::Privilege::insufficient();
+ }
+}
+
+#-------------------------------------------------------------------
+sub www_deleteMessage {
+ if (_canEditMessage($_[0],$session{form}{mid})) {
+ return WebGUI::Discussion::deleteMessage();
+ } else {
+ return WebGUI::Privilege::insufficient();
+ }
+}
+
+#-------------------------------------------------------------------
+sub www_deleteMessageConfirm {
+ if (_canEditMessage($_[0],$session{form}{mid})) {
+ return WebGUI::Discussion::deleteMessageConfirm();
+ } else {
+ return WebGUI::Privilege::insufficient();
+ }
+}
+
+#-------------------------------------------------------------------
+sub www_edit {
+ my ($output, $f, $groupToModerate, $messagesPerPage, $editTimeout);
+ if (WebGUI::Privilege::canEditPage()) {
+ if ($_[0]->get("wobjectId") eq "new") {
+ $editTimeout = 1;
+ } else {
+ $editTimeout = $_[0]->get("editTimeout");
+ }
+ $groupToModerate = $_[0]->get("groupToModerate") || 4;
+ $messagesPerPage = $_[0]->get("messagesPerPage") || 50;
+ $output = helpIcon(1,$namespace);
+ $output .= ''.WebGUI::International::get(6,$namespace).'
';
+ $f = WebGUI::HTMLForm->new;
+ $f->group("groupToPost",WebGUI::International::get(3,$namespace),[$_[0]->get("groupToPost")]);
+ $f->group("groupToModerate",WebGUI::International::get(21,$namespace),[$groupToModerate]);
+ $f->integer("messagesPerPage",WebGUI::International::get(4,$namespace),$messagesPerPage);
+ $f->integer("editTimeout",WebGUI::International::get(5,$namespace),$editTimeout);
+ $output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
+ return $output;
+ } else {
+ return WebGUI::Privilege::insufficient();
+ }
+ return $output;
+}
+
+#-------------------------------------------------------------------
+sub www_editSave {
+ if (WebGUI::Privilege::canEditPage()) {
+ $_[0]->SUPER::www_editSave();
+ $_[0]->set({
+ messagesPerPage=>$session{form}{messagesPerPage},
+ groupToPost=>$session{form}{groupToPost},
+ editTimeout=>$session{form}{editTimeout},
+ groupToModerate=>$session{form}{groupToModerate}
+ });
+ return "";
+ } else {
+ return WebGUI::Privilege::insufficient();
+ }
+}
+
+#-------------------------------------------------------------------
+sub www_editMessage {
+ if (_canEditMessage($_[0],$session{form}{mid})) {
+ return WebGUI::Discussion::editMessage();
+ } else {
+ return WebGUI::Privilege::insufficient();
+ }
+}
+
+#-------------------------------------------------------------------
+sub www_editMessageSave {
+ if (_canEditMessage($_[0],$session{form}{mid})) {
+ WebGUI::Discussion::editMessageSave();
+ return $_[0]->www_showMessage();
+ } else {
+ return WebGUI::Privilege::insufficient();
+ }
+}
+
+#-------------------------------------------------------------------
+sub www_postNewMessage {
+ if (WebGUI::Privilege::isInGroup($_[0]->get("groupToPost"),$session{user}{userId})) {
+ return WebGUI::Discussion::postNewMessage();
+ } else {
+ return WebGUI::Privilege::insufficient();
+ }
+}
+
+#-------------------------------------------------------------------
+sub www_postNewMessageSave {
+ if (WebGUI::Privilege::isInGroup($_[0]->get("groupToPost"),$session{user}{userId})) {
+ return WebGUI::Discussion::postNewMessageSave();
+ } else {
+ return WebGUI::Privilege::insufficient();
+ }
+}
+
+#-------------------------------------------------------------------
+sub www_postReply {
+ if (WebGUI::Privilege::isInGroup($_[0]->get("groupToPost"),$session{user}{userId})) {
+ return WebGUI::Discussion::postReply();
+ } else {
+ return WebGUI::Privilege::insufficient();
+ }
+}
+
+#-------------------------------------------------------------------
+sub www_postReplySave {
+ if (WebGUI::Privilege::isInGroup($_[0]->get("groupToPost"),$session{user}{userId})) {
+ WebGUI::Discussion::postReplySave();
+ return $_[0]->www_showMessage();
+ } else {
+ return WebGUI::Privilege::insufficient();
+ }
+}
+
+#-------------------------------------------------------------------
+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);
+ }
+ return $html;
+}
+
+#-------------------------------------------------------------------
+sub www_view {
+ my ($sth, @data, $html, $i, $pn, $lastId, @last, $replies);
+ if ($session{form}{pn} < 1) {
+ $pn = 0;
+ } else {
+ $pn = $session{form}{pn};
+ }
+ $html = $_[0]->displayTitle;
+ $html .= $_[0]->description;
+ $html = $_[0]->processMacros($html);
+ $html .= '';
+ $html .= '';
+ $html .= '
+
+
+
+
';
+ $sth = WebGUI::SQL->read("select messageId,subject,username,dateOfPost,userId
+ from discussion where wobjectId=".$_[0]->get("wobjectId")." and pid=0 order by messageId desc");
+ while (@data = $sth->array) {
+ $data[1] = WebGUI::HTML::filter($data[1],'all');
+ if ($i >= ($_[0]->get("messagesPerPage")*$pn) && $i < ($_[0]->get("messagesPerPage")*($pn+1))) {
+ @last = WebGUI::SQL->quickArray("select messageId,dateOfPost,username,subject,userId
+ from discussion where wobjectId=".$_[0]->get("wobjectId")." and rid=$data[0] order by dateOfPost desc");
+ $last[3] = WebGUI::HTML::filter($last[3],'all');
+ ($replies) = WebGUI::SQL->quickArray("select count(*) from discussion where rid=$data[0]");
+ $replies -= 1;
+ $html .= '| '.substr($data[1],0,30).' |
+ '.$data[2].' |
+ '.epochToHuman($data[3],"%z %Z").' |
+ '.$replies.' |
+ '.substr($last[3],0,30).'
+ @ '.epochToHuman($last[1],"%z %Z").' by '.$last[2].'
+ |
';
+ }
+ $i++;
+ }
+ $html .= '
';
+ if ($i > $_[0]->get("messagesPerPage")) {
+ $html .= '';
+ }
+ return $html;
+}
+
+1;
+