fix: create config variables for email addresses

fixes issue #74

Change-Id: I9761e4c27fd92365cb647b9be8f954c4c02ffba2

diff --git a/config/gigi.properties.template b/config/gigi.properties.template
index b90f534632f2508f05a2694ba650b9c916f2442b..5e939e2d3e644e77a8719f44d468af9aa65d9291 100644 (file)
--- a/config/gigi.properties.template
+++ b/config/gigi.properties.template
@@ -21,3 +21,8 @@ time.verificationMaxAgeMonths=24
 
 appName=SomeCA
 appIdentifier=someca
 
 appName=SomeCA
 appIdentifier=someca

+
+#mail.support=support@wpia.local
+#mail.board=board@wpia.local
+#mail.quiz=quiz@wpia.local
+#mail.quizAdmin=quiz-admin@wpia.local

diff --git a/src/club/wpia/gigi/util/ServerConstants.java b/src/club/wpia/gigi/util/ServerConstants.java
index 4e2d9c928fd82d9f173a486b93773dac5b720e7e..e2d459ba87cee5f98a07f84e047b7f9dc085b6c7 100644 (file)
--- a/src/club/wpia/gigi/util/ServerConstants.java
+++ b/src/club/wpia/gigi/util/ServerConstants.java
@@ -68,6 +68,14 @@ public class ServerConstants {
 
     private static String appIdentifier = null;
 
 
     private static String appIdentifier = null;
 

+    private static String mailSupport;
+
+    private static String mailBoard;
+
+    private static String mailQuiz;
+
+    private static String mailQuizAdmin;
+

     public static void init(Properties conf) {
         securePort = port = "";
         if ( !conf.getProperty("https.port").equals("443")) {
     public static void init(Properties conf) {
         securePort = port = "";
         if ( !conf.getProperty("https.port").equals("443")) {


@@ -93,6 +101,10 @@ public class ServerConstants {
         if (appIdentifier == null) {
             throw new Error("App identifier missing");
         }
         if (appIdentifier == null) {
             throw new Error("App identifier missing");
         }

+        mailSupport = conf.getProperty("mail.support", "support@" + suffix);
+        mailBoard = conf.getProperty("mail.board", "board@" + suffix);
+        mailQuiz = conf.getProperty("mail.quiz", "quiz@" + suffix);
+        mailQuizAdmin = conf.getProperty("mail.quizAdmin", "quiz-admin@" + suffix);

     }
 
     public static String getHostName(Host h) {
     }
 
     public static String getHostName(Host h) {


@@ -140,19 +152,19 @@ public class ServerConstants {
     }
 
     public static String getSupportMailAddress() {
     }
 
     public static String getSupportMailAddress() {

-        return "support@" + getSuffix();
+        return mailSupport;

     }
 
     public static String getBoardMailAddress() {
     }
 
     public static String getBoardMailAddress() {

-        return "board@" + getSuffix();
+        return mailBoard;

     }
 
     public static String getQuizMailAddress() {
     }
 
     public static String getQuizMailAddress() {

-        return "quiz@" + getSuffix();
+        return mailQuiz;

     }
 
     public static String getQuizAdminMailAddress() {
     }
 
     public static String getQuizAdminMailAddress() {

-        return "quiz-admin@" + getSuffix();
+        return mailQuizAdmin;

     }
 
     public static String getAppName() {
     }
 
     public static String getAppName() {