/*
- * Copyright (C) 2001, 2002 The Mir-coders group
+ * Copyright (C) 2001, 2002 The Mir-coders group
*
* This file is part of Mir.
*
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* In addition, as a special exception, The Mir-coders gives permission to link
- * the code of this program with the com.oreilly.servlet library, any library
- * licensed under the Apache Software License, The Sun (tm) Java Advanced
- * Imaging library (JAI), The Sun JIMI library (or with modified versions of
- * the above that use the same license as the above), and distribute linked
- * combinations including the two. You must obey the GNU General Public
- * License in all respects for all of the code used other than the above
- * mentioned libraries. If you modify this file, you may extend this exception
- * to your version of the file, but you are not obligated to do so. If you do
- * not wish to do so, delete this exception statement from your version.
+ * the code of this program with any library licensed under the Apache Software License,
+ * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library
+ * (or with modified versions of the above that use the same license as the above),
+ * and distribute linked combinations including the two. You must obey the
+ * GNU General Public License in all respects for all of the code used other than
+ * the above mentioned libraries. If you modify this file, you may extend this
+ * exception to your version of the file, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your version.
*/
package mircoders.servlet;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Date;
import java.util.Enumeration;
import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
+import java.util.Locale;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.Vector;
-import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpUtils;
-import gnu.regexp.RE;
-import gnu.regexp.REMatch;
-import gnu.regexp.REMatchEnumeration;
-import gnu.regexp.REException;
-
-
+import org.apache.commons.fileupload.FileItem;
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
-//import org.apache.fop.apps.Driver;
-//import org.apache.fop.apps.XSLTInputHandler;
-import org.apache.log.Hierarchy;
-import org.apache.log.Priority;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Searcher;
import org.apache.struts.util.MessageResources;
+import gnu.regexp.RE;
+import gnu.regexp.REMatch;
+
import mir.entity.Entity;
-import mir.entity.EntityList;
import mir.generator.Generator;
import mir.log.LoggerWrapper;
-import mir.misc.FileHandler;
import mir.misc.StringUtil;
-import mir.misc.WebdbMultipartRequest;
import mir.servlet.ServletModule;
import mir.servlet.ServletModuleExc;
import mir.servlet.ServletModuleFailure;
import mir.servlet.ServletModuleUserExc;
+import mir.session.HTTPAdapters;
+import mir.session.Request;
+import mir.session.Session;
+import mir.session.SessionHandler;
+import mir.session.SimpleResponse;
+import mir.session.UploadedFile;
import mir.storage.StorageObjectFailure;
import mir.util.ExceptionFunctions;
+import mir.util.HTTPParsedRequest;
import mir.util.HTTPRequestParser;
import mir.util.StringRoutines;
import mircoders.entity.EntityComment;
import mircoders.entity.EntityContent;
import mircoders.global.MirGlobal;
-import mircoders.media.MediaRequest;
-import mircoders.media.UnsupportedMediaFormatExc;
-import mircoders.module.ModuleComment;
+import mircoders.media.MediaUploadProcessor;
+import mircoders.module.*;
import mircoders.module.ModuleContent;
import mircoders.module.ModuleImages;
import mircoders.module.ModuleTopics;
* open-postings to the newswire
*
* @author mir-coders group
- * @version $Id: ServletModuleOpenIndy.java,v 1.73 2003/04/14 19:19:16 john Exp $
+ * @version $Id: ServletModuleOpenIndy.java,v 1.81 2003/04/26 00:42:22 zapata Exp $
*
*/
commentFormTemplate = configuration.getString("ServletModule.OpenIndy.CommentTemplate");
commentFormDoneTemplate = configuration.getString("ServletModule.OpenIndy.CommentDoneTemplate");
commentFormDupeTemplate = configuration.getString("ServletModule.OpenIndy.CommentDupeTemplate");
+
postingFormTemplate = configuration.getString("ServletModule.OpenIndy.PostingTemplate");
postingFormDoneTemplate = configuration.getString("ServletModule.OpenIndy.PostingDoneTemplate");
postingFormDupeTemplate = configuration.getString("ServletModule.OpenIndy.PostingDupeTemplate");
+
searchResultsTemplate = configuration.getString("ServletModule.OpenIndy.SearchResultsTemplate");
prepareMailTemplate = configuration.getString("ServletModule.OpenIndy.PrepareMailTemplate");
sentMailTemplate = configuration.getString("ServletModule.OpenIndy.SentMailTemplate");
directOp = configuration.getString("DirectOpenposting").toLowerCase();
- mainModule = new ModuleComment(DatabaseComment.getInstance());
+ commentModule = new ModuleComment(DatabaseComment.getInstance());
+ mainModule = commentModule;
contentModule = new ModuleContent(DatabaseContent.getInstance());
topicsModule = new ModuleTopics(DatabaseTopics.getInstance());
imageModule = new ModuleImages(DatabaseImages.getInstance());
configuration.getString("ServletModule.OpenIndy.PostingDisabledTemplate"));
}
-
/**
* Method for making a comment
*/
- public void addcomment(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure
- {
+ public void addcomment(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
if (MirGlobal.abuse().getOpenPostingDisabled()) {
openPostingDisabled(req, res);
}
String aid = req.getParameter("aid"); // the article id the comment will belong to
-/*
- String language = req.getParameter("language");
- */
- if (aid!=null && !aid.equals("")) {
+ if (aid != null && !aid.equals("")) {
try {
Map mergeData = new HashMap();
mergeData.put("passwd", passwd);
}
else {
- mergeData.put("passwd", (String) null);
+ mergeData.put("passwd", (String)null);
}
-/*
- if (language != null) {
- HttpSession session = req.getSession(false);
- session.setAttribute("Locale", new Locale(language, ""));
- session.setAttribute("language", language);
- }
-*/
mergeData.put("aid", aid);
Map extraInfo = new HashMap();
throw new ServletModuleFailure("ServletModuleOpenIndy.addcomment: " + t.getMessage(), t);
}
}
- else throw new ServletModuleExc("aid not set!");
+ else
+ throw new ServletModuleExc("aid not set!");
}
/**
* the commentDone Page
*/
- public void inscomment(HttpServletRequest req, HttpServletResponse res)
- throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure
- {
+ public void inscomment(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
if (MirGlobal.abuse().getOpenPostingDisabled()) {
openPostingDisabled(req, res);
}
String aid = req.getParameter("to_media"); // the article id the comment will belong to
- if (aid!=null && !aid.equals(""))
- {
- // ok, collecting data from form
- try {
- Map withValues = getIntersectingValues(req, DatabaseComment.getInstance());
+ if (aid != null && !aid.equals("")) {
+ // ok, collecting data from form
+ try {
+ Map withValues = getIntersectingValues(req, DatabaseComment.getInstance());
- //no html in comments(for now)
- for (Iterator i=withValues.keySet().iterator(); i.hasNext(); ){
- String k=(String)i.next();
- String v=(String)withValues.get(k);
+ //no html in comments(for now)
+ for (Iterator i = withValues.keySet().iterator(); i.hasNext(); ) {
+ String k = (String) i.next();
+ String v = (String) withValues.get(k);
- withValues.put(k,StringUtil.removeHTMLTags(v));
- }
- withValues.put("is_published","1");
- withValues.put("to_comment_status","1");
+ withValues.put(k, StringUtil.removeHTMLTags(v));
+ }
+ withValues.put("is_published", "1");
+ withValues.put("to_comment_status", "1");
+ withValues.put("is_html", "0");
- //checking the onetimepasswd
- HttpSession session = req.getSession(false);
- String sessionPasswd = (String) session.getAttribute("passwd");
- if ( sessionPasswd != null){
- String passwd = req.getParameter("passwd");
- if ( passwd == null || passwd.length()==0) {
- throw new ServletModuleUserExc("comment.error.missingpassword", new String[] {});
- }
- if (!sessionPasswd.equals(passwd)) {
- throw new ServletModuleUserExc("comment.error.invalidpassword", new String[] {});
- }
- session.invalidate();
+ //checking the onetimepasswd
+ HttpSession session = req.getSession(false);
+ String sessionPasswd = (String) session.getAttribute("passwd");
+ if (sessionPasswd != null) {
+ String passwd = req.getParameter("passwd");
+ if (passwd == null || passwd.length() == 0) {
+ throw new ServletModuleUserExc("comment.error.missingpassword", new String[] {});
}
-
- String id = mainModule.add(withValues);
-
- if(id==null){
- deliver(req, res, (Map) null, null, commentFormDupeTemplate);
+ if (!sessionPasswd.equals(passwd)) {
+ throw new ServletModuleUserExc("comment.error.invalidpassword", new String[] {});
}
- else {
- MirGlobal.abuse().logComment(req.getRemoteAddr(), id, new Date(), (String) req.getHeader("User-Agent"));
+ session.invalidate();
+ }
- DatabaseContent.getInstance().setUnproduced("id="+aid);
+ String id = mainModule.add(withValues);
- try {
- EntityComment comment = (EntityComment) DatabaseComment.getInstance().selectById(id);
- MirGlobal.abuse().checkComment(comment, req, res);
- MirGlobal.localizer().openPostings().afterCommentPosting(comment);
- }
- catch (Throwable t) {
- throw new ServletModuleExc(t.getMessage());
- }
- }
+ SimpleResponse response = new SimpleResponse();
+ response.setResponseGenerator(commentFormDoneTemplate);
- // redirecting to url
- // should implement back to article
- Map mergeData = new HashMap();
- deliver(req, res, mergeData, null, commentFormDoneTemplate);
+ if (id == null) {
+ deliver(req, res, (Map)null, null, commentFormDupeTemplate);
}
- catch (Throwable e) {
- throw new ServletModuleFailure(e);
+ else {
+ DatabaseContent.getInstance().setUnproduced("id=" + aid);
+
+ try {
+ EntityComment comment = (EntityComment) DatabaseComment.getInstance().selectById(id);
+ MirGlobal.localizer().openPostings().afterCommentPosting(comment);
+ MirGlobal.abuse().checkComment(
+ comment, new HTTPAdapters.HTTPRequestAdapter(req), res);
+ }
+ catch (Throwable t) {
+ throw new ServletModuleExc(t.getMessage());
+ }
}
+
+ // redirecting to url
+ // should implement back to article
+ deliver(req, res, response.getResponseValues(), null, response.getResponseGenerator());
}
- else throw new ServletModuleExc("aid not set!");
+ catch (Throwable e) {
+ throw new ServletModuleFailure(e);
+ }
+ }
+ else
+ throw new ServletModuleExc("aid not set!");
}
// onetimepasswd
if (MirGlobal.abuse().getOpenPostingPassword()) {
- String passwd = this.createOneTimePasswd();
+ String passwd = generateOnetimePassword();
HttpSession session = req.getSession(false);
session.setAttribute("passwd", passwd);
mergeData.put("passwd", passwd);
* the postingDone Page
*/
- public void insposting(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure
- {
+ public void insposting(HttpServletRequest aRequest, HttpServletResponse aResponse) throws
+ ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
if (MirGlobal.abuse().getOpenPostingDisabled()) {
- openPostingDisabled(req, res);
+ openPostingDisabled(aRequest, aResponse);
return;
}
- Map mergeData = new HashMap();
- boolean setMedia=false;
- boolean setTopic = false;
-
try {
+ HTTPParsedRequest parsedRequest = new HTTPParsedRequest(
+ aRequest,
+ configuration.getString("Mir.DefaultEncoding"),
+ configuration.getInt("MaxMediaUploadSize")*1024,
+ configuration.getString("TempDir"));
- WebdbMultipartRequest mp = null;
- EntityList mediaList = null;
- try {
- // new MediaRequest, "1" is the id for the openPosting user
- MediaRequest mediaReq = new MediaRequest("1", true);
- mp = new WebdbMultipartRequest(req, (FileHandler)mediaReq);
- mediaList = mediaReq.getEntityList();
- }
- catch (Throwable e) {
- throw new ServletModuleFailure(e);
- }
-
- Map withValues = mp.getParameters();
+ Map mergeData = new HashMap();
- //checking the onetimepasswd
- HttpSession session = req.getSession(false);
+ HttpSession session = aRequest.getSession(false);
String sessionPasswd = (String) session.getAttribute("passwd");
- if (sessionPasswd != null){
- String passwd = (String) withValues.get("passwd");
+ if (sessionPasswd != null) {
+ String passwd = (String) parsedRequest.getParameter("passwd");
- logger.debug("session password = " + sessionPasswd + ", form password = " + passwd);
-
- if ( passwd == null || passwd.length()==0) {
+ if (passwd == null || passwd.length() == 0) {
throw new ServletModuleUserExc("posting.error.missingpassword", new String[] {});
}
if (!sessionPasswd.equals(passwd)) {
session.invalidate();
}
- if ((((String)withValues.get("title")).length() == 0) ||
- (((String)withValues.get("description")).length() == 0) ||
- (((String)withValues.get("content_data")).length() == 0))
+ if ((((String) parsedRequest.getParameter("title")).length() == 0) ||
+ (((String) parsedRequest.getParameter("description")).length() == 0) ||
+ (((String) parsedRequest.getParameter("content_data")).length() == 0))
throw new ServletModuleUserExc("posting.error.missingfield", new String[] {});
- // call the routines that escape html
+ List mediaList = new Vector();
+ Iterator i = parsedRequest.getFiles().iterator();
+
+ while (i.hasNext()) {
+ UploadedFile file = new mir.session.CommonsUploadedFileAdapter((FileItem) i.next());
+ Map mediaValues = new HashMap();
+
+ String suffix = file.getFieldName().substring(5); // media${m}
+ logger.debug("media_title" + suffix);
+ String title = parsedRequest.getParameter("media_title" + suffix);
+
+ mediaValues.put("title", StringUtil.removeHTMLTags(title));
+ mediaValues.put("creator", StringUtil.removeHTMLTags(parsedRequest.getParameter("creator")));
+ mediaValues.put("to_publisher", "0");
+ mediaValues.put("is_published", "1");
+ mediaValues.put("to_media_folder", "7");
+
+ mediaList.add(MediaUploadProcessor.processMediaUpload(file, mediaValues));
+ }
+
+ Map withValues = new HashMap();
+ i = DatabaseContent.getInstance().getFields().iterator();
+ while (i.hasNext()) {
+ String field = (String) i.next();
+ String value = parsedRequest.getParameter(field);
+ if (value!=null)
+ withValues.put(field, value);
+ }
+
- for (Iterator i=withValues.keySet().iterator(); i.hasNext(); ){
- String k=(String)i.next();
- String v=(String)withValues.get(k);
+ for (i = withValues.keySet().iterator(); i.hasNext(); ) {
+ String k = (String) i.next();
+ String v = (String) withValues.get(k);
- if (k.equals("content_data")){
+ if (k.equals("content_data")) {
//this doesn't quite work yet, so for now, all html goes
//withValues.put(k,StringUtil.approveHTMLTags(v));
- withValues.put(k,StringUtil.deleteForbiddenTags(v));
+ withValues.put(k, StringUtil.deleteForbiddenTags(v));
}
else if (k.equals("description")) {
String tmp = StringUtil.deleteForbiddenTags(v);
- withValues.put(k,StringUtil.deleteHTMLTableTags(tmp));
+ withValues.put(k, StringUtil.deleteHTMLTableTags(tmp));
}
else {
- withValues.put(k,StringUtil.removeHTMLTags(v));
+ withValues.put(k, StringUtil.removeHTMLTags(v));
}
-
}
withValues.put("date", StringUtil.date2webdbDate(new GregorianCalendar()));
- withValues.put("publish_path", StringUtil.webdbDate2path((String)withValues.get("date")));
+ withValues.put("publish_path",
+ StringUtil.webdbDate2path( (String) withValues.get("date")));
withValues.put("is_produced", "0");
- withValues.put("is_published","1");
+ withValues.put("is_published", "1");
if (directOp.equals("yes"))
- withValues.put("to_article_type","1");
+ withValues.put("to_article_type", "1");
- withValues.put("to_publisher","1");
+ withValues.put("to_publisher", "1");
// inserting content into database
String cid = contentModule.add(withValues);
- logger.debug("id: "+cid);
+ logger.debug("id: " + cid);
//insert was not successfull
- if(cid==null){
-
- //How do we know that it was not succesful cause of a
- //dupe, what if it failed cause of "No space left on device"?
- //Or is there something I am missing? Wouldn't it be better
- //to have an explicit dupe check and then insert? I have no
- //idea what I am talking about. this comment is in case
- //I forget to explicitely ask. -mh
- deliver(req, res, mergeData, null, postingFormDupeTemplate);
+ if (cid == null) {
+ deliver(aRequest, aResponse, mergeData, null, postingFormDupeTemplate);
return;
}
- MirGlobal.abuse().logArticle(req.getRemoteAddr(), cid, new Date(), (String) req.getHeader("User-Agent"));
-
- String[] to_topicsArr = mp.getParameterValues("to_topic");
-
- if (to_topicsArr != null && to_topicsArr.length > 0) {
- try{
- DatabaseContentToTopics.getInstance().setTopics(cid,to_topicsArr);
- setTopic = true;
+ List topics = parsedRequest.getParameterList("to_topic");
+ if (topics.size() > 0) {
+ try {
+ DatabaseContentToTopics.getInstance().setTopics(cid, topics);
}
catch (Throwable e) {
logger.error("setting content_x_topic failed");
contentModule.deleteById(cid);
- throw new ServletModuleFailure("smod - openindy :: insposting: setting content_x_topic failed: "+e.toString(), e);
- } //end try
- } //end if
-
- //if we're here all is ok... associate the media to the article
- for(int i=0;i<mediaList.size();i++) {
- Entity mediaEnt = (Entity)mediaList.elementAt(i);
- DatabaseContentToMedia.getInstance().addMedia(cid,mediaEnt.getId());
+ throw new ServletModuleFailure(
+ "smod - openindy :: insposting: setting content_x_topic failed: " +
+ e.toString(), e);
+ }
}
- EntityContent article = (EntityContent) contentModule.getById(cid);
+ i = mediaList.iterator();
+ while (i.hasNext()) {
+ Entity mediaEnt = (Entity) i.next();
+ DatabaseContentToMedia.getInstance().addMedia(cid, mediaEnt.getId());
+ }
+ EntityContent article = (EntityContent) contentModule.getById(cid);
try {
- MirGlobal.abuse().checkArticle(article, req, res);
+ MirGlobal.abuse().checkArticle(
+ article, new HTTPAdapters.HTTPRequestAdapter(aRequest), aResponse);
MirGlobal.localizer().openPostings().afterContentPosting(article);
}
catch (Throwable t) {
logger.error("Error while post-processing article: " + t.getMessage());
}
+ deliver(aRequest, aResponse, mergeData, null, postingFormDoneTemplate);
}
catch (Throwable e) {
+ e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
Throwable cause = ExceptionFunctions.traceCauseException(e);
- if (cause instanceof UnsupportedMediaFormatExc) {
- throw new ServletModuleUserExc("media.unsupportedformat", new String[] {} );
+ if (cause instanceof ModuleMediaType.UnsupportedMimeTypeExc) {
+ throw new ServletModuleUserExc("media.unsupportedformat", new String[] {});
}
throw new ServletModuleFailure(e);
}
+ }
+
+ /**
+ * Due to a serious shortcoming of Tomcat 3.3, an extra sessionid parameter is
+ * generated into open session urls. Tomcat 3.3 makes it impossible to
+ * distinguish between sessions that are identified using a url and those
+ * that are identified using cookies: if both a sessionid cookie and a sessionid
+ * url are available, tomcat 3.3 pretends the url wasn't there...
+ */
+ private static final String SESSION_REQUEST_KEY="sessionid";
+
+ /**
+ * Dispatch method for open sessions: a flexible extensible and customizable way
+ * for open access. Can be used for postings, but also for lots of other stuff.
+ *
+ * @param aRequest
+ * @param aResponse
+ * @throws ServletModuleExc
+ * @throws ServletModuleUserExc
+ * @throws ServletModuleFailure
+ */
+
+ public void opensession(HttpServletRequest aRequest, HttpServletResponse aResponse)
+ throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+
+ try {
+ Request request = new HTTPAdapters.HTTPParsedRequestAdapter(new HTTPParsedRequest(aRequest, 1000000, "/tmp"));
+
+ if (aRequest.isRequestedSessionIdValid() && !aRequest.isRequestedSessionIdFromURL() &&
+ !aRequest.getRequestedSessionId().equals(aRequest.getParameter(SESSION_REQUEST_KEY)))
+ aRequest.getSession().invalidate();
- deliver(req, res, mergeData, null, postingFormDoneTemplate);
+ Session session = new HTTPAdapters.HTTPSessionAdapter(aRequest.getSession());
+
+ SimpleResponse response = new SimpleResponse(
+ ServletHelper.makeGenerationData(new Locale[] {getLocale(aRequest), getFallbackLocale(aRequest)},
+ "bundles.open"));
+
+ response.setResponseValue("actionURL", aResponse.encodeURL(HttpUtils.getRequestURL(aRequest).toString())+"?"+SESSION_REQUEST_KEY+"="+aRequest.getSession().getId());
+
+ SessionHandler handler = MirGlobal.localizer().openPostings().getOpenSessionHandler(request, session);
+
+ handler.processRequest(request, session, response);
+ ServletHelper.generateOpenPostingResponse(aResponse.getWriter(), response.getResponseValues(), response.getResponseGenerator());
+ }
+ catch (Throwable t) {
+ logger.error(t.toString());
+ t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
+
+ throw new ServletModuleFailure(t);
+ }
}
/**
}
}
- /**
- * Method for querying a lucene index
- *
- * @param req
- * @param res
- * @throws ServletModuleExc
- * @throws ServletModuleUserExc
- * @throws ServletModuleFailure
- */
- public void search(HttpServletRequest req, HttpServletResponse res)
- throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
- try {
- final String[] search_variables = { "search_content", "search_boolean", "search_creator",
- "search_topic", "search_hasImages", "search_hasAudio", "search_hasVideo", "search_sort",
- "search_submit", "search_back", "search_forward" };
- HTTPRequestParser requestParser = new HTTPRequestParser(req);
- int increment=10;
- HttpSession session = req.getSession(false);
+ /**
+ * Method for querying a lucene index
+ *
+ * @param req
+ * @param res
+ * @throws ServletModuleExc
+ * @throws ServletModuleUserExc
+ * @throws ServletModuleFailure
+ */
- String queryString="";
+ public void search(HttpServletRequest req, HttpServletResponse res)
+ throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+ try {
+ final String[] search_variables = { "search_content", "search_boolean", "search_creator",
+ "search_topic", "search_hasImages", "search_hasAudio", "search_hasVideo", "search_sort",
+ "search_submit", "search_back", "search_forward" };
+ HTTPRequestParser requestParser = new HTTPRequestParser(req);
- Map mergeData = new HashMap();
+ int increment=10;
- KeywordSearchTerm dateTerm = new KeywordSearchTerm("date_formatted","search_date","webdb_create_formatted","webdb_create_formatted","webdb_create_formatted");
- UnIndexedSearchTerm whereTerm = new UnIndexedSearchTerm("","","","where","where");
- TextSearchTerm creatorTerm = new TextSearchTerm("creator","search_creator","creator","creator","creator");
- TextSearchTerm titleTerm = new TextSearchTerm("title","search_content","title","title","title");
- TextSearchTerm descriptionTerm = new TextSearchTerm("description","search_content","description","description","description");
- ContentSearchTerm contentTerm = new ContentSearchTerm("content_data","search_content","content","","");
- TopicSearchTerm topicTerm = new TopicSearchTerm();
- ImagesSearchTerm imagesTerm = new ImagesSearchTerm();
- AudioSearchTerm audioTerm = new AudioSearchTerm();
- VideoSearchTerm videoTerm = new VideoSearchTerm();
+ HttpSession session = req.getSession(false);
- //make the query available to subsequent iterations
+ String queryString="";
- Iterator j = Arrays.asList(search_variables).iterator();
- while (j.hasNext()) {
- String variable = (String) j.next();
+ Map mergeData = new HashMap();
- mergeData.put(variable, requestParser.getParameter(variable));
- }
+ KeywordSearchTerm dateTerm = new KeywordSearchTerm("date_formatted","search_date","webdb_create_formatted","webdb_create_formatted","webdb_create_formatted");
+ UnIndexedSearchTerm whereTerm = new UnIndexedSearchTerm("","","","where","where");
+ TextSearchTerm creatorTerm = new TextSearchTerm("creator","search_creator","creator","creator","creator");
+ TextSearchTerm titleTerm = new TextSearchTerm("title","search_content","title","title","title");
+ TextSearchTerm descriptionTerm = new TextSearchTerm("description","search_content","description","description","description");
+ ContentSearchTerm contentTerm = new ContentSearchTerm("content_data","search_content","content","","");
+ TopicSearchTerm topicTerm = new TopicSearchTerm();
+ ImagesSearchTerm imagesTerm = new ImagesSearchTerm();
+ AudioSearchTerm audioTerm = new AudioSearchTerm();
+ VideoSearchTerm videoTerm = new VideoSearchTerm();
- try{
- mergeData.put("topics", topicsModule.getTopicsAsSimpleList());
- }
- catch(Throwable e) {
- logger.debug("Can't get topics: " + e.toString());
- }
+ //make the query available to subsequent iterations
- String searchBackValue = req.getParameter("search_back");
- String searchForwardValue = req.getParameter("search_forward");
-
- if (searchBackValue != null){
- int totalHits = ((Integer) session.getAttribute("numberOfHits")).intValue();
- int newPosition=((Integer)session.getAttribute("positionInResults")).intValue()-increment;
- if (newPosition<0)
- newPosition=0;
- if (newPosition >= totalHits)
- newPosition=totalHits-1;
- session.setAttribute("positionInResults",new Integer(newPosition));
- }
- else {
- if (searchForwardValue != null){
+ Iterator j = Arrays.asList(search_variables).iterator();
+ while (j.hasNext()) {
+ String variable = (String) j.next();
+
+ mergeData.put(variable, requestParser.getParameter(variable));
+ }
+
+ try{
+ mergeData.put("topics", topicsModule.getTopicsAsSimpleList());
+ }
+ catch(Throwable e) {
+ logger.debug("Can't get topics: " + e.toString());
+ }
+
+ String searchBackValue = req.getParameter("search_back");
+ String searchForwardValue = req.getParameter("search_forward");
+
+ if (searchBackValue != null){
int totalHits = ((Integer) session.getAttribute("numberOfHits")).intValue();
- int newPosition=((Integer)session.getAttribute("positionInResults")).intValue()+increment;
+ int newPosition=((Integer)session.getAttribute("positionInResults")).intValue()-increment;
if (newPosition<0)
newPosition=0;
if (newPosition >= totalHits)
newPosition=totalHits-1;
-
session.setAttribute("positionInResults",new Integer(newPosition));
}
else {
- String indexPath=configuration.getString("IndexPath");
+ if (searchForwardValue != null){
+ int totalHits = ((Integer) session.getAttribute("numberOfHits")).intValue();
+ int newPosition=((Integer)session.getAttribute("positionInResults")).intValue()+increment;
+ if (newPosition<0)
+ newPosition=0;
+ if (newPosition >= totalHits)
+ newPosition=totalHits-1;
+
+ session.setAttribute("positionInResults",new Integer(newPosition));
+ }
+ else {
+ String indexPath=configuration.getString("IndexPath");
- String creatorFragment = creatorTerm.makeTerm(req);
- if (creatorFragment != null){
- queryString = queryString + " +" + creatorFragment;
- }
+ String creatorFragment = creatorTerm.makeTerm(req);
+ if (creatorFragment != null){
+ queryString = queryString + " +" + creatorFragment;
+ }
- // search title, description, and content for something
- // the contentTerm uses param "search_boolean" to combine its terms
- String contentFragment = contentTerm.makeTerm(req);
- if (contentFragment != null){
- logger.debug("contentFragment: " + contentFragment);
- queryString = queryString + " +" + contentFragment;
- }
+ // search title, description, and content for something
+ // the contentTerm uses param "search_boolean" to combine its terms
+ String contentFragment = contentTerm.makeTerm(req);
+ if (contentFragment != null){
+ logger.debug("contentFragment: " + contentFragment);
+ queryString = queryString + " +" + contentFragment;
+ }
- String topicFragment = topicTerm.makeTerm(req);
- if (topicFragment != null){
- queryString = queryString + " +" + topicFragment;
- }
+ String topicFragment = topicTerm.makeTerm(req);
+ if (topicFragment != null){
+ queryString = queryString + " +" + topicFragment;
+ }
- String imagesFragment = imagesTerm.makeTerm(req);
- if (imagesFragment != null){
- queryString = queryString + " +" + imagesFragment;
- }
+ String imagesFragment = imagesTerm.makeTerm(req);
+ if (imagesFragment != null){
+ queryString = queryString + " +" + imagesFragment;
+ }
- String audioFragment = audioTerm.makeTerm(req);
- if (audioFragment != null){
- queryString = queryString + " +" + audioFragment;
- }
+ String audioFragment = audioTerm.makeTerm(req);
+ if (audioFragment != null){
+ queryString = queryString + " +" + audioFragment;
+ }
- String videoFragment = videoTerm.makeTerm(req);
- if (videoFragment != null){
- queryString = queryString + " +" + videoFragment;
- }
+ String videoFragment = videoTerm.makeTerm(req);
+ if (videoFragment != null){
+ queryString = queryString + " +" + videoFragment;
+ }
- if (queryString == null || queryString == ""){
- queryString = "";
- }
- else{
- try{
- Searcher searcher = null;
- try {
- searcher = new IndexSearcher(indexPath);
- }
- catch(IOException e) {
- logger.debug("Can't open indexPath: " + indexPath);
- throw new ServletModuleExc("Problem with Search Index! : "+ e.toString());
- }
+ if (queryString == null || queryString == ""){
+ queryString = "";
+ }
+ else{
+ try{
+ Searcher searcher = null;
+ try {
+ searcher = new IndexSearcher(indexPath);
+ }
+ catch(IOException e) {
+ logger.debug("Can't open indexPath: " + indexPath);
+ throw new ServletModuleExc("Problem with Search Index! : "+ e.toString());
+ }
- Query query = null;
- try {
- query = QueryParser.parse(queryString, "content", new StandardAnalyzer());
- }
- catch(Exception e) {
- searcher.close();
- logger.debug("Query don't parse: " + queryString);
- throw new ServletModuleExc("Problem with Query String! (was '"+queryString+"')");
- }
+ Query query = null;
+ try {
+ query = QueryParser.parse(queryString, "content", new StandardAnalyzer());
+ }
+ catch(Exception e) {
+ searcher.close();
+ logger.debug("Query don't parse: " + queryString);
+ throw new ServletModuleExc("Problem with Query String! (was '"+queryString+"')");
+ }
- Hits hits = null;
- try {
- hits = searcher.search(query);
- }
- catch(IOException e) {
- searcher.close();
- logger.debug("Can't get hits: " + e.toString());
- throw new ServletModuleExc("Problem getting hits!");
- }
+ Hits hits = null;
+ try {
+ hits = searcher.search(query);
+ }
+ catch(IOException e) {
+ searcher.close();
+ logger.debug("Can't get hits: " + e.toString());
+ throw new ServletModuleExc("Problem getting hits!");
+ }
- int start = 0;
- int end = hits.length();
+ int start = 0;
+ int end = hits.length();
- String sortBy=req.getParameter("search_sort");
- if (sortBy == null || sortBy.equals("")){
- throw new ServletModuleExc("Please let me sort by something!(missing search_sort)");
- }
+ String sortBy=req.getParameter("search_sort");
+ if (sortBy == null || sortBy.equals("")){
+ throw new ServletModuleExc("Please let me sort by something!(missing search_sort)");
+ }
- // here is where the documents will go for storage across sessions
- ArrayList theDocumentsSorted = new ArrayList();
+ // here is where the documents will go for storage across sessions
+ ArrayList theDocumentsSorted = new ArrayList();
- if (sortBy.equals("score")){
- for(int i = start; i < end; i++) {
- theDocumentsSorted.add(hits.doc(i));
+ if (sortBy.equals("score")){
+ for(int i = start; i < end; i++) {
+ theDocumentsSorted.add(hits.doc(i));
+ }
}
- }
- else{
- // then we'll sort by date!
- Map dateToPosition = new HashMap(end,1.0F); //we know how big it will be
- for(int i = start; i < end; i++) {
- String creationDate=(hits.doc(i)).get("creationDate");
- // do a little dance in case two contents created at the same second!
- if (dateToPosition.containsKey(creationDate)){
- ((ArrayList) (dateToPosition.get(creationDate))).add(new Integer(i));
+ else{
+ // then we'll sort by date!
+ Map dateToPosition = new HashMap(end,1.0F); //we know how big it will be
+ for(int i = start; i < end; i++) {
+ String creationDate=(hits.doc(i)).get("creationDate");
+ // do a little dance in case two contents created at the same second!
+ if (dateToPosition.containsKey(creationDate)){
+ ((ArrayList) (dateToPosition.get(creationDate))).add(new Integer(i));
+ }
+ else{
+ ArrayList thePositions = new ArrayList();
+ thePositions.add(new Integer(i));
+ dateToPosition.put(creationDate,thePositions);
+ }
+ }
+ Set keys = dateToPosition.keySet();
+ ArrayList keyList= new ArrayList(keys);
+ Collections.sort(keyList);
+ if (sortBy.equals("date_desc")){
+ Collections.reverse(keyList);
}
else{
- ArrayList thePositions = new ArrayList();
- thePositions.add(new Integer(i));
- dateToPosition.put(creationDate,thePositions);
+ if (!sortBy.equals("date_asc")){
+ throw new ServletModuleExc("don't know how to sort by: "+ sortBy);
+ }
}
- }
- Set keys = dateToPosition.keySet();
- ArrayList keyList= new ArrayList(keys);
- Collections.sort(keyList);
- if (sortBy.equals("date_desc")){
- Collections.reverse(keyList);
- }
- else{
- if (!sortBy.equals("date_asc")){
- throw new ServletModuleExc("don't know how to sort by: "+ sortBy);
+ ListIterator keyTraverser = keyList.listIterator();
+ while (keyTraverser.hasNext()){
+ ArrayList positions = (ArrayList)dateToPosition.get((keyTraverser.next()));
+ ListIterator positionsTraverser=positions.listIterator();
+ while (positionsTraverser.hasNext()){
+ theDocumentsSorted.add(hits.doc(((Integer)(positionsTraverser.next())).intValue()));
+ }
}
}
- ListIterator keyTraverser = keyList.listIterator();
- while (keyTraverser.hasNext()){
- ArrayList positions = (ArrayList)dateToPosition.get((keyTraverser.next()));
- ListIterator positionsTraverser=positions.listIterator();
- while (positionsTraverser.hasNext()){
- theDocumentsSorted.add(hits.doc(((Integer)(positionsTraverser.next())).intValue()));
- }
+
+ try{
+ searcher.close();
+ }
+ catch (IOException e){
+ logger.debug("Can't close searcher: " + e.toString());
+ throw new ServletModuleFailure("Problem closing searcher(normal):" + e.getMessage(), e);
}
- }
- try{
- searcher.close();
+
+ session.removeAttribute("numberOfHits");
+ session.removeAttribute("theDocumentsSorted");
+ session.removeAttribute("positionInResults");
+
+ session.setAttribute("numberOfHits",new Integer(end));
+ session.setAttribute("theDocumentsSorted",theDocumentsSorted);
+ session.setAttribute("positionInResults",new Integer(0));
+
}
catch (IOException e){
logger.debug("Can't close searcher: " + e.toString());
- throw new ServletModuleFailure("Problem closing searcher(normal):" + e.getMessage(), e);
+ throw new ServletModuleFailure("Problem closing searcher: " + e.getMessage(), e);
}
+ }
+ }
+ }
+ try {
+ ArrayList theDocs = (ArrayList)session.getAttribute("theDocumentsSorted");
+ if (theDocs != null){
- session.removeAttribute("numberOfHits");
- session.removeAttribute("theDocumentsSorted");
- session.removeAttribute("positionInResults");
+ mergeData.put("numberOfHits", ((Integer)session.getAttribute("numberOfHits")).toString());
+ List theHits = new Vector();
+ int pIR=((Integer)session.getAttribute("positionInResults")).intValue();
+ int terminus;
+ int numHits=((Integer)session.getAttribute("numberOfHits")).intValue();
- session.setAttribute("numberOfHits",new Integer(end));
- session.setAttribute("theDocumentsSorted",theDocumentsSorted);
- session.setAttribute("positionInResults",new Integer(0));
+ if (!(pIR+increment>=numHits)){
+ mergeData.put("hasNext","y");
+ }
+ else {
+ mergeData.put("hasNext", null);
+ }
+ if (pIR>0){
+ mergeData.put("hasPrevious","y");
+ }
+ else {
+ mergeData.put("hasPrevious", null);
+ }
+ if ((pIR+increment)>numHits){
+ terminus=numHits;
}
- catch (IOException e){
- logger.debug("Can't close searcher: " + e.toString());
- throw new ServletModuleFailure("Problem closing searcher: " + e.getMessage(), e);
+ else {
+ terminus=pIR+increment;
}
+ for(int i = pIR; i < terminus; i++) {
+ Map h = new HashMap();
+ Document theHit = (Document)theDocs.get(i);
+ whereTerm.returnMeta(h,theHit);
+ creatorTerm.returnMeta(h,theHit);
+ titleTerm.returnMeta(h,theHit);
+ descriptionTerm.returnMeta(h,theHit);
+ dateTerm.returnMeta(h,theHit);
+ imagesTerm.returnMeta(h,theHit);
+ audioTerm.returnMeta(h,theHit);
+ videoTerm.returnMeta(h,theHit);
+ theHits.add(h);
+ }
+ mergeData.put("hits",theHits);
}
}
- }
-
- try {
- ArrayList theDocs = (ArrayList)session.getAttribute("theDocumentsSorted");
- if (theDocs != null){
+ catch (Throwable e) {
+ logger.error("Can't iterate over hits: " + e.toString());
- mergeData.put("numberOfHits", ((Integer)session.getAttribute("numberOfHits")).toString());
- List theHits = new Vector();
- int pIR=((Integer)session.getAttribute("positionInResults")).intValue();
- int terminus;
- int numHits=((Integer)session.getAttribute("numberOfHits")).intValue();
+ throw new ServletModuleFailure("Problem getting hits: " + e.getMessage(), e);
+ }
- if (!(pIR+increment>=numHits)){
- mergeData.put("hasNext","y");
- }
- else {
- mergeData.put("hasNext", null);
- }
- if (pIR>0){
- mergeData.put("hasPrevious","y");
- }
- else {
- mergeData.put("hasPrevious", null);
- }
+ mergeData.put("queryString",queryString);
- if ((pIR+increment)>numHits){
- terminus=numHits;
- }
- else {
- terminus=pIR+increment;
- }
- for(int i = pIR; i < terminus; i++) {
- Map h = new HashMap();
- Document theHit = (Document)theDocs.get(i);
- whereTerm.returnMeta(h,theHit);
- creatorTerm.returnMeta(h,theHit);
- titleTerm.returnMeta(h,theHit);
- descriptionTerm.returnMeta(h,theHit);
- dateTerm.returnMeta(h,theHit);
- imagesTerm.returnMeta(h,theHit);
- audioTerm.returnMeta(h,theHit);
- videoTerm.returnMeta(h,theHit);
- theHits.add(h);
- }
- mergeData.put("hits",theHits);
- }
+ deliver(req, res, mergeData, null, searchResultsTemplate);
}
- catch (Throwable e) {
- logger.error("Can't iterate over hits: " + e.toString());
-
- throw new ServletModuleFailure("Problem getting hits: " + e.getMessage(), e);
+ catch (NullPointerException n){
+ throw new ServletModuleFailure("Null Pointer: "+n.toString(), n);
}
+ }
- mergeData.put("queryString",queryString);
+ /*
+ * Method for dynamically generating a pdf using iText
+ */
- deliver(req, res, mergeData, null, searchResultsTemplate);
- }
- catch (NullPointerException n){
- throw new ServletModuleFailure("Null Pointer: "+n.toString(), n);
- }
- }
- /*
- * Method for dynamically generating a pdf using iText
- */
+ public void getpdf(HttpServletRequest req, HttpServletResponse res)
+ throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
+ String ID_REQUEST_PARAM = "id";
+ try {
+ String idParam = req.getParameter(ID_REQUEST_PARAM);
+ if (idParam != null) {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ PDFGenerator pdfMaker = new PDFGenerator(out);
+ RE re = new RE("[0-9]+");
- public void getpdf(HttpServletRequest req, HttpServletResponse res)
- throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
- String ID_REQUEST_PARAM = "id";
- try {
- String idParam = req.getParameter(ID_REQUEST_PARAM);
- if (idParam != null) {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- PDFGenerator pdfMaker = new PDFGenerator(out);
-
- RE re = new RE("[0-9]+");
-
-
- REMatch[] idMatches=re.getAllMatches(idParam);
-
- if (idMatches.length > 1){
- pdfMaker.addLine();
- for (int i = 0; i < idMatches.length; i++){
- REMatch aMatch = idMatches[i];
- String id=aMatch.toString();
- EntityContent contentEnt = (EntityContent)contentModule.getById(id);
- pdfMaker.addIndexItem(contentEnt);
-
- }
- }
-
- for (int i = 0; i < idMatches.length; i++){
- REMatch aMatch = idMatches[i];
-
- String id=aMatch.toString();
-
- EntityContent contentEnt = (EntityContent)contentModule.getById(id);
- pdfMaker.add(contentEnt);
-
- }
-
- pdfMaker.stop();
- res.setContentType("application/pdf");
- byte[] content = out.toByteArray();
- res.setContentLength(content.length);
- res.getOutputStream().write(content);
- res.getOutputStream().flush();
-
- }
- else {
- throw new ServletModuleExc("Missing id.");
- }
- }
- catch (Throwable t) {
- logger.error(t.toString());
- throw new ServletModuleFailure(t);
- }
- }
+ REMatch[] idMatches=re.getAllMatches(idParam);
+ if (idMatches.length > 1){
+ pdfMaker.addLine();
+ for (int i = 0; i < idMatches.length; i++){
+ REMatch aMatch = idMatches[i];
+ String id=aMatch.toString();
+ EntityContent contentEnt = (EntityContent)contentModule.getById(id);
+ pdfMaker.addIndexItem(contentEnt);
- /*
- * Method for dynamically generating a pdf from a fo file
- * (deprecated until fop gets its act together regarding floats)
- */
+ }
+ }
- /*
- public void getpdf(HttpServletRequest req, HttpServletResponse res)
- throws ServletModuleExc, ServletModuleUserExc, ServletModuleFailure {
- String ID_REQUEST_PARAM = "id";
- String language = req.getParameter("language");
- String generateFO=configuration.getString("GenerateFO");
- String generatePDF=configuration.getString("GeneratePDF");
+ for (int i = 0; i < idMatches.length; i++){
+ REMatch aMatch = idMatches[i];
+ String id=aMatch.toString();
- //don't do anything if we are not making FO files, or if we are
- //pregenerating PDF's
- if (generateFO.equals("yes") && generatePDF.equals("no")){
- //fop complains unless you do the logging this way
- org.apache.log.Logger log = null;
- Hierarchy hierarchy = Hierarchy.getDefaultHierarchy();
- log = hierarchy.getLoggerFor("fop");
- log.setPriority(Priority.WARN);
+ EntityContent contentEnt = (EntityContent)contentModule.getById(id);
+ pdfMaker.add(contentEnt);
+
+ }
+
+ pdfMaker.stop();
+ res.setContentType("application/pdf");
+ byte[] content = out.toByteArray();
+ res.setContentLength(content.length);
+ res.getOutputStream().write(content);
+ res.getOutputStream().flush();
- String producerStorageRoot=configuration.getString("Producer.StorageRoot");
- String producerDocRoot=configuration.getString("Producer.DocRoot");
- // String templateDir=MirConfig.getPropWithHome("HTMLTemplateProcessor.Dir");
- String xslSheet=configuration.getString("Producer.HTML2FOStyleSheet");
- try {
- String idParam = req.getParameter(ID_REQUEST_PARAM);
- if (idParam != null) {
- EntityContent contentEnt =
- (EntityContent)contentModule.getById(idParam);
- String publishPath = StringUtil.webdbDate2path(contentEnt.getValue("date"));
- String foFile;
-
- if (language == null){
- foFile = producerStorageRoot + producerDocRoot + "/"
- + publishPath + idParam + ".fo";
}
- else{
- foFile = producerStorageRoot + producerDocRoot + "/"
- + language + publishPath + idParam + ".fo";
+ else {
+ throw new ServletModuleExc("Missing id.");
}
- logger.debug("USING FILES" + foFile + " and " + xslSheet);
- XSLTInputHandler input = new XSLTInputHandler(new File(foFile),
- new File(xslSheet));
-
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- res.setContentType("application/pdf");
-
- Driver driver = new Driver();
- driver.setLogger(log);
- driver.setRenderer(Driver.RENDER_PDF);
- driver.setOutputStream(out);
- driver.render(input.getParser(), input.getInputSource());
-
- byte[] content = out.toByteArray();
- res.setContentLength(content.length);
- res.getOutputStream().write(content);
- res.getOutputStream().flush();
- }
- else {
- throw new ServletModuleExc("Missing id.");
- }
}
catch (Throwable t) {
logger.error(t.toString());
-
throw new ServletModuleFailure(t);
}
+
}
- else {
- throw new ServletModuleExc("Can't generate a PDF because the config tells me not to.");
- }
- }
- */
- protected String createOneTimePasswd(){
+ public String generateOnetimePassword() {
Random r = new Random();
int random = r.nextInt();
+
long l = System.currentTimeMillis();
- l = (l*l*l*l)/random;
- if(l<0) l = l * -1;
- String returnString = ""+l;
- return returnString.substring(5);
- }
+ l = (l * l * l * l) / random;
+ if (l < 0)
+ l = l * -1;
+ String returnString = "" + l;
- /* this is an overwritten method of ServletModule in order
- to use different bundles for open and admin */
-/* public void deliver(HttpServletRequest req, HttpServletResponse res,
- TemplateModelRoot rtm, TemplateModelRoot popups,
- String templateFilename) throws ServletModuleFailure
- {
+ return returnString.substring(5);
}
-*/
+
public void deliver(HttpServletRequest aRequest, HttpServletResponse aResponse, Map aData, Map anExtra, String aGenerator)
throws ServletModuleFailure {
try {
Generator generator = MirGlobal.localizer().generators().makeOpenPostingGeneratorLibrary().makeGenerator(aGenerator);
- generator.generate(anOutputWriter, responseData, logger.asPrintWriter(logger.INFO_MESSAGE));
+ generator.generate(anOutputWriter, responseData, logger);
anOutputWriter.close();
}
public void handleError(HttpServletRequest aRequest, HttpServletResponse aResponse,PrintWriter out, Throwable anException) {
try {
logger.error("error: " + anException);
- anException.printStackTrace();
Map data = new HashMap();
data.put("errorstring", anException.getMessage());
Map data = new HashMap();
MessageResources messages = MessageResources.getMessageResources("bundles.open");
- data.put("errorstring",
- messages.getMessage(getLocale(aRequest), anException.getMessage(), anException.getParameters())
- );
+ data.put("errorstring", messages.getMessage(getLocale(aRequest), anException.getMessage(), anException.getParameters()));
data.put("date", StringUtil.date2readableDateTime(new GregorianCalendar()));
deliver(out, aRequest, aResponse, data, null, configuration.getString("ServletModule.OpenIndy.UserErrorTemplate"));
throw new ServletModuleFailure(e);
}
}
+
+ private String createOneTimePasswd() {
+ return "";
+ }
}
projects / mir.git / blobdiff