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

Added env var eys to ZalleryCOnstants and some work on tag files

Browse source
This commit is contained in:
Ziver Koc 2018-08-13 21:51:19 +02:00
parent 8ea4f0d6d5
commit 0c05dd0c27
8 changed files with 39 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/zall/Zallery.java
View file

@ -16,6 +16,8 @@ import zutil.db.DBConnection;
import zutil.log.LogUtil;
import zutil.ui.UserMessageManager;
import static zall.ZalleryConstants.*;
@WebServlet(value = "/init", loadOnStartup = 1)
public class Zallery extends HttpServlet{
@ -26,9 +28,8 @@ public class Zallery extends HttpServlet{
public static String WEBSITE_NAME = "";
public static String WEBSITE_URL = "";
public static String ADMIN_EMAIL = "";
public static String ADMIN_EMAIL_NICE = "";
public static String ADMIN_NAME = "";
public static String SMTP_HOST = "";
public static String ROOT_PATH = "";
public static String DATA_PATH = "";
/**
@ -41,22 +42,21 @@ public class Zallery extends HttpServlet{
public void init(ServletConfig config) throws ServletException {
super.init(config);
logger.info("Setting up Zallery environment.");
ROOT_PATH = config.getServletContext().getRealPath("/");
try {
Context context = new InitialContext();
// Check if Zallery has been properly configured
if (((String) context.lookup("java:comp/env/DATA_PATH")).isEmpty())
if (((String) context.lookup("java:comp/env/" + ENV_KEY_DATA_PATH)).isEmpty())
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/" + ENV_KEY_WEBSITE_NAME);
WEBSITE_URL = (String) context.lookup("java:comp/env/" + ENV_KEY_WEBSITE_URL);
if( WEBSITE_URL.charAt(WEBSITE_URL.length()-1) != '/')
WEBSITE_URL += "/";
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");
ADMIN_EMAIL = (String) context.lookup("java:comp/env/" + ENV_KEY_ADMIN_EMAIL);
ADMIN_NAME = (String) context.lookup("java:comp/env/" + ENV_KEY_ADMIN_NAME);
SMTP_HOST = (String) context.lookup("java:comp/env/" + ENV_KEY_SMTP_HOST);
DATA_PATH = (String) context.lookup("java:comp/env/" + ENV_KEY_DATA_PATH);
LogUtil.setLevel("zall", Level.parse((String) context.lookup("java:comp/env/LOGGING_ZALL")));
LogUtil.setLevel("zutil", Level.parse((String) context.lookup("java:comp/env/LOGGING_ZUTIL")));

10
src/zall/ZalleryConstants.java
View file

@ -9,6 +9,16 @@ public interface ZalleryConstants {
/** Session Constants **/
public static String ENV_KEY_WEBSITE_NAME = "WEBSITE_NAME";
public static String ENV_KEY_WEBSITE_URL = "WEBSITE_URL";
public static String ENV_KEY_ADMIN_EMAIL = "ADMIN_EMAIL";
public static String ENV_KEY_ADMIN_NAME = "ADMIN_NAME";
public static String ENV_KEY_SMTP_HOST = "SMTP_HOST";
public static String ENV_KEY_ROOT_PATH = "ROOT_PATH";
public static String ENV_KEY_DATA_PATH = "DATA_PATH";
/** Session Constants **/
public static final String SESSION_KEY_USER_MSG = "zall_user_message";
public static final String SESSION_KEY_USER_OBJ = "zall_user";
public static final long SESSION_TIMEOUT = 3*24*60*60*1000; // 2 day

7
src/zall/ZalleryServlet.java
View file

@ -23,9 +23,16 @@ public abstract class ZalleryServlet extends HttpServlet {
public final void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {
DBConnection db = null;
try {
request.setAttribute(ENV_KEY_WEBSITE_NAME, Zallery.WEBSITE_NAME);
request.setAttribute(ENV_KEY_WEBSITE_URL, Zallery.WEBSITE_URL);
request.setAttribute(ENV_KEY_ADMIN_NAME, Zallery.ADMIN_NAME);
request.setAttribute(ENV_KEY_ADMIN_EMAIL, Zallery.ADMIN_EMAIL);
UserMessageManager msgs = Zallery.getUserMessage(request.getSession());
request.setAttribute(ZalleryConstants.SESSION_KEY_USER_MSG, msgs);
doGet(request, response, db = Zallery.getDB());
msgs.decrementViewCount();
} catch (ServletException e) {
throw e;

6
src/zall/manager/EmailManager.java
View file

@ -48,7 +48,7 @@ public class EmailManager {
String verifyUrl = Zallery.WEBSITE_URL + "?verfemail=" + user.generateEmailVerificationHash() + "&id=" + user.getId();
Email email = new Email();
email.setFrom(Zallery.ADMIN_EMAIL, Zallery.ADMIN_EMAIL_NICE);
email.setFrom(Zallery.ADMIN_EMAIL, Zallery.ADMIN_NAME);
email.setTo(user.getEmail());
email.setSubject(lang.getString("email.registration.title") + Zallery.WEBSITE_NAME);
email.setContentType(Email.ContentType.HTML);
@ -65,7 +65,7 @@ public class EmailManager {
public static void sendActivationEmail(User user) throws IOException {
Email email = new Email();
email.setFrom(Zallery.ADMIN_EMAIL, Zallery.ADMIN_EMAIL_NICE);
email.setFrom(Zallery.ADMIN_EMAIL, Zallery.ADMIN_NAME);
email.setTo(user.getEmail());
email.setSubject(lang.getString("email.activation.title") + " " + Zallery.WEBSITE_NAME);
email.setContentType(Email.ContentType.HTML);
@ -80,7 +80,7 @@ public class EmailManager {
public static void sendNewUserRegistrationToAdmin(User user, DBConnection db) throws SQLException, IOException {
Email email = new Email();
email.setFrom(Zallery.ADMIN_EMAIL, Zallery.ADMIN_EMAIL_NICE);
email.setFrom(Zallery.ADMIN_EMAIL, Zallery.ADMIN_NAME);
email.setSubject(lang.getString("email.activation.request.title") + " " + Zallery.WEBSITE_NAME);
email.setContentType(Email.ContentType.HTML);
email.setMessage(

2
src/zall/page/GalleryServlet.java
View file

@ -47,7 +47,7 @@ public class GalleryServlet extends ZalleryServlet {
//session.setAttribute("user", user);
request.setAttribute("folder", folder);
request.setAttribute("subfolders", subFolders);
request.setAttribute("subFolders", subFolders);
request.setAttribute("media", list);
include(JSP_FILE, request, response);