diff --git a/WebContent/META-INF/context.xml b/WebContent/META-INF/context.xml index 6164251..60c9a83 100755 --- a/WebContent/META-INF/context.xml +++ b/WebContent/META-INF/context.xml @@ -4,8 +4,8 @@ - - + + diff --git a/src/zall/Zallery.java b/src/zall/Zallery.java index 1890c6d..c376586 100755 --- a/src/zall/Zallery.java +++ b/src/zall/Zallery.java @@ -12,7 +12,6 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; -import zall.util.ZalleryEmail; import zutil.db.DBConnection; import zutil.log.LogUtil; @@ -23,8 +22,8 @@ public class Zallery extends HttpServlet{ public static String WEBSITE_NAME = ""; public static String WEBSITE_URL = ""; - public static String WEBSITE_EMAIL = ""; - public static String WEBSITE_EMAIL_NICE = ""; + public static String ADMIN_EMAIL = ""; + public static String ADMIN_EMAIL_NICE = ""; public static String SMTP_HOST = ""; public static String ROOT_PATH = ""; public static String DATA_PATH = ""; @@ -46,15 +45,15 @@ public class Zallery extends HttpServlet{ if ("PATH TO DATA FOLDER".equals(context.lookup("java:comp/env/DATA_PATH"))) throw new ServletException("Zallery has not been properly configured, set proper configuration in Zallery.xml context file."); - WEBSITE_NAME = (String)context.lookup("java:comp/env/WEBSITE_NAME"); - WEBSITE_URL = (String)context.lookup("java:comp/env/WEBSITE_URL"); + WEBSITE_NAME = (String)context.lookup("java:comp/env/WEBSITE_NAME"); + WEBSITE_URL = (String)context.lookup("java:comp/env/WEBSITE_URL"); if( WEBSITE_URL.charAt(WEBSITE_URL.length()-1) != '/') WEBSITE_URL += "/"; - WEBSITE_EMAIL = (String)context.lookup("java:comp/env/WEBSITE_EMAIL"); - WEBSITE_EMAIL_NICE = (String)context.lookup("java:comp/env/WEBSITE_EMAIL_NICE"); - SMTP_HOST = (String)context.lookup("java:comp/env/SMTP_HOST"); - DATA_PATH = (String)context.lookup("java:comp/env/DATA_PATH"); + ADMIN_EMAIL = (String)context.lookup("java:comp/env/ADMIN_EMAIL"); + ADMIN_EMAIL_NICE = (String)context.lookup("java:comp/env/ADMIN_EMAIL_NICE"); + SMTP_HOST = (String)context.lookup("java:comp/env/SMTP_HOST"); + DATA_PATH = (String)context.lookup("java:comp/env/DATA_PATH"); LogUtil.setLevel("zall", Level.FINEST); //LogUtil.setLevel("zutil", Level.FINEST); @@ -86,14 +85,6 @@ public class Zallery extends HttpServlet{ return null; } - public static String getWebsiteName() { - return WEBSITE_NAME; - } - - public static String getWebsiteURL() { - return WEBSITE_URL; - } - // /mywebapp/servlet/MyServlet/a/b;c=123?d=789 public static String getUrl(HttpServletRequest req) { String reqUri = req.getRequestURI().toString(); diff --git a/src/zall/util/ZalleryEmail.java b/src/zall/util/ZalleryEmail.java index 06ad307..8c234df 100755 --- a/src/zall/util/ZalleryEmail.java +++ b/src/zall/util/ZalleryEmail.java @@ -2,7 +2,6 @@ package zall.util; import zall.Zallery; import zall.bean.User; -import zall.manager.AuthenticationManager; import zutil.db.DBConnection; import zutil.net.smtp.Email; import zutil.net.smtp.SmtpClient; @@ -22,15 +21,15 @@ public class ZalleryEmail { private static ResourceBundle lang = PropertyResourceBundle.getBundle(LANG_BASENAME, Locale.getDefault()); public static void sendVerificationEmail(User user) throws IOException { - String verifyUrl = Zallery.getWebsiteURL() + "?verfemail=" + user.generateEmailVerificationHash() + "&id=" + user.getId(); + String verifyUrl = Zallery.WEBSITE_URL + "?verfemail=" + user.generateEmailVerificationHash() + "&id=" + user.getId(); Email email = new Email(); - email.setFrom(Zallery.WEBSITE_EMAIL, Zallery.WEBSITE_EMAIL_NICE); + email.setFrom(Zallery.ADMIN_EMAIL, Zallery.ADMIN_EMAIL_NICE); email.setTo(user.getEmail()); - email.setSubject(lang.getString("email.registration.title") + Zallery.getWebsiteName()); + email.setSubject(lang.getString("email.registration.title") + Zallery.WEBSITE_NAME); email.setContentType(Email.ContentType.HTML); email.setMessage( - lang.getString("email.registration.body1") + " " + Zallery.getWebsiteName() + "." + + lang.getString("email.registration.body1") + " " + Zallery.WEBSITE_NAME + "." + "
" + lang.getString("email.registration.body2") + "

" + verifyUrl + "" + "

" + lang.getString("email.registration.body3")); @@ -42,13 +41,13 @@ public class ZalleryEmail { public static void sendActivationEmail(User user) throws IOException { Email email = new Email(); - email.setFrom(Zallery.WEBSITE_EMAIL, Zallery.WEBSITE_EMAIL_NICE); + email.setFrom(Zallery.ADMIN_EMAIL, Zallery.ADMIN_EMAIL_NICE); email.setTo(user.getEmail()); - email.setSubject(lang.getString("email.activation.title") + " " + Zallery.getWebsiteName()); + email.setSubject(lang.getString("email.activation.title") + " " + Zallery.WEBSITE_NAME); email.setContentType(Email.ContentType.HTML); email.setMessage( lang.getString("email.activation.body") + - "
" + Zallery.getWebsiteURL() + ""); + "
" + Zallery.WEBSITE_URL + ""); SmtpClient smtp = new SmtpClient(Zallery.SMTP_HOST); smtp.send(email); @@ -57,12 +56,12 @@ public class ZalleryEmail { public static void sendNewUserRegistrationToAdmin(User user, DBConnection db) throws SQLException, IOException { Email email = new Email(); - email.setFrom(Zallery.WEBSITE_EMAIL, Zallery.WEBSITE_EMAIL_NICE); - email.setSubject(lang.getString("email.activation.request.title") + " " + Zallery.getWebsiteName()); + email.setFrom(Zallery.ADMIN_EMAIL, Zallery.ADMIN_EMAIL_NICE); + email.setSubject(lang.getString("email.activation.request.title") + " " + Zallery.WEBSITE_NAME); email.setContentType(Email.ContentType.HTML); email.setMessage( lang.getString("email.activation.request.body") + - " " + Zallery.getWebsiteName() + ":" + + " " + Zallery.WEBSITE_NAME + ":" + "

Email: " + user.getEmail() + "" + "
Name: " + user.getName() + "" );