diff --git a/lib/WebGUI/Wobject.pm b/lib/WebGUI/Wobject.pm index 2678bd557..56151668c 100644 --- a/lib/WebGUI/Wobject.pm +++ b/lib/WebGUI/Wobject.pm @@ -615,6 +615,23 @@ sub setCollateral { } +#------------------------------------------------------------------- + +=head2 www_approvePost ( ) + + Sets the status flag on a discussion message to "approved". + +=cut + +sub www_approvePost { + if (WebGUI::Privilege::isInGroup($_[0]->get("groupToModerate"))) { + return WebGUI::Discussion::approvePost(); + } else { + return WebGUI::Privilege::insufficient(); + } +} + + #------------------------------------------------------------------- =head2 www_copy ( ) @@ -734,6 +751,22 @@ sub www_deleteMessageConfirm { #------------------------------------------------------------------- +=head2 www_denyPost ( ) + + Sets the status flag on a discussion message to "denied". + +=cut + +sub www_denyPost { + if (WebGUI::Privilege::isInGroup($_[0]->get("groupToModerate"))) { + return WebGUI::Discussion::denyPost(); + } else { + return WebGUI::Privilege::insufficient(); + } +} + +#------------------------------------------------------------------- + =head2 www_edit ( formRows ) Displays the common properties of any/all wobjects. @@ -816,6 +849,23 @@ sub www_editSave { #------------------------------------------------------------------- +=head2 www_lockThread ( ) + + Locks a discussion thread from the current message down. + +=cut + +sub www_lockThread { + if (WebGUI::Privilege::isInGroup($_[0]->get("groupToModerate"))) { + WebGUI::Discussion::lockThread(); + return $_[0]->www_showMessage; + } else { + return WebGUI::Privilege::insufficient(); + } +} + +#------------------------------------------------------------------- + =head2 www_moveBottom ( ) Moves this instance to the bottom of the page. @@ -922,6 +972,56 @@ sub www_paste { #------------------------------------------------------------------- +=head2 www_post ( ) + + Displays a discussion message post form. + +=cut + +sub www_post { + if (WebGUI::Privilege::isInGroup($_[0]->get("groupToPost"))) { + return WebGUI::Discussion::post(); + } else { + return WebGUI::Privilege::insufficient(); + } +} + +#------------------------------------------------------------------- + +=head2 www_post ( ) + + Saves a message post to a discussion. + +=cut + +sub www_postSave { + if (WebGUI::Privilege::isInGroup($_[0]->get("groupToPost"))) { + WebGUI::Discussion::postSave($_[0]); + return $_[0]->www_showMessage(); + } else { + return WebGUI::Privilege::insufficient(); + } +} + +#------------------------------------------------------------------- + +=head2 www_unlockThread ( ) + + Unlocks a discussion thread from the current message on down. + +=cut + +sub www_unlockThread { + if (WebGUI::Privilege::isInGroup($_[0]->get("groupToModerate"))) { + WebGUI::Discussion::unlockThread(); + return $_[0]->www_showMessage; + } else { + return WebGUI::Privilege::insufficient(); + } +} + +#------------------------------------------------------------------- + =head2 www_view ( ) The default display mechanism for any wobject. This web method MUST diff --git a/lib/WebGUI/Wobject/Article.pm b/lib/WebGUI/Wobject/Article.pm index 4d188ff64..473208e76 100644 --- a/lib/WebGUI/Wobject/Article.pm +++ b/lib/WebGUI/Wobject/Article.pm @@ -62,15 +62,6 @@ sub set { $_[0]->SUPER::set($_[1],[qw(image linkTitle linkURL attachment convertCarriageReturns alignImage allowDiscussion)]); } -#------------------------------------------------------------------- -sub www_approvePost { - if (WebGUI::Privilege::isInGroup($_[0]->get("groupToModerate"))) { - return WebGUI::Discussion::approvePost(); - } else { - return WebGUI::Privilege::insufficient(); - } -} - #------------------------------------------------------------------- sub www_deleteAttachment { if (WebGUI::Privilege::canEditPage()) { @@ -91,15 +82,6 @@ sub www_deleteImage { } } -#------------------------------------------------------------------- -sub www_denyPost { - if (WebGUI::Privilege::isInGroup($_[0]->get("groupToModerate"))) { - return WebGUI::Discussion::denyPost(); - } else { - return WebGUI::Privilege::insufficient(); - } -} - #------------------------------------------------------------------- sub www_edit { my ($output, $editTimeout, $groupToModerate, %hash, $f); @@ -168,35 +150,6 @@ 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"))) { - return WebGUI::Discussion::post(); - } else { - return WebGUI::Privilege::insufficient(); - } -} - -#------------------------------------------------------------------- -sub www_postSave { - if (WebGUI::Privilege::isInGroup($_[0]->get("groupToPost"))) { - WebGUI::Discussion::postSave($_[0]); - return $_[0]->www_showMessage(); - } else { - return WebGUI::Privilege::insufficient(); - } -} - #------------------------------------------------------------------- sub www_showMessage { my ($submenu, $output, $defaultMid); @@ -208,16 +161,6 @@ sub www_showMessage { 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 ($file, $output, $image, $replies, $body); diff --git a/lib/WebGUI/Wobject/MessageBoard.pm b/lib/WebGUI/Wobject/MessageBoard.pm index 4e0667752..87bf1a2e6 100644 --- a/lib/WebGUI/Wobject/MessageBoard.pm +++ b/lib/WebGUI/Wobject/MessageBoard.pm @@ -57,24 +57,6 @@ sub set { $_[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(); - } -} - -#------------------------------------------------------------------- -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, $messagesPerPage); @@ -106,35 +88,6 @@ 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"))) { - return WebGUI::Discussion::post(); - } else { - return WebGUI::Privilege::insufficient(); - } -} - -#------------------------------------------------------------------- -sub www_postSave { - if (WebGUI::Privilege::isInGroup($_[0]->get("groupToPost"))) { - WebGUI::Discussion::postSave($_[0]); - return $_[0]->www_showMessage(); - } else { - return WebGUI::Privilege::insufficient(); - } -} - #------------------------------------------------------------------- sub www_search { return WebGUI::Discussion::search(); @@ -149,16 +102,6 @@ sub www_showMessage { 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); diff --git a/lib/WebGUI/Wobject/UserSubmission.pm b/lib/WebGUI/Wobject/UserSubmission.pm index b8d91f66e..b03483f80 100644 --- a/lib/WebGUI/Wobject/UserSubmission.pm +++ b/lib/WebGUI/Wobject/UserSubmission.pm @@ -231,15 +231,6 @@ sub set { displayThumbnails karmaPerSubmission layout allowDiscussion)]); } -#------------------------------------------------------------------- -sub www_approvePost { - if (WebGUI::Privilege::isInGroup($_[0]->get("groupToModerate"))) { - return WebGUI::Discussion::approvePost(); - } else { - return WebGUI::Privilege::insufficient(); - } -} - #------------------------------------------------------------------- sub www_approveSubmission { my (%submission); @@ -310,15 +301,6 @@ sub www_deleteSubmissionConfirm { } } -#------------------------------------------------------------------- -sub www_denyPost { - if (WebGUI::Privilege::isInGroup($_[0]->get("groupToModerate"))) { - return WebGUI::Discussion::denyPost(); - } else { - return WebGUI::Privilege::insufficient(); - } -} - #------------------------------------------------------------------- sub www_denySubmission { my (%submission); @@ -477,35 +459,6 @@ sub www_editSubmissionSave { } } -#------------------------------------------------------------------- -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"))) { - return WebGUI::Discussion::post(); - } else { - return WebGUI::Privilege::insufficient(); - } -} - -#------------------------------------------------------------------- -sub www_postSave { - if (WebGUI::Privilege::isInGroup($_[0]->get("groupToPost"))) { - WebGUI::Discussion::postSave($_[0]); - return $_[0]->www_showMessage(); - } else { - return WebGUI::Privilege::insufficient(); - } -} - #------------------------------------------------------------------- sub www_search { if ($session{form}{sid} ne "") { @@ -576,16 +529,6 @@ sub www_showMessage { 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 ($output);