Merge remote-tracking branch 'origin/emailMgmt'

[gigi.git] / src / org / cacert / gigi / email / EmailProvider.java

diff --git a/src/org/cacert/gigi/email/EmailProvider.java b/src/org/cacert/gigi/email/EmailProvider.java
index 0efe603e42cf77fc161049566d5f4a0bcd519533..6855f398d1332f73dccebb9bf70aeb2592751f7b 100644 (file)
--- a/src/org/cacert/gigi/email/EmailProvider.java
+++ b/src/org/cacert/gigi/email/EmailProvider.java
@@ -23,6 +23,10 @@ public abstract class EmailProvider {
                return instance;
        }
 
+       protected static void setInstance(EmailProvider instance) {
+               EmailProvider.instance = instance;
+       }
+
        public static void init(Properties conf) {
                try {
                        Class<?> c = Class.forName(conf.getProperty("emailProvider"));
@@ -34,7 +38,7 @@ public abstract class EmailProvider {
 
        public static final String OK = "OK";
        public static final String FAIL = "FAIL";
-       private static final Pattern MAIL = Pattern
+       public static final Pattern MAIL = Pattern
                .compile("^([a-zA-Z0-9])+([a-zA-Z0-9\\+\\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\\._-]+)+$");
 
        public String checkEmailServer(int forUid, String address) throws IOException {