aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-09-12 12:20:23 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-09-12 12:20:23 +0200
commit42c33cec8e79c293965acdf3032e3d393e37a776 (patch)
tree20c03bb579c63f1012f5f1987045633649313840
parent5e64f6a3958ac7b570757f02465598e8132f08f8 (diff)
downloadmoa-id-spss-42c33cec8e79c293965acdf3032e3d393e37a776.tar.gz
moa-id-spss-42c33cec8e79c293965acdf3032e3d393e37a776.tar.bz2
moa-id-spss-42c33cec8e79c293965acdf3032e3d393e37a776.zip
Update eMail address verification
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/MailHelper.java2
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java2
-rw-r--r--id/ConfigWebTool/src/main/resources/applicationResources_en.properties2
3 files changed, 2 insertions, 4 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/MailHelper.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/MailHelper.java
index caed3e469..3c1c2f141 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/MailHelper.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/MailHelper.java
@@ -22,8 +22,6 @@
*******************************************************************************/
package at.gv.egovernment.moa.id.configuration.helper;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java
index 5799c88b2..8e0f0b7f8 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/UserManagementAction.java
@@ -449,7 +449,7 @@ public class UserManagementAction extends BasicAction {
}
- String message = new String();
+ String message = LanguageHelper.getErrorString("error.mail.send", request);
if (authUser != null) {
UserDatabase dbuser = ConfigurationDBRead.getUserWithID(authUser.getUserID());
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index 22b063099..07c8d708d 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -344,7 +344,7 @@ webpages.openadminrequests.users.header=User accounts
webpages.openadminrequests.oas.header=Online-Applications
-validation.newuser.mailaddress=Validation of eMail address could not be completed.
+validation.newuser.mailaddress=Validation of eMail address completed.
validation.edituser.familyname.empty=The surname is blank.
validation.edituser.familyname.valid=The surname contains forbidden characters. The following characters are not allowed\: {0}