Codestriker: "Topic Text: CVS commit: * If there is a problem when a comment is cre..."

sits@use...

Topic title: CVS commit: * If there is a problem when a comment is cre...

Monday January 16, 2006 02:37:48

Download topic text | View in monospace font | Tab width set to 8 (change to 4)

Files in topic:
[Jump to] codestriker/CHANGELOG	1.180	{+4,-0}
[Jump to] codestriker/lib/Codestriker/Action/SubmitNewComment.pm	1.9	{+6,-4}
[Jump to] codestriker/lib/Codestriker/TopicListeners/Email.pm	1.15	{+17,-21}

[Add General Comment] to topic.

File codestriker/CHANGELOG (Revision 1.180)

[Add File Comment] [Top] [>>]


Line 16 \| Parallel		Line 16 \| Parallel
16	has now been fixed.	16	has now been fixed.
17	Submitted by Edwin Fine <edwin.m.fine@verizon.com>.	17	Submitted by Edwin Fine <edwin.m.fine@verizon.com>.
18		18
		19	* If there is a problem when a comment is created, the error message
		20	will correctly display in the AJAX'ed window. An example here is if
		21	$mailhost is incorrectly configured.
		22
19	* Fixed problem with Subversion repositories on Win32, where	23	* Fixed problem with Subversion repositories on Win32, where
20	Codestriker was unable to launch the svn program.	24	Codestriker was unable to launch the svn program.
21		25

File codestriker/lib/Codestriker/Action/SubmitNewComment.pm (Revision 1.9)

[Add File Comment] [<<] [Top] [>>]

 use strict;
+use HTML::Entities ();
 use Codestriker::Model::Comment;
 use Codestriker::Model::File;
 use Codestriker::Model::Topic;
     # Tell the listener classes that a comment has just been created.
     my $listener_response =
         Codestriker::TopicListeners::Manager::comment_create($topic, $comment);
-    if ( $listener_response ne '') {
-        $http_response->error($listener_response);
-    }
     if (defined $format && $format eq "xml") {
+        my $response = $listener_response ne '' ? $listener_response : 'OK';
         print $query->header(-content_type=>'text/xml');
         print "<?xml version=\"1.0\" encoding=\"UTF-8\" " .
                     "standalone=\"yes\"?>\n";
         print "<response><method>submitnewcomment</method>" .
-            "<result>OK</result></response>\n";
+            "<result>" . HTML::Entities::encode($response) .
+            "</result></response>\n";
     } else {
+        $http_response->error($listener_response) if $listener_response ne '';
         # Display a simple screen indicating that the comment has been
         # registered.  Clicking the Close button simply dismisses the
         # edit popup.  Leaving it # up will ensure the next editing

File codestriker/lib/Codestriker/TopicListeners/Email.pm (Revision 1.15)

[Add File Comment] [<<] [Top]

         "The topic was created with the following files:\n\n" .
         join("\n",@filenames);
-    $self->_send_topic_email($topic, 1, "Created", 1, $from, $to, $cc, $bcc,
+    return $self->_send_topic_email($topic, 1, "Created", 1, $from, $to, $cc,
-                             $notes);
+                                    $bcc, $notes);
-    return '';
 }
 sub topic_changed($$$$) {
     my @to_list = keys( %handled_addresses );
     if ( @to_list ) {
-        $self->send_topic_changed_email($user_that_made_the_change,
+        return $self->send_topic_changed_email($user_that_made_the_change,
-                    $topic_orig, $topic,@to_list);
+                                               $topic_orig, $topic,@to_list);
-        }
+    }
     return '';
 }
     if ( $Codestriker::email_send_options->{comments_sent_to_topic_author} ||
          $comment->{cc} ne "")
     {
-        if (!$self->doit(0, $comment->{topicid}, $from, $to,
+        return $self->doit(0, $comment->{topicid}, $from, $to,
-                        join(', ',@cc_recipients), $bcc,
+                           join(', ',@cc_recipients), $bcc,
-                        $subject, $body)) {
+                           $subject, $body);
-            return "Failed to send topic creation email";
-        }
     }
     return '';
     $self->doit($new, $topic->{topicid}, $from, $to, $cc, $bcc, $subject, $body);
 }
-# Send an email with the specified data.  Return false if the mail can't be
+# Send an email with the specified data.  Return a non-empty message if the
-# successfully delivered, true otherwise.
+# mail can't be successfully delivered, empty string otherwise.
 sub doit($$$$$$$$$) {
     my ($type, $new, $topicid, $from, $to, $cc, $bcc, $subject, $body) = @_;
-    return 1 if ($DEVNULL_EMAIL);
+    return '' if ($DEVNULL_EMAIL);
     my $smtp = Net::SMTP->new($Codestriker::mailhost);
-    defined $smtp || die "Unable to connect to mail server: $!";
+    defined $smtp || return "Unable to connect to mail server: $!";
     $smtp->mail($from);
-    $smtp->ok() || die "Couldn't set sender to \"$from\" $!, " .
+    $smtp->ok() || return "Couldn't set sender to \"$from\" $!, " .
         $smtp->message();
     # $to has to be defined.
     for (my $i = 0; $i <= $#receiver; $i++) {
         if ($receiver[$i] ne "") {
         $smtp->recipient($receiver[$i]);
-        $smtp->ok() || die "Couldn't send email to \"$receiver[$i]\" $!, " .
+        $smtp->ok() || return "Couldn't send email to \"$receiver[$i]\" $!, " .
             $smtp->message();
         } else {
             # Can't track down why, but sometimes an empty email address
     $smtp->datasend("\n");
     $smtp->datasend($body);
     $smtp->dataend();
-    $smtp->ok() || die "Couldn't send email $!, " . smtp->message();
+    $smtp->ok() || return "Couldn't send email $!, " . smtp->message();
     $smtp->quit();
-    $smtp->ok() || die "Couldn't send email $!, " . smtp->message();
+    $smtp->ok() || return "Couldn't send email $!, " . smtp->message();
-    return 1;
+    return '';
 }
 1;


Legend:
Removed
Changed
	Added

[Add General Comment] to topic.