Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.100.2.27 -r1.100.2.28
--- lams_admin/conf/language/lams/ApplicationResources.properties 31 Jan 2017 23:43:49 -0000 1.100.2.27
+++ lams_admin/conf/language/lams/ApplicationResources.properties 6 Mar 2017 12:34:45 -0000 1.100.2.28
@@ -155,8 +155,7 @@
sysadmin.server.add =Add new server
sysadmin.organisation.create =Create one
sysadmin.organisation.select =Please select...
-sysadmin.login.logo =Upload a new logo. Use a height of 90 pixels and width between 180 and 340 pixels for best effect:
-sysadmin.login.text =Update the text under the logo on the login page:
+sysadmin.login.text =Update the page text:
sysadmin.headline =System Administration
sysadmin.config.settings.edit =Edit configuration settings
sysadmin.batch.temp.file.delete =Delete old temporary files
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.92.2.16 -r1.92.2.17
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties 8 Feb 2017 19:18:27 -0000 1.92.2.16
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties 6 Mar 2017 12:34:45 -0000 1.92.2.17
@@ -154,8 +154,7 @@
sysadmin.server.add =Add new server
sysadmin.organisation.create =Create one
sysadmin.organisation.select =Please select...
-sysadmin.login.logo =Upload a new logo. Use a height of 90 pixels and width between 180 and 340 pixels for best effect:
-sysadmin.login.text =Update the text under the logo on the login page:
+sysadmin.login.text =Update the page text:
sysadmin.headline =System Administration
sysadmin.config.settings.edit =Edit configuration settings
sysadmin.batch.temp.file.delete =Delete old temporary files
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java,v
diff -u -r1.10.2.2 -r1.10.2.3
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java 5 May 2016 07:40:36 -0000 1.10.2.2
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java 6 Mar 2017 12:34:45 -0000 1.10.2.3
@@ -26,7 +26,6 @@
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileOutputStream;
-import java.io.IOException;
import java.io.OutputStreamWriter;
import java.nio.charset.Charset;
@@ -36,44 +35,21 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
import org.apache.struts.action.DynaActionForm;
-import org.apache.struts.upload.FormFile;
import org.lamsfoundation.lams.util.Configuration;
import org.lamsfoundation.lams.util.ConfigurationKeys;
import org.lamsfoundation.lams.web.action.LamsDispatchAction;
/**
- *
- * View Source
- *
- *
* Use DispatchAction for future extension convenience, e.g. add preview feature
*
* @author Fei Yang
*/
-
-/**
- * struts doclet
- *
- *
- * "method" scope = "request" input = ".loginmaintian" validate =
- * "false"
- *
- *
- *
- */
public class LoginSaveAction extends LamsDispatchAction {
- private static final String IMAGE_FOLDER_SUFFIX = File.separatorChar + "lams-www.war" + File.separatorChar
- + "images";
-
private static final String NEWS_PAGE_PATH_SUFFIX = File.separatorChar + "lams-www.war" + File.separatorChar
+ "news.html";
- private static final String LOGO_FILENAME = "lams_login.gif";
-
public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws Exception {
@@ -82,68 +58,21 @@
}
DynaActionForm loginMaintainForm = (DynaActionForm) form;
- ActionMessages errors = new ActionMessages();
- FormFile file = (FormFile) loginMaintainForm.get("logo");
- if ((file != null) && (file.getFileSize() != 0)) {
- checkFile(errors, file);
- }
- if (errors.isEmpty()) {
- if ((file != null) && (file.getFileSize() != 0)) {
- updateImageFile(file, LOGO_FILENAME);
-
- }
- updateNewsPage(loginMaintainForm.getString("news"));
- } else {
- saveErrors(request, errors);
- return mapping.findForward("loginmaintain");
- }
- return mapping.findForward("sysadmin");
- }
-
- private void updateNewsPage(String news) throws IOException {
BufferedWriter bWriter = null;
try {
- OutputStreamWriter ow = new OutputStreamWriter(
- new FileOutputStream(Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + NEWS_PAGE_PATH_SUFFIX),
+ OutputStreamWriter ow = new OutputStreamWriter(new FileOutputStream(
+ Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + NEWS_PAGE_PATH_SUFFIX),
Charset.forName("UTF-8"));
bWriter = new BufferedWriter(ow);
- bWriter.write(news);
+ bWriter.write(loginMaintainForm.getString("news"));
bWriter.flush();
} finally {
if (bWriter != null) {
bWriter.close();
}
}
- }
- private void updateImageFile(FormFile file, String fileName) throws IOException {
- File imagesFolder = new File(Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + IMAGE_FOLDER_SUFFIX);
- if (!imagesFolder.exists()) {
- imagesFolder.mkdir();
- }
- String imageFilePath = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR) + IMAGE_FOLDER_SUFFIX
- + File.separatorChar + fileName;
- FileOutputStream out = null;
- try {
- out = new FileOutputStream(imageFilePath);
- out.write(file.getFileData());
- out.flush();
- } finally {
- if (out != null) {
- out.close();
- }
- }
-
+ return mapping.findForward("sysadmin");
}
- private void checkFile(ActionMessages errors, FormFile file) {
- boolean imgFormat = file.getContentType().contains("image");
- if (!imgFormat) {
- errors.add("format", new ActionMessage("error.img.format"));
- }
- if (file.getFileSize() > 4096 * 1024) {
- errors.add("size", new ActionMessage("error.img.size"));
- }
- }
-
}
Index: lams_admin/web/loginmaintain.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/loginmaintain.jsp,v
diff -u -r1.17.2.3 -r1.17.2.4
--- lams_admin/web/loginmaintain.jsp 29 Nov 2016 02:17:08 -0000 1.17.2.3
+++ lams_admin/web/loginmaintain.jsp 6 Mar 2017 12:34:45 -0000 1.17.2.4
@@ -5,11 +5,8 @@
-
-
-
-
+
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.10 -r1.1.2.11
--- lams_admin/web/WEB-INF/struts-config.xml 8 Feb 2017 19:18:26 -0000 1.1.2.10
+++ lams_admin/web/WEB-INF/struts-config.xml 6 Mar 2017 12:34:45 -0000 1.1.2.11
@@ -94,7 +94,6 @@
-