Added pre-emptive moderation and thread locking to discussions.
This commit is contained in:
JT Smith
parent
6e36054be1
commit
3c9e939566
7 changed files with 497 additions and 208 deletions
|
|
@ -29,21 +29,11 @@ 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;
|
||||
}
|
||||
}
|
||||
our %status =("Approved"=>WebGUI::International::get(560),
|
||||
"Denied"=>WebGUI::International::get(561),
|
||||
"Pending"=>WebGUI::International::get(562));
|
||||
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub duplicate {
|
||||
|
|
@ -51,11 +41,7 @@ sub duplicate {
|
|||
$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"),
|
||||
karmaPerPost=>$_[0]->get("karmaPerPost")
|
||||
messagesPerPage=>$_[0]->get("messagesPerPage")
|
||||
});
|
||||
WebGUI::Discussion::duplicate($_[0]->get("wobjectId"),$w->get("wobjectId"));
|
||||
}
|
||||
|
|
@ -77,7 +63,16 @@ sub purge {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub set {
|
||||
$_[0]->SUPER::set($_[1],[qw(editTimeout karmaPerPost groupToPost groupToModerate messagesPerPage)]);
|
||||
$_[0]->SUPER::set($_[1],[qw(messagesPerPage)]);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_approvePost {
|
||||
if (WebGUI::Privilege::isInGroup($_[0]->get("groupToModerate"))) {
|
||||
return WebGUI::Discussion::approvePost();
|
||||
} else {
|
||||
return WebGUI::Privilege::insufficient();
|
||||
}
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -92,7 +87,7 @@ sub www_copy {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_deleteMessage {
|
||||
if (_canEditMessage($_[0],$session{form}{mid})) {
|
||||
if (WebGUI::Discussion::canEditMessage($_[0],$session{form}{mid})) {
|
||||
return WebGUI::Discussion::deleteMessage();
|
||||
} else {
|
||||
return WebGUI::Privilege::insufficient();
|
||||
|
|
@ -101,36 +96,32 @@ sub www_deleteMessage {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_deleteMessageConfirm {
|
||||
if (_canEditMessage($_[0],$session{form}{mid})) {
|
||||
if (WebGUI::Discussion::canEditMessage($_[0],$session{form}{mid})) {
|
||||
return WebGUI::Discussion::deleteMessageConfirm();
|
||||
} else {
|
||||
return WebGUI::Privilege::insufficient();
|
||||
}
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_denyPost {
|
||||
if (WebGUI::Privilege::isInGroup($_[0]->get("groupToModerate"))) {
|
||||
return WebGUI::Discussion::denyPost();
|
||||
} else {
|
||||
return WebGUI::Privilege::insufficient();
|
||||
}
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_edit {
|
||||
my ($output, $f, $groupToModerate, $messagesPerPage, $editTimeout);
|
||||
my ($output, $f, $messagesPerPage);
|
||||
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 .= '<h1>'.WebGUI::International::get(6,$namespace).'</h1>';
|
||||
$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);
|
||||
if ($session{setting}{useKarma}) {
|
||||
$f->integer("karmaPerPost",WebGUI::International::get(541),$_[0]->get("karmaPerPost"));
|
||||
} else {
|
||||
$f->hidden("karmaPerPost",$_[0]->get("karmaPerPost"));
|
||||
}
|
||||
$f->raw($_[0]->SUPER::discussionProperties);
|
||||
$output .= $_[0]->SUPER::www_edit($f->printRowsOnly);
|
||||
return $output;
|
||||
} else {
|
||||
|
|
@ -144,11 +135,7 @@ 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},
|
||||
karmaPerPost=>$session{form}{karmaPerPost},
|
||||
groupToModerate=>$session{form}{groupToModerate}
|
||||
messagesPerPage=>$session{form}{messagesPerPage}
|
||||
});
|
||||
return "";
|
||||
} else {
|
||||
|
|
@ -156,9 +143,19 @@ sub www_editSave {
|
|||
}
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_lockThread {
|
||||
if (WebGUI::Privilege::isInGroup($_[0]->get("groupToModerate"))) {
|
||||
WebGUI::Discussion::lockThread();
|
||||
return $_[0]->www_showMessage;
|
||||
} else {
|
||||
return WebGUI::Privilege::insufficient();
|
||||
}
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_post {
|
||||
if (WebGUI::Privilege::isInGroup($_[0]->get("groupToPost"),$session{user}{userId})) {
|
||||
if (WebGUI::Privilege::isInGroup($_[0]->get("groupToPost"))) {
|
||||
return WebGUI::Discussion::post();
|
||||
} else {
|
||||
return WebGUI::Privilege::insufficient();
|
||||
|
|
@ -167,8 +164,8 @@ sub www_post {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_postSave {
|
||||
if (WebGUI::Privilege::isInGroup($_[0]->get("groupToPost"),$session{user}{userId})) {
|
||||
WebGUI::Discussion::postSave($_[0]->get("karmaPerPost"));
|
||||
if (WebGUI::Privilege::isInGroup($_[0]->get("groupToPost"))) {
|
||||
WebGUI::Discussion::postSave($_[0]);
|
||||
return $_[0]->www_showMessage();
|
||||
} else {
|
||||
return WebGUI::Privilege::insufficient();
|
||||
|
|
@ -183,21 +180,22 @@ sub www_search {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_showMessage {
|
||||
my ($output, $submenu);
|
||||
$submenu = '<a href="'.WebGUI::URL::page('func=post&replyTo='.$session{form}{mid}.'&wid='.$session{form}{wid})
|
||||
.'">'.WebGUI::International::get(13,$namespace).'</a><br>';
|
||||
if (_canEditMessage($_[0],$session{form}{mid})) {
|
||||
$submenu .= '<a href="'.WebGUI::URL::page('func=post&mid='.$session{form}{mid}.
|
||||
'&wid='.$session{form}{wid}).'">'.WebGUI::International::get(12,$namespace).'</a><br>';
|
||||
$submenu .= '<a href="'.WebGUI::URL::page('func=deleteMessage&mid='.$session{form}{mid}.
|
||||
'&wid='.$session{form}{wid}).'">'.WebGUI::International::get(22,$namespace).'</a><br>';
|
||||
}
|
||||
$submenu .= '<a href="'.WebGUI::URL::page('func=search&wid='.$_[0]->get("wobjectId")).'">'.WebGUI::International::get(364).'</a><br>';
|
||||
$submenu .= '<a href="'.WebGUI::URL::page().'">'.WebGUI::International::get(11,$namespace).'</a><br>';
|
||||
$output = WebGUI::Discussion::showMessage($submenu);
|
||||
$submenu = '<a href="'.WebGUI::URL::page().'">'.WebGUI::International::get(11,$namespace).'</a><br>';
|
||||
$output = WebGUI::Discussion::showMessage($submenu,$_[0]);
|
||||
$output .= WebGUI::Discussion::showReplyTree();
|
||||
return $output;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_unlockThread {
|
||||
if (WebGUI::Privilege::isInGroup($_[0]->get("groupToModerate"))) {
|
||||
WebGUI::Discussion::unlockThread();
|
||||
return $_[0]->www_showMessage;
|
||||
} else {
|
||||
return WebGUI::Privilege::insufficient();
|
||||
}
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_view {
|
||||
my ($sth, %data, $html, $i, $pn, $lastId, @last, $replies);
|
||||
|
|
@ -225,27 +223,36 @@ sub www_view {
|
|||
<td class="tableHeader">'.WebGUI::International::get(514).'</td>
|
||||
<td class="tableHeader">'.WebGUI::International::get(19,$namespace).'</td>
|
||||
<td class="tableHeader">'.WebGUI::International::get(20,$namespace).'</td></tr>';
|
||||
$sth = WebGUI::SQL->read("select messageId,subject,username,dateOfPost,userId,views
|
||||
from discussion where wobjectId=".$_[0]->get("wobjectId")." and pid=0 order by messageId desc");
|
||||
$sth = WebGUI::SQL->read("select messageId,subject,username,dateOfPost,userId,views,status
|
||||
from discussion where wobjectId=".$_[0]->get("wobjectId")." and pid=0
|
||||
and (status='Approved' or userId=$session{user}{userId}) order by messageId desc");
|
||||
while (%data = $sth->hash) {
|
||||
$data{subject} = WebGUI::Discussion::formatSubject($data{subject});
|
||||
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{messageId} order by dateOfPost desc");
|
||||
from discussion where wobjectId=".$_[0]->get("wobjectId")." and rid=$data{messageId}
|
||||
and status='Approved' order by dateOfPost desc");
|
||||
$last[3] = WebGUI::HTML::filter($last[3],'all');
|
||||
($replies) = WebGUI::SQL->quickArray("select count(*) from discussion where rid=$data{messageId}");
|
||||
($replies) = WebGUI::SQL->quickArray("select count(*) from discussion
|
||||
where rid=$data{messageId} and status='Approved'");
|
||||
$replies--;
|
||||
$html .= '<tr><td class="tableData"><a
|
||||
href="'.WebGUI::URL::page('func=showMessage&mid='.$data{messageId}.'&wid='.$_[0]->get("wobjectId"))
|
||||
.'">'.substr($data{subject},0,30).'</a></td>
|
||||
<td class="tableData"><a href="'.WebGUI::URL::page('op=viewProfile&uid='.$data{userId}).'">'.$data{username}.'</a></td>
|
||||
.'">'.substr($data{subject},0,30).'</a>';
|
||||
if ($data{userId} == $session{user}{userId}) {
|
||||
$html .= ' ('.$status{$data{status}}.')';
|
||||
}
|
||||
$html .= '</td>
|
||||
<td class="tableData"><a href="'.WebGUI::URL::page('op=viewProfile&uid='.$data{userId}).'">'
|
||||
.$data{username}.'</a></td>
|
||||
<td class="tableData">'.epochToHuman($data{dateOfPost},"%z %Z").'</td>
|
||||
<td class="tableData">'.$data{views}.'</td>
|
||||
<td class="tableData">'.$replies.'</td>
|
||||
<td class="tableData"><span style="font-size: 8pt;"><a
|
||||
href="'.WebGUI::URL::page('func=showMessage&mid='.$last[0].'&wid='.$_[0]->get("wobjectId")).'">'
|
||||
.substr($last[3],0,30).'</a>
|
||||
@ '.epochToHuman($last[1],"%z %Z").' by <a href="'.WebGUI::URL::page('op=viewProfile&uid='.$last[4]).'">'.$last[2].'</a>
|
||||
@ '.epochToHuman($last[1],"%z %Z").' by <a href="'
|
||||
.WebGUI::URL::page('op=viewProfile&uid='.$last[4]).'">'.$last[2].'</a>
|
||||
</span></td></tr>';
|
||||
}
|
||||
$i++;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue