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

updated email templates

Browse source
This commit is contained in:
Ziver Koc 2018-07-25 15:36:57 +02:00
parent de503bd441
commit 467151abd0
14 changed files with 106 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/zall/Zallery.java
View file

@ -1,31 +1,18 @@
package zall;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import zall.bean.Folder;
import zall.bean.Image;
import zall.bean.Media;
import zall.bean.User;
import zall.manager.AuthenticationManager;
import zall.util.ZalleryEmail;
import zall.util.UserMessage;
import zall.util.UserMessage.MessageType;
import zutil.db.DBConnection;
import zutil.log.LogUtil;
@ -36,6 +23,9 @@ public class Zallery extends HttpServlet{
public static String WEBSITE_NAME = "Example.com";
public static String WEBSITE_URL = "http://example.com";
public static String WEBSITE_EMAIL = "admin@example.com";
public static String WEBSITE_EMAIL_NICE = "Example.com Admin";
public static String SMTP_HOST = "localhost";
public static String ROOT_PATH = "";
public static String DATA_PATH = "";
@ -56,12 +46,15 @@ public class Zallery extends HttpServlet{
if ("C:\\\\data".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 += "/";
ZalleryEmail.setSMTPHost( (String)context.lookup("java:comp/env/SMTP_HOST") );
DATA_PATH = (String)context.lookup("java:comp/env/DATA_PATH");
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/WEBSITE_EMAIL_NICE");
DATA_PATH = (String)context.lookup("java:comp/env/DATA_PATH");
LogUtil.setLevel("zall", Level.FINEST);
//LogUtil.setLevel("zutil", Level.FINEST);