ziver/zallery
1
0
Fork 0
Code Pull requests Releases Activity

rename of configuration parameter

Browse source
This commit is contained in:
Ziver Koc 2018-07-25 15:46:44 +02:00
parent e6aa37720b
commit c1e2a600be
3 changed files with 20 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
WebContent/META-INF/context.xml
View file

@ -4,8 +4,8 @@
<Environment type="java.lang.String" name="WEBSITE_NAME" value="Gallery" /> <Environment type="java.lang.String" name="WEBSITE_NAME" value="Gallery" />
<Environment type="java.lang.String" name="WEBSITE_URL" value="http://example.com/Zallery/" /> <Environment type="java.lang.String" name="WEBSITE_URL" value="http://example.com/Zallery/" />
<Environment type="java.lang.String" name="WEBSITE_EMAIL" value="admin@example.com" /> <Environment type="java.lang.String" name="ADMIN_EMAIL" value="admin@example.com" />
<Environment type="java.lang.String" name="WEBSITE_EMAIL_NICE" value="Example.com Admin" /> <Environment type="java.lang.String" name="ADMIN_EMAIL_NICE" value="Example.com Admin" />
<Environment type="java.lang.String" name="SMTP_HOST" value="127.0.0.1" /> <Environment type="java.lang.String" name="SMTP_HOST" value="127.0.0.1" />
<Environment type="java.lang.String" name="DATA_PATH" value="PATH TO DATA FOLDER" /> <Environment type="java.lang.String" name="DATA_PATH" value="PATH TO DATA FOLDER" />

25
src/zall/Zallery.java
View file

