Changeset 1531

Timestamp:

04/23/08 09:06:13 (23 months ago)

Author:

JensDiemer

Message:

EMailSystem Plugin: Don't display the input form, if the user account has no valid email address.

Files:

• trunk/pylucid/PyLucid/plugins_internal/EMailSystem/EMailSystem.py (modified) (4 diffs)

trunk/pylucid/PyLucid/plugins_internal/EMailSystem/EMailSystem.py

@@ -70 +70 @@
             raise SendMailError(_("No recipient left."))
 
-        sender = self._get_sender()
+        try:
+            sender = self._get_sender()
+        except NoValidSender, e:
+            self.page_msg.red(e)
+            return
 
         try:
@@ -85 +89 @@
         test_sender = EMailForm({"email": self.request.user.email})
         if not test_sender.is_valid():
-            self.page_msg.red(_(
+            raise NoValidSender(_(
                 "You can't send emails,"
                 " your user account has no valid email address."
             ))
-            return
+
         sender = test_sender.cleaned_data["email"]
         return sender
@@ -97 +101 @@
         form for sending mails to the django members.
         """
+        # Change the global page title:
+        self.context["PAGE"].title = _("EMail system")
+
         if settings.ALLOW_SEND_MAILS != True:
             self.page_msg(_("Sending mails deny in your settings.py!"))
             return
 
-        sender = self._get_sender()
+        try:
+            sender = self._get_sender()
+        except NoValidSender, e:
+            self.page_msg.red(e)
+            return
 
         if self.request.method == 'POST':
@@ -125 +136 @@
 class SendMailError(Exception):
     pass
+
+class NoValidSender(Exception):
+    """ The current User has no vaild email address in account data. """
+    pass