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

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.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();