@ -12,7 +12,6 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import zall.util.ZalleryEmail;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.log.LogUtil; import zutil.log.LogUtil;
@ -23,8 +22,8 @@ public class Zallery extends HttpServlet{
public static String WEBSITE_NAME = ""; public static String WEBSITE_NAME = "";
public static String WEBSITE_URL = ""; public static String WEBSITE_URL = "";
public static String WEBSITE_EMAIL = ""; public static String ADMIN_EMAIL = "";
public static String WEBSITE_EMAIL_NICE = ""; public static String ADMIN_EMAIL_NICE = "";
public static String SMTP_HOST = ""; public static String SMTP_HOST = "";
public static String ROOT_PATH = ""; public static String ROOT_PATH = "";
public static String DATA_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"))) 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."); 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_NAME = (String)context.lookup("java:comp/env/WEBSITE_NAME");
WEBSITE_URL = (String)context.lookup("java:comp/env/WEBSITE_URL"); WEBSITE_URL = (String)context.lookup("java:comp/env/WEBSITE_URL");
if( WEBSITE_URL.charAt(WEBSITE_URL.length()-1) != '/') if( WEBSITE_URL.charAt(WEBSITE_URL.length()-1) != '/')
WEBSITE_URL += "/"; WEBSITE_URL += "/";
WEBSITE_EMAIL = (String)context.lookup("java:comp/env/WEBSITE_EMAIL"); ADMIN_EMAIL = (String)context.lookup("java:comp/env/ADMIN_EMAIL");
WEBSITE_EMAIL_NICE = (String)context.lookup("java:comp/env/WEBSITE_EMAIL_NICE"); ADMIN_EMAIL_NICE = (String)context.lookup("java:comp/env/ADMIN_EMAIL_NICE");
SMTP_HOST = (String)context.lookup("java:comp/env/SMTP_HOST"); SMTP_HOST = (String)context.lookup("java:comp/env/SMTP_HOST");
DATA_PATH = (String)context.lookup("java:comp/env/DATA_PATH"); DATA_PATH = (String)context.lookup("java:comp/env/DATA_PATH");
LogUtil.setLevel("zall", Level.FINEST); LogUtil.setLevel("zall", Level.FINEST);
//LogUtil.setLevel("zutil", Level.FINEST); //LogUtil.setLevel("zutil", Level.FINEST);
@ -86,14 +85,6 @@ public class Zallery extends HttpServlet{
return null; 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 // /mywebapp/servlet/MyServlet/a/b;c=123?d=789
public static String getUrl(HttpServletRequest req) { public static String getUrl(HttpServletRequest req) {
String reqUri = req.getRequestURI().toString(); String reqUri = req.getRequestURI().toString();

21
src/zall/util/ZalleryEmail.java
View file

@ -2,7 +2,6 @@ package zall.util;
import zall.Zallery; import zall.Zallery;
import zall.bean.User; import zall.bean.User;
import zall.manager.AuthenticationManager;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.net.smtp.Email; import zutil.net.smtp.Email;
import zutil.net.smtp.SmtpClient; import zutil.net.smtp.SmtpClient;
@ -22,15 +21,15 @@ public class ZalleryEmail {
private static ResourceBundle lang = PropertyResourceBundle.getBundle(LANG_BASENAME, Locale.getDefault()); private static ResourceBundle lang = PropertyResourceBundle.getBundle(LANG_BASENAME, Locale.getDefault());
public static void sendVerificationEmail(User user) throws IOException { 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 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.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.setContentType(Email.ContentType.HTML);
email.setMessage( email.setMessage(
lang.getString("email.registration.body1") + " " + Zallery.getWebsiteName() + "." + lang.getString("email.registration.body1") + " " + Zallery.WEBSITE_NAME + "." +
"<br>" + lang.getString("email.registration.body2") + "<br>" + lang.getString("email.registration.body2") +
"<p><a href='" + verifyUrl + "'>" + verifyUrl + "</a>" + "<p><a href='" + verifyUrl + "'>" + verifyUrl + "</a>" +
"<p>" + lang.getString("email.registration.body3")); "<p>" + lang.getString("email.registration.body3"));
@ -42,13 +41,13 @@ public class ZalleryEmail {
public static void sendActivationEmail(User user) throws IOException { public static void sendActivationEmail(User user) throws IOException {
Email email = new Email(); 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.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.setContentType(Email.ContentType.HTML);
email.setMessage( email.setMessage(
lang.getString("email.activation.body") + lang.getString("email.activation.body") +
"<br><a href='" + Zallery.getWebsiteURL() + "'>" + Zallery.getWebsiteURL() + "</a>"); "<br><a href='" + Zallery.WEBSITE_URL + "'>" + Zallery.WEBSITE_URL + "</a>");
SmtpClient smtp = new SmtpClient(Zallery.SMTP_HOST); SmtpClient smtp = new SmtpClient(Zallery.SMTP_HOST);
smtp.send(email); smtp.send(email);
@ -57,12 +56,12 @@ public class ZalleryEmail {
public static void sendNewUserRegistrationToAdmin(User user, DBConnection db) throws SQLException, IOException { public static void sendNewUserRegistrationToAdmin(User user, DBConnection db) throws SQLException, IOException {
Email email = new Email(); Email email = new Email();
email.setFrom(Zallery.WEBSITE_EMAIL, Zallery.WEBSITE_EMAIL_NICE); email.setFrom(Zallery.ADMIN_EMAIL, Zallery.ADMIN_EMAIL_NICE);
email.setSubject(lang.getString("email.activation.request.title") + " " + Zallery.getWebsiteName()); email.setSubject(lang.getString("email.activation.request.title") + " " + Zallery.WEBSITE_NAME);
email.setContentType(Email.ContentType.HTML); email.setContentType(Email.ContentType.HTML);
email.setMessage( email.setMessage(
lang.getString("email.activation.request.body") + lang.getString("email.activation.request.body") +
" <a href='" + Zallery.getWebsiteURL() + "'>" + Zallery.getWebsiteName() + "</a>:" + " <a href='" + Zallery.WEBSITE_URL + "'>" + Zallery.WEBSITE_NAME + "</a>:" +
"<p>Email: <b>" + user.getEmail() + "</b>" + "<p>Email: <b>" + user.getEmail() + "</b>" +
"<br>Name: <b>" + user.getName() + "</b>" "<br>Name: <b>" + user.getName() + "</b>"
); );