From dc1721d1ef5fc7aabf0e7aeb64fe6b6766d2b791 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Sat, 12 Feb 2005 00:10:44 +0000 Subject: [PATCH] fixing bugs in the new collaboration system --- docs/upgrades/upgrade_6.2.11-6.3.0.pl | 86 +++- lib/WebGUI/Asset/Post.pm | 16 +- lib/WebGUI/Asset/Post/Thread.pm | 33 +- lib/WebGUI/Asset/Wobject/Collaboration.pm | 593 ++++++++-------------- lib/WebGUI/Forum/UI.pm | 2 +- 5 files changed, 320 insertions(+), 410 deletions(-) diff --git a/docs/upgrades/upgrade_6.2.11-6.3.0.pl b/docs/upgrades/upgrade_6.2.11-6.3.0.pl index b55715496..3b514a8eb 100644 --- a/docs/upgrades/upgrade_6.2.11-6.3.0.pl +++ b/docs/upgrades/upgrade_6.2.11-6.3.0.pl @@ -39,6 +39,7 @@ $forums->finish; my ($defaultThreadTemplate) = WebGUI::SQL->quickArray("select template from template where namespace='Forum/Thread' and templateId='1'"); my ($defaultPostTemplate) = WebGUI::SQL->quickArray("select template from template where namespace='Forum/Post' and templateId='1'"); $defaultThreadTemplate =~ s/\/$defaultPostTemplate/ixsg; +$defaultThreadTemplate =~ '

^Navigation(crumbTrail);

