Changeset 1278

Timestamp:

12/12/08 03:30:59 (3 years ago)

Author:

SvenDowideit

Message:

Item137: looks like sendmail is returning 67, when its log file says its returning 75, so I can't actually test the exit value at all :(. ammended the opps message instead, to give users hope.

Location:

trunk/core

Files:

• lib/Foswiki/Net.pm (modified) (3 diffs)
• templates/messages.tmpl (modified) (2 diffs)

trunk/core/lib/Foswiki/Net.pm

@@ -226 +226 @@
     '$Rev: 13594 $' =~ /([0-9]+)/;
     my $revstr = $1;
-    $request->header( 'User-Agent' => 'Foswiki::Net/' 
+    $request->header( 'User-Agent' => 'Foswiki::Net/'
           . $revstr
           . " libwww-perl/$LWP::VERSION" );
@@ -339 +339 @@
 
             unless ( $e =~ /^ERROR/ ) {
-                $e = "Mail could not be sent - see Foswiki warning log.";
+                $e = "Mail could not be sent - please ask your %WIKIWEBMASTER% to look at the Foswiki warning log.";
             }
             $errors .= $e . "\n";
@@ -373 +373 @@
     print MAIL $text;
     close(MAIL);
-    die "ERROR: Exit code $? from Foswiki::cfg{MailProgram}" if $?;
+    #SMELL: this is bizzare. on a freeBSD server, I've seen sendmail return 17152
+    #(17152 >> 8) == 67 == EX_NOUSER - however, the mail log says that the error was
+    #EX_TEMPFAIL == 75, and that (as per oreilly book) the email is cued. The email
+    #does reach the user, but they are very confused because they were told that the
+    #rego failed completely.
+    #Sven has ameneded the oops_message for the verify emails to be less positive that
+    #everything has failed, but.
+    die "ERROR: Exit code ".($? << 8)." ($?) from Foswiki::cfg{MailProgram}" if $?;
 }
 

trunk/core/templates/messages.tmpl

@@ -241 +241 @@
 ---+++ %MAKETEXT{"Error registering new user"}%
 
-%MAKETEXT{"Internal error when sending email to [_1]." args="%PARAM1%"}%
-
+%MAKETEXT{"While attempting to email [_1]." args="%PARAM1%"}%
+
+%MAKETEXT{"Your registration verification email has either failed, or is queued in the mail system."}%
+
+%MAKETEXT{"If you don't receive a verification email within the next hour, "}%
 %MAKETEXT{"Please contact [_1]." args="%WIKIWEBMASTER%"}%
 
-%MAKETEXT{"You have *not* been registered."}%
+
 %TMPL:END%
 %TMPL:DEF{"send_mail_error"}%
@@ -410 +413 @@
 %MAKETEXT{"Check your configuration settings for {TemplateDir} and {TemplatePath}. If that's not the problem, it may be because you have a setting of [_1] that is pointing to a template that doesn't exist." args="=%PARAM2%="}%
 
-%MAKETEXT{"[_1] is currently set to [_2]" args="=%PARAM2%=,<code><nop>%PARAM1%</code>"}% 
+%MAKETEXT{"[_1] is currently set to [_2]" args="=%PARAM2%=,<code><nop>%PARAM1%</code>"}%
 
 (%MAKETEXT{"don't forget to check your Topic Settings"}%)