oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing some bugs relaed to cs mail replies

Browse source 
fixed a bug in the user manager where the user would take on the username/alias of the visitor
fixed a bug in error handling where debug was being spewed for errors in approriately
This commit is contained in:
JT Smith 2006-04-11 22:50:11 +00:00
parent 91c4083d8a
commit a7df0f7a55
9 changed files with 82 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/WebGUI/Workflow/Activity/GetCsMail.pm
View file

@ -43,7 +43,7 @@ These methods are available from this class:
#-------------------------------------------------------------------
=head2 addPost ( parent, class, message, user )
=head2 addPost ( parent, class, message, user, prefix )
Adds a post to this collaboration system.
@ -59,6 +59,10 @@ The message retrieved from WebGUI::Mail::Get.
The user doing the posting.
=head3 prefix
The mail prefix for this collaboration system.
=cut
sub addPost {
@ -66,6 +70,7 @@ sub addPost {
my $parent = shift;
my $message = shift;
my $user = shift;
my $prefix = shift;
my @attachments = ();
my $content = "";
my $class = (ref $parent eq "WebGUI::Asset::Wobject::Collaboration") ? "WebGUI::Asset::Post::Thread" : "WebGUI::Asset::Post";
@ -80,11 +85,26 @@ sub addPost {
push(@attachments, $part);
}
}
$prefix =~ s/\\/\\\\/g;
$prefix =~ s/\[/\\[/g;
$prefix =~ s/\]/\\]/g;
$prefix =~ s/\(/\\(/g;
$prefix =~ s/\)/\\)/g;
$prefix =~ s/\}/\\}/g;
$prefix =~ s/\{/\\{/g;
$prefix =~ s/\?/\\?/g;
$prefix =~ s/\./\\./g;
$prefix =~ s/\*/\\*/g;
$prefix =~ s/\+/\\+/g;
$prefix =~ s/\|/\\|/g;
$prefix =~ s/\//\\\//g;
my $title = $message->{subject};
$title =~ s/$prefix//;
my $post = $parent->addChild({
className=>$class,
title=>$message->{subject},
menuTitle => $message->{subject},
url=>$message->{subject},
title=>$title,
menuTitle =>$title,
url=>$title,
content=>$content,
ownerUserId=>$user->userId,
username=>$user->profileField("alias") || $user->username,
@ -171,9 +191,9 @@ sub execute {
$post = WebGUI::Asset->newByDynamicClass($self->session, $id);
}
if (defined $post && $cs->get("allowReplies") && $user->isInGroup($cs->get("postGroupId")) && ($user->isInGroup($cs->get("subscriptionGroupId")) || $user->isInGroup($post->get("subscriptionGroupId")))) {
$self->addPost($post, $message, $user);
$self->addPost($post, $message, $user, $cs->get("mailPrefix"));
} elsif ($user->isInGroup($cs->get("postGroupId")) && $user->isInGroup($cs->get("subscriptionGroupId"))) {
$self->addPost($cs, $message, $user);
$self->addPost($cs, $message, $user, $cs->get("mailPrefix"));
} else {
my $send = WebGUI::Mail::Send->create($self->session, {
to=>$message->{from},

10
lib/WebGUI/Workflow/Instance.pm
View file

@ -270,9 +270,17 @@ sub run {
$self->session->errorHandler->error("Pass in object came back undefined for activity (".$activity->getId.") using ".$class.", ".$method.", ".$params.".");
return "error";
}
$status = $activity->execute($object, $self);
$status = eval{$activity->execute($object, $self)};
if ($@) {
$self->session->errorHandler->error("Caught exception executing workflow activity ".$activity->getId." for instance ".$self->getId." which reported ".$@);
return "error";
}
} else {
$status = $activity->execute(undef, $self);
if ($@) {
$self->session->errorHandler->error("Caught exception executing workflow activity ".$activity->getId." for instance ".$self->getId." which reported ".$@);
return "error";
}
}
if ($status eq "complete") {
$self->set({"currentActivityId"=>$activity->getId, notifySpectre=>0});