'.$defaultThreadTemplate; WebGUI::SQL->write("update template set template=".quote($defaultThreadTemplate)." where namespace='Forum/Thread' and templateId='1'"); WebGUI::SQL->write("delete from template where namespace='Forum/Post' or (namespace='Forum/Thread' and templateId<>'1')"); foreach my $key (%threadTemplates) { @@ -675,8 +676,92 @@ $sth->finish; +print "\tMigrating forum templates to collaboration templates\n" unless ($quiet); +my $sth = WebGUI::SQL->read("select assetId,template,namespace from template where namespace in ('Forum','Forum/Thread','Forum/Notification', 'Forum/Search', 'Forum/PostForm')"); +while (my ($id, $template, $namespace) = $sth->array) { + if ($namespace eq "Forum") { + $namespace = "Collaboration"; + } elsif ($namespace eq "Forum/PostForm") { + $namespace = "Collaboration/PostForm"; + } elsif ($namespace eq "Forum/Notification") { + $namespace = "Collaboration/Notification"; + } elsif ($namespace eq "Forum/Thread") { + $namespace = "Collaboration/Thread"; + } + $template =~ s/\//ixsg; + $template =~ s/\//ixsg; + $template =~ s/\//ixsg; + $template =~ s/\//ixsg; + $template =~ s/forum\.search\./search./ixsg; + $template =~ s/forum\.subscribe\./subscribe./ixsg; + $template =~ s/forum\.unsubscribe\./unsubscribe./ixsg; + $template =~ s/thread\.new\.url/add.url/ixsg; + $template =~ s/thread\.new\.label/add.label/ixsg; + $template =~ s/thread\.sortby\./sortby./ixsg; + $template =~ s/thread\.date\./date./ixsg; + $template =~ s/thread\.user\./user./ixsg; + $template =~ s/thread\.views\./views./ixsg; + $template =~ s/thread\.replies./replies./ixsg; + $template =~ s/thread\.rating\./rating./ixsg; + $template =~ s/thread\.last\./lastReply./ixsg; + $template =~ s/thread\.sorted\./sorted./ixsg; + $template =~ s/thread\.sortedBy\./sortedBy./ixsg; + $template =~ s/thread\.views/views/ixsg; + $template =~ s/thread\.replies/replies/ixsg; + $template =~ s/thread\.rating/rating/ixsg; + $template =~ s/thread\.rating_loop/rating_loop/ixsg; + $template =~ s/thread\.isSticky/isSticky/ixsg; + $template =~ s/thread\.isLocked/isLocked/ixsg; + $template =~ s/thread\.root\.subject/title/ixsg; + $template =~ s/thread\.root\.url/url/ixsg; + $template =~ s/thread\.root\.epoch/dateSubmitted/ixsg; + $template =~ s/thread\.root\.url/url/ixsg; + $template =~ s/thread\.root\.date/dateSubmitted.human/ixsg; + $template =~ s/thread\.root\.time/timeSubmitted.human/ixsg; + $template =~ s/thread\.root\.user\.profile/userProfile.url/ixsg; + $template =~ s/thread\.root\.user\.alias/username/ixsg; + $template =~ s/thread\.root\.user\.name/username/ixsg; + $template =~ s/thread\.root\.user\.id/ownerUserId/ixsg; + $template =~ s/thread\.root\.user\.isVisitor/user.isVisitor/ixsg; + $template =~ s/thread\.root\.user\.status/status/ixsg; + $template =~ s/thread\.last\.url/last.url/ixsg; + $template =~ s/thread\.last\.subject/last.title/ixsg; + $template =~ s/thread\.last\.epoch/last.dateSubmitted/ixsg; + $template =~ s/thread\.last\.date/last.dateSubmitted.human/ixsg; + $template =~ s/thread\.last\.time/last.timeSubmitted.human/ixsg; + $template =~ s/thread\.last\.user.profile/last.userProfile.url/ixsg; + $template =~ s/thread\.last\.user.name/last.username/ixsg; + $template =~ s/thread\.last\.user.id/last.ownerUserId/ixsg; + $template =~ s/thread\.last\.user.isVisitor/last.user.isVisitor/ixsg; + $template =~ s/thread\.last\.status/last.status/ixsg; + $template =~ s/firstPage/pagination.firstPage/ixsg; + $template =~ s/lastPage/pagination.lastPage/ixsg; + $template =~ s/nextPage/pagination.nextPage/ixsg; + $template =~ s/previousPage/pagination.previousPage/ixsg; + $template =~ s/pageList/pagination.pageList.upTo10/ixsg; + $template =~ s/multiplePages/pagination.pageCount.isMultiple/ixsg; + $template =~ s/numberOfPages/pagination.pageCount/ixsg; + $template =~ s/pageNumber/pagination.pageNumber/ixsg; + WebGUI::SQL->write("update template set template=".quote($template).", namespace=".quote($namespace)." where assetId=".quote($id)); +} +$sth->finish; +print "\tMigrating USS templates to collaboration templates\n" unless ($quiet); +my $sth = WebGUI::SQL->read("select assetId,template,namespace from template where namespace in ('USS','USS/Submission','USS/SubmissionForm')"); +while (my ($id, $template, $namespace) = $sth->array) { + if ($namespace eq "USS") { + $namespace = "Collaboration"; + } elsif ($namespace eq "USS/SubmissionForm") { + $namespace = "Collaboration/PostForm"; + } elsif ($namespace eq "USS/Submission") { + $namespace = "Collaboration/Thread"; + } + # fill in stuff here + WebGUI::SQL->write("update template set template=".quote($template).", namespace=".quote($namespace)." where assetId=".quote($id)); +} +$sth->finish; + print "\tDeleting files which are no longer used.\n" unless ($quiet); #unlink("../../lib/WebGUI/Export.pm"); @@ -760,7 +845,6 @@ $conf->set("assets"=>[ 'WebGUI::Asset::Wobject::Poll', 'WebGUI::Asset::Wobject::Article', 'WebGUI::Asset::Wobject::DataForm', - 'WebGUI::Asset::Wobject::USS', 'WebGUI::Asset::Wobject::SyndicatedContent', 'WebGUI::Asset::Wobject::WSClient', 'WebGUI::Asset::Wobject::HttpProxy', diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm index 8399ff210..1f4c7784a 100644 --- a/lib/WebGUI/Asset/Post.pm +++ b/lib/WebGUI/Asset/Post.pm @@ -14,8 +14,6 @@ use strict; use Tie::CPHash; use WebGUI::Asset; use WebGUI::Asset::Template; -use WebGUI::Asset::Thread; -use WebGUI::Asset::Wobject::Collaborate; use WebGUI::DateTime; use WebGUI::Grouping; use WebGUI::HTML; @@ -178,7 +176,7 @@ sub formatContent { my $content = shift || $self->get("content"); my $contentType = shift || $self->get("contentType"); my $msg = WebGUI::HTML::filter($content,$self->getThread->getParent->get("filterCode")); - $msg = WebGUI::HTML::format($msg, $contentType)); + $msg = WebGUI::HTML::format($msg, $contentType); if ($self->getThread->getParent->get("useContentFilter")) { $msg = WebGUI::HTML::processReplacements($msg); } @@ -323,13 +321,13 @@ sub getSynopsisAndContentFromFormPost { $synopsis = WebGUI::HTML::filter($content[0],"none"); } $body =~ s/\^\-\;/\n/; - return ($synopsis,$content); + return ($synopsis,$body); } #------------------------------------------------------------------- sub getTemplateVars { my $self = shift; - my %var; + my %var = %{$self->get}; $var{"userId"} = $self->get("ownerUserId"); $var{"dateSubmitted.human"} = epochToHuman($self->get("dateSubmitted")); @@ -496,7 +494,7 @@ sub notifySubscribers { }; $lang{$u->profileField("language")}{var} = $self->getTemplateVars($lang{$u->profileField("language")}{var}); $lang{$u->profileField("language")}{subject} = WebGUI::International::get(523,"WebGUI",$u->profileField("language")); - $lang{$u->profileField("language")}{message} = $self->processTemplate($lang{$u->profileField("language")}{var}, $self->getThread->getParent->get("notificationTemplateId"));, + $lang{$u->profileField("language")}{message} = $self->processTemplate($lang{$u->profileField("language")}{var}, $self->getThread->getParent->get("notificationTemplateId")); } WebGUI::MessageLog::addEntry($userId,"",$lang{$u->profileField("language")}{subject},$lang{$u->profileField("language")}{message}); } @@ -574,7 +572,7 @@ Sets the post to approved and sends any necessary notifications. =cut sub setStatusApproved { - my $self + my $self = shift; $self->update({status=>'approved'}); $self->getThread->incrementReplies($self->get("dateUpdated"),$self->getId) if $self->isReply; unless ($self->isPoster) { @@ -702,7 +700,7 @@ sub www_edit { value=>$session{form}{class} }); if ($self->getThread->getParent->canModerate) { - $var->{'lock.form'} = WebGUI::Form::yesNo({ + $var{'lock.form'} = WebGUI::Form::yesNo({ name=>'lock', value=>$session{form}{'lock'} }); @@ -754,7 +752,7 @@ sub www_edit { onclick=>"this.value='Please wait...'; this.form.func.value='editSave'; this.form.submit();" }); $var{'form.footer'} = WebGUI::Form::formFooter(); - $var{usePreview} = $self->getThread->getParent->get("usePreview")) { + $var{usePreview} = $self->getThread->getParent->get("usePreview"); $var{'user.isVisitor'} = ($session{user}{userId} eq '1'); $var{'visitorName.form'} = WebGUI::Form::text({ name=>"visitorName", diff --git a/lib/WebGUI/Asset/Post/Thread.pm b/lib/WebGUI/Asset/Post/Thread.pm index 30e01f4d0..5a78ea4cf 100644 --- a/lib/WebGUI/Asset/Post/Thread.pm +++ b/lib/WebGUI/Asset/Post/Thread.pm @@ -266,7 +266,7 @@ sub getSubscribeUrl { #------------------------------------------------------------------- sub getThread { - return $self; + return shift; } #------------------------------------------------------------------- @@ -564,7 +564,7 @@ sub view { my $self = shift; $self->markRead; $self->incrementViews; - WebGUI::Session::setScratch("forumThreadLayout",$session{form}{layout}); + WebGUI::Session::setScratch("discussionLayout",$session{form}{layout}); my $var = $self->getTemplateVars; $self->getParent->appendTemplateLabels($var); @@ -573,27 +573,27 @@ sub view { $var->{'user.canPost'} = $self->getParent->canPost; $var->{'user.canReply'} = $self->canReply; - $var->{'layout.nested.url'} = formatThreadLayoutURL($callback,$post->get("forumPostId"),"nested"); - $var->{'layout.flat.url'} = formatThreadLayoutURL($callback,$post->get("forumPostId"),"flat"); - $var->{'layout.threaded.url'} = formatThreadLayoutURL($callback,$post->get("forumPostId"),"threaded"); - my $layout = $session{scratch}{forumThreadLayout} || $session{user}{discussionLayout}; + $var->{'layout.nested.url'} = $self->getThreadLayoutUrl("nested"); + $var->{'layout.flat.url'} = $self->getThreadLayoutUrl("flat"); + $var->{'layout.threaded.url'} = $self->getThreadLayoutUrl("threaded"); + my $layout = $session{scratch}{discussionLayout} || $session{user}{discussionLayout}; $var->{'layout.isFlat'} = ($layout eq "flat"); $var->{'layout.isNested'} = ($layout eq "nested"); $var->{'layout.isThreaded'} = ($layout eq "threaded" || !($var->{'thread.layout.isNested'} || $var->{'thread.layout.isFlat'})); - $var->{'user.isSubscribed'} = $thread->isSubscribed; - $var->{'subscribe.url'} = formatThreadSubscribeURL($callback,$post->get("forumPostId")); - $var->{'unsubscribe.url'} = formatThreadUnsubscribeURL($callback,$post->get("forumPostId")); + $var->{'user.isSubscribed'} = $self->isSubscribed; + $var->{'subscribe.url'} = $self->getSubscribeUrl; + $var->{'unsubscribe.url'} = $self->getUnsubscribeUrl; - $var->{'isSticky'} = $thread->isSticky; - $var->{'stick.url'} = formatThreadStickURL($callback,$post->get("forumPostId")); - $var->{'unstick.url'} = formatThreadUnstickURL($callback,$post->get("forumPostId")); + $var->{'isSticky'} = $self->isSticky; + $var->{'stick.url'} = $self->getStickUrl; + $var->{'unstick.url'} = $self->getUnstickUrl; - $var->{'isLocked'} = $thread->isLocked; - $var->{'lock.url'} = formatThreadLockURL($callback,$post->get("forumPostId")); - $var->{'unlock.url'} = formatThreadUnlockURL($callback,$post->get("forumPostId")); + $var->{'isLocked'} = $self->isLocked; + $var->{'lock.url'} = $self->getLockUrl; + $var->{'unlock.url'} = $self->getUnlockUrl; - my $p = WebGUI::Paginator->new($self->getUrl),$self->getParent->get("postsPerPage")); + my $p = WebGUI::Paginator->new($self->getUrl,$self->getParent->get("postsPerPage")); my $sql = "select * from asset left join Post on Post.assetId=asset.assetId left join Thread on Thread.assetId=asset.assetId @@ -613,6 +613,7 @@ sub view { $p->setDataByQuery($sql); foreach my $dataSet (@{$p->getPageData()}) { my $reply = WebGUI::Asset::Post->newByPropertyHashRef($dataSet); + $reply->{_thread} = $self; # caching thread for better performance my $replyVars = $reply->getTemplateVars; $replyVars->{isCurrent} = $session{asset}->getId eq $reply->getId; $replyVars->{depth} = $reply->getLineageLength - $self->getLineageLength - 1; diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index 53b472adb..6abc430fc 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -27,77 +27,143 @@ use WebGUI::Style; use WebGUI::URL; use WebGUI::Utility; use WebGUI::Asset::Wobject; -use WebGUI::Asset::USS_submission; our @ISA = qw(WebGUI::Asset::Wobject); +#------------------------------------------------------------------- +sub appendPostListTemplateVars { + my $self = shift; + my $var = shift; + my $sql = shift; + my $p = shift; + $p->setDataByQuery($sql); + my $page = $p->getPageData; + my $i = 0; + foreach my $row (@$page) { + my $post = WebGUI::Asset::Wobject::Forum->newByPropertyHashRef($row); + $post->{_parent} = $self; # caching parent for efficiency + my $controls = deleteIcon('func=delete',$post->get("url"),"Delete").editIcon('func=edit',$post->get("ur")); + if ($self->get("sortBy") eq "lineage") { + if ($self->get("sortOrder") eq "desc") { + $controls .= moveUpIcon('func=demote',$post->get("url")).moveDownIcon('func=promote',$post->get("url")); + } else { + $controls .= moveUpIcon('func=promote',$post->get("url")).moveDownIcon('func=demote',$post->get("url")); + } + } + my $inDateRange; + if ($post->get("startDate") < WebGUI::DateTime::time() && $post->get("endDate") > WebGUI::DateTime::time()) { + $inDateRange = 1; + } else { + $inDateRange = 0; + } + my @rating_loop; + for (my $i=0;$i<=$post->get("rating");$i++) { + push(@rating_loop,{'rating_loop.count'=>$i}); + } + push(@{$var->{post_loop}}, { + %{$post->get}, + "id"=>$post->getId, + "url"=>$post->getUrl, + rating_loop=>\@rating_loop, + "content"=>$self->formatContent, + "status"=>$post->getStatus, + # "thumbnail"=>$submission->getThumbnailUrl, + # "submission.image"=>$submission->getImageUrl, + "dateSubmitted.human"=>epochToHuman($post->get("dateSubmitted"),"%z"), + "dateUpdated.human"=>epochToHuman($post->get("dateUpdated"),"%z"), + "timeSubmitted.human"=>epochToHuman($post->get("dateSubmitted"),"%Z"), + "timeUpdated.human"=>epochToHuman($post->get("dateUpdated"),"%Z"), + "userProfile.url"=>$post->getUserProfileUrl, + "user.isVisitor"=>$post->get("ownerUserId") eq "1", + "edit.url"=>$post->getEditUrl, + 'controls'=>$controls, + 'inDateRange'=>$inDateRange, + "isSecond"=>(($i+1)%2==0), + "isThird"=>(($i+1)%3==0), + "isFourth"=>(($i+1)%4==0), + "isFifth"=>(($i+1)%5==0), + "currentUserIsPoster"=>$post->isPoster + }); + $i++; + } + $p->appendTemplateVars($var); +} + #------------------------------------------------------------------- sub appendTemplateLabels { my $self = shift; my $var = shift; my $i18n = WebGUI::International->new("Collaboration"); - $var->{'question.label'} = WebGUI::International::get(85,"USS"); - $var->{'title.label'} = WebGUI::International::get(35,"USS"); - $var->{'link.header.label'} = WebGUI::International::get(90,"USS"); - $var->{'visitorName.label'} = WebGUI::International::get(438); - $var->{'question.header.label'} = WebGUI::International::get(84,"USS"); - $var->{'submission.header.label'} = WebGUI::International::get(19,"USS"); - $var->{'body.label'} = WebGUI::International::get(31,"USS"); - $var->{'answer.label'} = WebGUI::International::get(86,"USS"); - $var->{'description.label'} = WebGUI::International::get(85); - $var->{'contentType.label'} = WebGUI::International::get(1007); - $var->{'startDate.label'} = WebGUI::International::get(497); - $var->{'endDate.label'} = WebGUI::International::get(498); - $var->{'url.label'} = WebGUI::International::get(91,"USS"); - $var->{'newWindow.label'} = WebGUI::International::get(92,"USS"); - $var->{'newpost.header'} = WebGUI::International::get(1064); - $var->{'sticky.label'} = WebGUI::International::get(1013); - $var->{'subscribe.label'} = WebGUI::International::get(873); - $var->{'lock.label'} = WebGUI::International::get(1012); - $var->{'message.label'} = WebGUI::International::get(230); - $var->{'subject.label'} = WebGUI::International::get(229); - $var->{'image.label'} = WebGUI::International::get(32,"USS"); - $var->{'attachment.label'} = WebGUI::International::get(33,"USS"); - $var->{"user.label"} = "User"; - $var->{"title.label"} = "Title"; - $var->{"subject.label"} = "Subject"; - $var->{"status.label"} = "Status"; - $var->{"date.label"} = "Date"; + $var->{"add.label"} = "Add"; + $var->{"addlink.label"} = "Add a link."; + $var->{"addquestion.label"} = "Add a question."; + $var->{'all.label'} = "All Words"; + $var->{'atleastone.label'} = "At Least One"; $var->{"approve.label"} = "Approve"; + $var->{'answer.label'} = "Answer"; + $var->{'attachment.label'} = "Attachment"; + $var->{"by.label"} = "By"; + $var->{'body.label'} = "Body"; + $var->{"back.label"} = "Back"; + $var->{'contentType.label'} = "Content Type"; + $var->{"date.label"} = "Date"; $var->{"delete.label"} = "Delete"; + $var->{'description.label'} = "Description"; $var->{"deny.label"} = "Deny"; $var->{"edit.label"} = "Edit"; - $var->{"reply.label"} = "Reply"; - $var->{"views.label"} = "Views"; + $var->{'endDate.label'} = "End Date"; + $var->{'exactphrase.label'} = "Exact Phrase"; + $var->{"flat.label"} = "Flat"; + $var->{'image.label'} = "Image"; + $var->{'link.header.label'} = "Edit Link"; + $var->{"lock.label"} = "Lock"; + $var->{"layout.label"} = "Layout"; + $var->{'message.header.label'} = "Edit Message"; + $var->{'message.label'} = "Message"; + $var->{"next.label"} = "Next"; + $var->{'newWindow.label'} = "Open in new window?"; + $var->{"nested.label"} = "Nested"; + $var->{"previous.label"} = "Previous"; + $var->{"post.label"} = "Add a post."; + $var->{'question.label'} = "Question"; + $var->{'question.header.label'} = "Edit Question"; $var->{"rating.label"} = "Rating"; $var->{"rate.label"} = "Rate"; - $var->{"layout.label"} = "Layout"; - $var->{"nested.label"} = "Nested"; - $var->{"threaded.label"} = "Threaded"; - $var->{"flat.label"} = "Flat"; - $var->{"lock.label"} = "Lock"; - $var->{"unlock.label"} = "Unlock"; - $var->{"stick.label"} = "Make Sticky"; - $var->{"unstick.label"} = "Unstick"; + $var->{"reply.label"} = "Reply"; + $var->{"readmore.label"} = "Read More"; + $var->{"responses.label"} = "Responses"; + $var->{'results.label'} = "Results"; + $var->{"search.label"} = "Search"; + $var->{'subject.label'} = "Subject"; $var->{"subscribe.label"} = "Subscribe"; + $var->{'submission.header.label'} = "Edit Submission"; + $var->{'startDate.label'} = "Start Date"; + $var->{"stick.label"} = "Make Sticky"; + $var->{"subject.label"} = "Subject"; + $var->{"status.label"} = "Status"; + $var->{"thumbnail.label"} = "Thumbnail"; + $var->{"title.label"} = "Title"; + $var->{"threaded.label"} = "Threaded"; + $var->{"unlock.label"} = "Unlock"; + $var->{"unstick.label"} = "Unstick"; $var->{"unsubscribe.label"} = "Unsubscribe"; - $var->{"previous.label"} = "Previous"; - $var->{"next.label"} = "Next"; - $var->{"next.label"} = "Search"; - $var->{"back.label"} = "Back"; - $var->{"add.label"} = "Add"; + $var->{'url.label'} = "URL"; + $var->{"user.label"} = "User"; + $var->{"views.label"} = "Views"; + $var->{'visitorName.label'} = "Visitor Name"; + $var->{'without.label'} = "Without"; } #------------------------------------------------------------------- sub canModerate { - my $shift; + my $self = shift; return WebGUI::Grouping::isInGroup($self->get("moderateGroupId")) || $self->canEdit; } #------------------------------------------------------------------- sub canPost { - my $shift; + my $self = shift; return WebGUI::Grouping::isInGroup($self->get("postGroupId")) || $self->canModerate; } @@ -110,7 +176,7 @@ sub canSubscribe { #------------------------------------------------------------------- sub canView { - my $shift; + my $self = shift; return $self->SUPER::canView || $self->canPost; } @@ -373,7 +439,7 @@ sub getEditForm { -name=>"sortOrder", -value=>[$self->getValue("sortOrder")], -options=>{ - asc=>"Ascending" + asc=>"Ascending", desc=>"Descending" }, -label=>"Sort Order" @@ -698,24 +764,18 @@ sub view { } WebGUI::Session::setScratch($scratchSortDir, $sortDir); } - my $numResults = $self->get("threadsPerPage"); my %var; - $var{"readmore.label"} = "Read More"; - $var{"responses.label"} = "Responses"; - $var{"post.label"} = "Add a post."; - $var{"addquestion.label"} = "Add a question."; - $var{"addlink.label"} = "Add a link."; - $var{"search.label"} = "Search"; - $var{"title.label"} = WebGUI::International::get(99); - $var{"thumbnail.label"} = WebGUI::International::get(52,"USS"); - $var{"date.label"} = WebGUI::International::get(13,"USS"); - $var{"date.updated.label"} = WebGUI::International::get(78,"USS"); - $var{"by.label"} = WebGUI::International::get(21,"USS"); - $var{"submission.edit.label"} = WebGUI::International::get(27,"USS"); - $var{canPost} = $self->canPost; + $var{'user.canPost'} = $self->canPost; $var{"post.url"} = $self->getNewThreadUrl; $var{"rss.url"} = $self->getRssUrl; - $var{canModerate} = $self->canModerate; + $var{'user.isModerator'} = $self->canModerate; + $var{'user.isVisitor'} = ($session{user}{userId} eq '1'); + $var{'user.isSubscribed'} = $self->isSubscribed; + $var{'sortby.date.url'} = $self->getSortByUrl("date"); + $var{'sortby.lastreply.url'} = $self->getSortByUrl("lastreply"); + $var{'sortby.views.url'} = $self->getSortByUrl("views"); + $var{'sortby.replies.url'} = $self->getSortByUrl("replies"); + $var{'sortby.rating.url'} = $self->getSortByUrl("rating"); WebGUI::Style::setLink($var{"rss.url"},{ rel=>'alternate', type=>'application/rss+xml', title=>'RSS' }); #$var{"search.Form"} = WebGUI::Search::form({func=>'view',search=>1}); #$var{"search.url"} = WebGUI::Search::toggleURL("func=view"); @@ -733,66 +793,14 @@ sub view { } $constraints .= ")"; #} - my $p = WebGUI::Paginator->new($self->getUrl,$numResults); my $sql = "select * from Thread left join asset on Thread.assetId=asset.assetId left join Post on Post.assetId=asset.assetId where Thread.parentId=".quote($self->getId)." and asset.state='published' and asset.className='WebGUI::Asset::Post::Thread' and $constraints order by ".$self->getValue("sortBy")." ".$self->getValue("sortOrder"); - $p->setDataByQuery($sql); - my $page = $p->getPageData; - my $i = 0; - my $imageURL = ""; - foreach my $row (@$page) { - my $post = WebGUI::Asset::Post->newByPropertyHashRef($row); - $post->{_parent} = $self; # caching parent for efficiency - my $controls = deleteIcon('func=delete',$post->get("url"),"Delete").editIcon('func=edit',$post->get("ur")); - if ($self->get("sortBy") eq "lineage") { - if ($self->get("sortOrder") eq "desc") { - $controls .= moveUpIcon('func=demote',$post->get("url")).moveDownIcon('func=promote',$post->get("url")); - } else { - $controls .= moveUpIcon('func=promote',$post->get("url")).moveDownIcon('func=demote',$post->get("url")); - } - } - my $inDateRange; - if ($post->get("startDate") < WebGUI::DateTime::time() && $post->get("endDate") > WebGUI::DateTime::time()) { - $inDateRange = 1; - } else { - $inDateRange = 0; - } - push(@{$var{submissions_loop}}, { - "id"=>$post->getId, - "url"=>$post->getUrl, - "synopsis"=>$post->get("synopsis"), - "content"=>$self->formatContent, - "reply.count"=>$post->get("replies"), - "title"=>$post->get("title"), - "userDefined1"=>$post->get("userDefined1"), - "userDefined2"=>$post->get("userDefined2"), - "userDefined3"=>$post->get("userDefined3"), - "userDefined4"=>$post->get("userDefined4"), - "userDefined5"=>$post->get("userDefined5"), - "userId"=>$post->get("userId"), - "username"=>$post->get('username'), - "status"=>$self->status($post->get("status")), - # "thumbnail"=>$submission->getThumbnailUrl, - # "submission.image"=>$submission->getImageUrl, - "date.submitted"=>epochToHuman($post->get("dateSubmitted")), - "date.updated"=>epochToHuman($post->get("dateUpdated")), - "userProfile.url"=>$post->getUserProfileUrl, - "edit.url"=>$post->getEditUrl, - 'controls'=>$controls, - 'inDateRange'=>$inDateRange, - "isSecond"=>(($i+1)%2==0), - "isThird"=>(($i+1)%3==0), - "isFourth"=>(($i+1)%4==0), - "isFifth"=>(($i+1)%5==0), - "currentUserIsPoster"=>$post->isPoster - }); - $i++; - } - $p->appendTemplateVars(\%var); + my $p = WebGUI::Paginator->new($self->getUrl,$self->get("threadsPerPage")); + $self->appendPostListTemplateVars(\%var, $sql, $p); return $self->processTemplate(\%var,$self->get("collaborationTemplateId")); } @@ -820,41 +828,33 @@ sub www_search { WebGUI::Session::setScratch($self->getId."_without",$session{form}{without}); WebGUI::Session::setScratch($self->getId."_numResults",$session{form}{numResults}); my %var; - $var{'callback.label'} = WebGUI::International::get(1039); - $var{'form.begin'} = WebGUI::Form::formHeader({action=>$self->getUrl}); - $var{'form.begin'} .= WebGUI::Form::hidden({ name=>"forumOp", value=>"search" }); - $var{'form.begin'} .= WebGUI::Form::hidden({ name=>"doit", value=>1 }); - $var{'form.begin'} .= WebGUI::Form::hidden({ name=>"forumId", value=>$session{form}{forumId} }); - $var{'search.label'} = WebGUI::International::get(364); - $var{'all.label'} = WebGUI::International::get(530); + $var{'form.begin'} = WebGUI::Form::formHeader({action=>$self->getUrl}) + .WebGUI::Form::hidden({ name=>"func", value=>"search" }) + .WebGUI::Form::hidden({ name=>"doit", value=>1 }); $var{'all.form'} = WebGUI::Form::text({ name=>'all', - value=>$session{scratch}{all}, + value=>$session{scratch}{$self->getId."_all"}, size=>($session{setting}{textBoxSize}-5) }); - $var{'exactphrase.label'} = WebGUI::International::get(531); $var{'exactphrase.form'} = WebGUI::Form::text({ name=>'exactPhrase', - value=>$session{scratch}{exactPhrase}, + value=>$session{scratch}{$self->getId."_exactPhrase"}, size=>($session{setting}{textBoxSize}-5) }); - $var{'atleastone.label'} = WebGUI::International::get(532); $var{'atleastone.form'} = WebGUI::Form::text({ name=>'atLeastOne', - value=>$session{scratch}{atLeastOne}, + value=>$session{scratch}{$self->getId."_atLeastOne"}, size=>($session{setting}{textBoxSize}-5) }); - $var{'without.label'} = WebGUI::International::get(533); $var{'without.form'} = WebGUI::Form::text({ name=>'without', - value=>$session{scratch}{without}, + value=>$session{scratch}{$self->getId."_without"}, size=>($session{setting}{textBoxSize}-5) }); - $var{'results.label'} = WebGUI::International::get(529); my %results; tie %results, 'Tie::IxHash'; %results = (10=>'10', 25=>'25', 50=>'50', 100=>'100'); - my $numResults = $session{scratch}{numResults} || 25; + my $numResults = $session{scratch}{$self->getId."_numResults"} || $self->get("threadsPerPage"); $var{'results.form'} = WebGUI::Form::selectList({ name=>"numResults", options=>\%results, @@ -862,43 +862,86 @@ sub www_search { }); $var{'form.search'} = WebGUI::Form::submit({value=>WebGUI::International::get(170)}); $var{'form.end'} = WebGUI::Form::formFooter(); - $var{'thread.list.url'} = formatForumURL($caller->{callback},$forum->get("forumId")); - $var{'thread.list.label'} = WebGUI::International::get(1019); + $var{'back.url'} = $self->getUrl; $var{doit} = $session{form}{doit}; if ($session{form}{doit}) { - $var{'post.subject.label'} = WebGUI::International::get(229); - $var{'post.date.label'} = WebGUI::International::get(245); - $var{'post.user.label'} = WebGUI::International::get(244); - my $constraints = WebGUI::Search::buildConstraints([qw(a.subject a.username a.message)]); - my $query = "select a.forumPostId, a.subject, a.userId, a.username, a.dateOfPost from forumPost a left join forumThread b - on a.forumThreadId=b.forumThreadId where b.forumId=".quote($forum->get("forumId"))." and - (a.status='approved' or a.status='archived') and $constraints order by a.dateOfPost desc"; - my $p = WebGUI::Paginator->new(WebGUI::URL::append($caller->{callback},"forumOp=search&doit=1&forumId=".quote($forum->get("forumId"))), $numResults); - $p->setDataByQuery($query) if $constraints; - my @post_loop; - foreach my $row (@{$p->getPageData}) { - push(@post_loop,{ - 'post.subject'=>$row->{subject}, - 'post.url'=>formatThreadURL($caller->{callback},$row->{forumPostId}), - 'post.user.name'=>$row->{username}, - 'post.user.id'=>$row->{userId}, - 'post.user.profile'=>formatUserProfileURL($row->{userId}), - 'post.epoch'=>$row->{dateOfPost}, - 'post.date'=>formatPostDate($row->{dateOfPost}), - 'post.time'=>formatPostTime($row->{dateOfPost}) - }); - } - $var{post_loop} = \@post_loop; - $var{firstPage} = $p->getFirstPageLink; - $var{lastPage} = $p->getLastPageLink; - $var{nextPage} = $p->getNextPageLink; - $var{pageList} = $p->getPageLinks; - $var{previousPage} = $p->getPreviousPageLink; - $var{multiplePages} = ($p->getNumberOfPages > 1); - $var{numberOfPages} = $p->getNumberOfPages; - $var{pageNumber} = $p->getPageNumber; + my @fieldsToSearch = qw(asset.title asset.synopsis Post.content Post.username Post.userDefined1 Post.userDefined2 Post.userDefined3 Post.userDefined4 Post.userDefined5); + my $all; + if ($session{scratch}{$self->getId."_all"} ne "") { + $session{scratch}{$self->getId."_all"} =~ s/,/ /g; + $session{scratch}{$self->getId."_all"} =~ s/\s+/ /g; + my @words = split(/ /,$session{scratch}{$self->getId."_all"}); + foreach my $word (@words) { + $all .= " and " if ($all ne ""); + $all .= "("; + my $allSub; + foreach my $field (@fieldsToSearch) { + $allSub .= " or " if ($allSub ne ""); + $allSub .= " $field like ".quote("%".$word."%"); + } + $all .= $allSub; + $allSub = ""; + $all .= ")"; + } + } + my $exactPhrase; + if ($session{scratch}{$self->getId."_exactPhrase"} ne "") { + foreach my $field (@fieldsToSearch) { + $exactPhrase .= " or " if ($exactPhrase ne ""); + $exactPhrase .= " $field like ".quote("%".$session{scratch}{$self->getId."_exactPhrase"}."%"); + } + } + my $atLeastOne; + if ($session{scratch}{$self->getId."_atLeastOne"} ne "") { + $session{scratch}{$self->getId."_atLeastOne"} =~ s/,/ /g; + $session{scratch}{$self->getId."_atLeastOne"} =~ s/\s+/ /g; + my @words = split(/ /,$session{scratch}{$self->getId."_atLeastOne"}); + foreach my $word (@words) { + foreach my $field (@fieldsToSearch) { + $atLeastOne .= " or " if ($atLeastOne ne ""); + $atLeastOne .= " $field like ".quote("%".$word."%"); + } + } + } + my $without; + if ($session{scratch}{$self->getId."_without"} ne "") { + $session{scratch}{$self->getId."_without"} =~ s/,/ /g; + $session{scratch}{$self->getId."_without"} =~ s/\s+/ /g; + my @words = split(/ /,$session{scratch}{$self->getId."_without"}); + foreach my $word (@words) { + foreach my $field (@fieldsToSearch) { + $without .= " and " if ($without ne ""); + $without .= " $field not like ".quote("%".$word."%"); + } + } + } + # please note that the SQL generated here-in is not for the feint of heart, mind, or stomach + # this is for trained professionals only and should not be attempted at home + my $sql = "select * + from asset + left join Post on Post.assetId=asset.assetId + left join Thread on Thread.assetId=asset.assetId + where (asset.className='WebGUI::Asset::Post' or asset.className='WebGUI::Asset::Post::Thread') + and asset.lineage like ".quote($self->get("lineage").'%')." + and asset.assetId<>".quote($self->getId)." + and ( + Post.status in ('approved','archived')"; + $sql .= " or Post.status='pending'" if ($self->canModerate); + $sql .= " or (asset.ownerUserId=".quote($session{user}{userId})." and asset.ownerUserId<>'1') + ) + and "; + $sql .= "($all) " if ($all ne ""); + $sql .= " and " if ($sql ne "" && $exactPhrase ne ""); + $sql .= " ($exactPhrase) " if ($exactPhrase ne ""); + $sql .= " and " if ($sql ne "" && $atLeastOne ne ""); + $sql .= " ($atLeastOne) " if ($atLeastOne ne ""); + $sql .= " and " if ($sql ne "" && $without ne ""); + $sql .= " ($without) " if ($without ne ""); + $sql .= " order by Post.dateSubmitted desc"; + my $p = WebGUI::Paginator->new($self->getUrl("func=search&doit=1"),$numResults); + $self->appendPostListTemplateVars(\%var, $sql, $p); } - return WebGUI::Template::process($forum->get("searchTemplateId"),"Forum/Search", \%var); + return $self->processStyle($self->processTemplate(\%var, $self->get("searchTemplateId"))); } #------------------------------------------------------------------- @@ -990,7 +1033,7 @@ sub www_viewRSS { ~; $i++; - last if ($i == $$self->get("threadsPerPage"); + last if ($i == $self->get("threadsPerPage")); } $xml .=qq~ @@ -1005,221 +1048,5 @@ sub www_viewRSS { 1; -package WebGUI::Search; - -=head1 LEGAL - - ------------------------------------------------------------------- - WebGUI is Copyright 2001-2005 Plain Black Corporation. - ------------------------------------------------------------------- - 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 - ------------------------------------------------------------------- - -=cut - - -use strict; -use Tie::IxHash; -use WebGUI::HTMLForm; -use WebGUI::International; -use WebGUI::Session; -use WebGUI::SQL; - - -=head1 NAME - -Package WebGUI::Search - -=head1 DESCRIPTION - -A package built to take the hassle out of creating advanced search functionality in WebGUI applications. - -=head1 SYNOPSIS - - use WebGUI::Search; - $sql = WebGUI::Search::buildConstraints(\@fields); - $html = WebGUI::Search::form(\%hidden); - -=head1 METHODS - -These methods are available from this package: - -=cut - - -#------------------------------------------------------------------- - -=head2 buildConstraints ( fieldList ) { [ all, atLeastOne, exactPhrase, without ] } - -Generates and returns the constraints to an SQL where clause based upon input from the user. - -=head3 fieldList - -An array reference that contains a list of the fields (table columns) to be considered when searching. - -=head3 all - -A form param with a comma or space separated list of key words to search for in the fields of the fieldList. All the words listed here must be found to be true. - -=head3 atLeastOne - -A form param with a comma or space separated list of key words to search for in the fields of the fieldList. Any of the words may match in any of the fields for this to be true. - -=head3 exactPhrase - -A form param with a phrase to search for in the fields of the fieldList. The exact phrase must be found in one of the fields to be true. - -=head3 without - -A form param with a comma or space separated list of key words to search for in the fields of the fieldList. None of the words may be found in any of the fields for this to be true. - -=cut - -sub buildConstraints { - my ($field, $all, $allSub, $exactPhrase, $atLeastOne, $without, @words, $word, $sql); - if ($session{scratch}{all} ne "") { - $session{scratch}{all} =~ s/,/ /g; - $session{scratch}{all} =~ s/\s+/ /g; - @words = split(/ /,$session{scratch}{all}); - foreach $word (@words) { - $all .= " and " if ($all ne ""); - $all .= "("; - foreach $field (@{$_[0]}) { - $allSub .= " or " if ($allSub ne ""); - $allSub .= " $field like ".quote("%".$word."%"); - } - $all .= $allSub; - $allSub = ""; - $all .= ")"; - } - } - if ($session{scratch}{exactPhrase} ne "") { - foreach $field (@{$_[0]}) { - $exactPhrase .= " or " if ($exactPhrase ne ""); - $exactPhrase .= " $field like ".quote("%".$session{scratch}{exactPhrase}."%"); - } - } - if ($session{scratch}{atLeastOne} ne "") { - $session{scratch}{atLeastOne} =~ s/,/ /g; - $session{scratch}{atLeastOne} =~ s/\s+/ /g; - @words = split(/ /,$session{scratch}{atLeastOne}); - foreach $word (@words) { - foreach $field (@{$_[0]}) { - $atLeastOne .= " or " if ($atLeastOne ne ""); - $atLeastOne .= " $field like ".quote("%".$word."%"); - } - } - } - if ($session{scratch}{without} ne "") { - $session{scratch}{without} =~ s/,/ /g; - $session{scratch}{without} =~ s/\s+/ /g; - @words = split(/ /,$session{scratch}{without}); - foreach $word (@words) { - foreach $field (@{$_[0]}) { - $without .= " and " if ($without ne ""); - $without .= " $field not like ".quote("%".$word."%"); - } - } - } - $sql = "($all) " if ($all ne ""); - $sql .= " and " if ($sql ne "" && $exactPhrase ne ""); - $sql .= " ($exactPhrase) " if ($exactPhrase ne ""); - $sql .= " and " if ($sql ne "" && $atLeastOne ne ""); - $sql .= " ($atLeastOne) " if ($atLeastOne ne ""); - $sql .= " and " if ($sql ne "" && $without ne ""); - $sql .= " ($without) " if ($without ne ""); - return $sql; -} - -#------------------------------------------------------------------- - -=head2 form ( hiddenFields ) { [ numResults ] } - -Generates and returns the advanced search form. - -=head3 hiddenFields - -A hash reference that contains any name/value pairs that should be included as hidden fields in the search form. - -=head3 numResults - -A form param that can optionally specify the number of results to display. Defaults to 25. - -=cut - -sub form { - WebGUI::Session::setScratch("all",$session{form}{all}); - WebGUI::Session::setScratch("atLeastOne",$session{form}{atLeastOne}); - WebGUI::Session::setScratch("exactPhrase",$session{form}{exactPhrase}); - WebGUI::Session::setScratch("without",$session{form}{without}); - WebGUI::Session::setScratch("numResults",$session{form}{numResults}); - my ($key, $numResults, $output, $f, $resultsText, %results); - tie %results, 'Tie::IxHash'; - $numResults = $session{scratch}{numResults} || 25; - $resultsText = WebGUI::International::get(529); - %results = (10=>'10 '.$resultsText, 25=>'25 '.$resultsText, 50=>'50 '.$resultsText, 100=>'100 '.$resultsText); - $f = WebGUI::HTMLForm->new(1); - foreach $key (keys %{$_[0]}) { - $f->hidden($key,${$_[0]}{$key}); - } - $output = ''; - $f->raw(''); - $output .= $f->print; - $output .= '
'; - $output .= '

