[cvs] expresso commit by mtraum: set default MAILServer and MAILFrom setup

[JCorporate Ltd]

Log Message:
-----------
set default MAILServer and MAILFrom setup values to "" and check for this when sending email to give better error logging when setting up a new expresso install

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc:
        EMailSender.java
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core:
        ExpressoSchema.java

Revision Data
-------------
Index: EMailSender.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java -u -r1.23 -r1.24
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/misc/EMailSender.java
@@ -429,9 +429,17 @@
     public void send() throws Exception {
         // The From header value
         String myFrom = getFromAddress();
+        if (myFrom == null || "".equals(myFrom)) {
+            log.error("From address cannot be null. Maybe 'MAILFrom' Setup value is not set?");
+            throw new Exception("'From' address cannot be null. Maybe 'MAILFrom' Setup value is not set?");
+        }
 
         // The SMTP server name
         String myHost = getSMTPHost();
+        if (myHost == null || "".equals(myHost)) {
+            log.error("Mail Server address cannot be null. Maybe 'MAILServer' Setup value is not set?");
+            throw new Exception("Mail Server address cannot be null. Maybe 'MAILServer' Setup value is not set?");
+        }
 
         // The SMTP user name - if null, authenticated session is not used
         String myUser = getSMTPUser();
Index: ExpressoSchema.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java -u -r1.53 -r1.54
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/ExpressoSchema.java
@@ -345,13 +345,13 @@
                 getSetupDefault("HTTPServ", "javacorp"));
         addSetup("MAILFrom",
                 getString("Value_for_From_field_in_Ev"),
-                getSetupDefault("MAILFrom", "none"));
+                getSetupDefault("MAILFrom", ""));
         addSetup("MAILPassword",
                 getString("Password_for_sending_e-mai"),
                 getSetupDefault("MAILPassword", ""));
         addSetup("MAILServer",
                 getString("SMTP_Server_Name_for_sendi"),
-                getSetupDefault("MAILServer", "example.org"));
+                getSetupDefault("MAILServer", ""));
         addSetup("MAILUserName",
                 getString("User_Name_for_sending_e-ma"),
                 getSetupDefault("MAILUserName", ""));