'.WebGUI::International::get(364).'

'; - $output .= '		'); - $f->raw(''); - $f->raw(''); - $f->raw(''); - $f->raw(''); - $f->raw(''); - $f->raw('
'.WebGUI::International::get(530).''); - $f->text('all','',$session{scratch}{all},'','','',($session{setting}{textBoxSize}-5)); - $f->raw('
'.WebGUI::International::get(531).''); - $f->text('exactPhrase','',$session{scratch}{exactPhrase},'','','',($session{setting}{textBoxSize}-5)); - $f->raw('
'.WebGUI::International::get(532).''); - $f->text('atLeastOne','',$session{scratch}{atLeastOne},'','','',($session{setting}{textBoxSize}-5)); - $f->raw('
'.WebGUI::International::get(533).''); - $f->text('without','',$session{scratch}{without},'','','',($session{setting}{textBoxSize}-5)); - $f->raw('
'); - $f->raw('		'); - $f->selectList("numResults",\%results,'',[$numResults]); - $f->raw('

'); - $f->submit(WebGUI::International::get(170)); - $f->raw('

'; - return $output; -} - -#------------------------------------------------------------------- - -=head2 toggleURL ( [ pairs ] ) - -Returns a URL that toggles the value "search" in the user's scratch -variables on and off. - -=head3 pairs - -URL name value pairs (this=that&foo=bar) to be passed with this toggle. - -=cut - -sub toggleURL { - my $pairs = shift; - my $url = shift || $session{page}{urlizedTitle}; - WebGUI::Session::setScratch("search",$session{form}{search}); - if ($session{scratch}{search}) { - $url = WebGUI::URL::gateway($url,"search=0"); - } else { - $url = WebGUI::URL::gateway($url,"search=1"); - } - $url = WebGUI::URL::append($url,$pairs) if ($pairs); - return $url; -} - -1; diff --git a/lib/WebGUI/Forum/UI.pm b/lib/WebGUI/Forum/UI.pm index 6f53a3c3f..4eacb3578 100644 --- a/lib/WebGUI/Forum/UI.pm +++ b/lib/WebGUI/Forum/UI.pm @@ -1045,7 +1045,7 @@ sub getForumTemplateVars { } else { $last = WebGUI::Forum::Post->new($thread->{lastPostId}); } - my @rating_loop; + Yy @rating_loop; for (my $i=0;$i<=$thread->{rating};$i++) { push(@rating_loop,{'thread.rating_loop.count'=>$i}); }