import mircoders.storage.*;
import mircoders.module.*;
import mircoders.producer.*;
+import mircoders.global.*;
+import mircoders.localizer.*;
/*
* ServletModuleOpenIndy -
private ModuleImages imageModule;
private ModuleTopics themenModule;
private String directOp ="yes";
-
+ private String passwdProtection ="yes";
// Singelton / Kontruktor
private static ServletModuleOpenIndy instance = new ServletModuleOpenIndy();
public static ServletModule getInstance() { return instance; }
postingFormDoneTemplate = MirConfig.getProp("ServletModule.OpenIndy.PostingDoneTemplate");
postingFormDupeTemplate = MirConfig.getProp("ServletModule.OpenIndy.PostingDupeTemplate");
directOp = MirConfig.getProp("DirectOpenposting").toLowerCase();
+ passwdProtection = MirConfig.getProp("PasswdProtection").toLowerCase();
mainModule = new ModuleComment(DatabaseComment.getInstance());
contentModule = new ModuleContent(DatabaseContent.getInstance());
themenModule = new ModuleTopics(DatabaseTopics.getInstance());
imageModule = new ModuleImages(DatabaseImages.getInstance());
defaultAction="addposting";
+
}
catch (StorageObjectException e) {
theLog.printError("servletmoduleopenindy could not be initialized");
String aid = req.getParameter("aid"); // the article id the comment will belong to
if (aid!=null && !aid.equals(""))
{
- SimpleHash mergeData = new SimpleHash();
- // ok, article
+ SimpleHash mergeData = new SimpleHash();
+
+ // onetimepasswd
+ if(passwdProtection.equals("yes")){
+ String passwd = this.createOneTimePasswd();
+ System.out.println(passwd);
+ HttpSession session = req.getSession(false);
+ session.setAttribute("passwd",passwd);
+ mergeData.put("passwd", passwd);
+ }
+
mergeData.put("aid", aid);
deliver(req, res, mergeData, commentFormTemplate);
}
* the commentDone Page
*/
- public void inscomment(HttpServletRequest req, HttpServletResponse res) throws ServletModuleException
+ public void inscomment(HttpServletRequest req, HttpServletResponse res)
+ throws ServletModuleException,ServletModuleUserException
{
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 {
HashMap 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);
-
+
withValues.put(k,StringUtil.removeHTMLTags(v));
}
withValues.put("is_published","1");
+ //checking the onetimepasswd
+ if(passwdProtection.equals("yes")){
+ HttpSession session = req.getSession(false);
+ String sessionPasswd = (String)session.getAttribute("passwd");
+ if ( sessionPasswd == null){
+ throw new ServletModuleUserException("Lost password");
+ }
+ String passwd = req.getParameter("passwd");
+ if ( passwd == null || (!sessionPasswd.equals(passwd))) {
+ throw new ServletModuleUserException("Missing password");
+ }
+ session.invalidate();
+ }
+
// inserting into database
String id = mainModule.add(withValues);
theLog.printDebugInfo("id: "+id);
if(id==null){
deliver(req, res, new SimpleHash(), commentFormDupeTemplate);
}
-
- // producing new page
- new ProducerContent().handle(null, null, true, false, aid);
- // sync the server
- int exitValue = Helper.rsync();
- theLog.printDebugInfo("rsync:"+exitValue);
+ MirGlobal.localizer().openPostings().afterCommentPosting();
// redirecting to url
// should implement back to article
public void addposting(HttpServletRequest req, HttpServletResponse res)
throws ServletModuleException {
SimpleHash mergeData = new SimpleHash();
+
+ // onetimepasswd
+ if(passwdProtection.equals("yes")){
+ String passwd = this.createOneTimePasswd();
+ System.out.println(passwd);
+ HttpSession session = req.getSession(false);
+ session.setAttribute("passwd",passwd);
+ mergeData.put("passwd", passwd);
+ }
+
+ String maxMedia = MirConfig.getProp("ServletModule.OpenIndy.MaxMediaUploadItems");
String numOfMedia = req.getParameter("medianum");
if(numOfMedia==null||numOfMedia.equals("")){
numOfMedia="1";
+ } else if(Integer.parseInt(numOfMedia) > Integer.parseInt(maxMedia)) {
+ numOfMedia = maxMedia;
}
-
+
int mediaNum = Integer.parseInt(numOfMedia);
SimpleList mediaFields = new SimpleList();
for(int i =0; i<mediaNum;i++){
}
mergeData.put("medianum",numOfMedia);
mergeData.put("mediafields",mediaFields);
-
-
+
+
SimpleHash extraInfo = new SimpleHash();
- /** @todo popups missing */
try{
SimpleList popUpData = DatabaseLanguage.getInstance().getPopupData();
extraInfo.put("languagePopUpData", popUpData );
extraInfo.put("themenPopupData", themenModule.getTopicsAsSimpleList());
+
+// ML: Bolivia specific, will move it towards localization
+ extraInfo.put("topics", themenModule.getTopicsList());
+ String defaultCity = req.getParameter("city");
+ if(defaultCity!=null && !defaultCity.equals("")){
+ extraInfo.put("city", defaultCity);
+ }
+
} catch (Exception e) {
theLog.printError("languagePopUpData or getTopicslist failed "
+e.toString());
throw new ServletModuleException("OpenIndy -- failed getting language or topics: "+e.toString());
- }
-
+ }
+
+
+
deliver(req, res, mergeData, extraInfo, postingFormTemplate);
}
try {
WebdbMultipartRequest mp = new WebdbMultipartRequest(req);
-
+
HashMap withValues = mp.getParameters();
+ //checking the onetimepasswd
+ if(passwdProtection.equals("yes")){
+ HttpSession session = req.getSession(false);
+ String sessionPasswd = (String)session.getAttribute("passwd");
+ if ( sessionPasswd == null){
+ throw new ServletModuleUserException("Lost password");
+ }
+ String passwd = (String)withValues.get("passwd");
+ if ( passwd == null || (!sessionPasswd.equals(passwd))) {
+ throw new ServletModuleUserException("Missing password");
+ }
+ session.invalidate();
+ }
+
if ((((String)withValues.get("title")).length() == 0) ||
(((String)withValues.get("description")).length() == 0) ||
(((String)withValues.get("content_data")).length() == 0))
throw new ServletModuleUserException("Missing field");
-
+
// call the routines that escape html
for (Iterator i=withValues.keySet().iterator(); i.hasNext(); ){
String k=(String)i.next();
String v=(String)withValues.get(k);
-
+
if (k.equals("content_data")){
//this doesn't quite work yet, so for now, all html goes
//withValues.put(k,StringUtil.approveHTMLTags(v));
} else {
withValues.put(k,StringUtil.removeHTMLTags(v));
}
-
+
}
withValues.put("date", StringUtil.date2webdbDate(new GregorianCalendar()));
withValues.put("is_published","0");
// if op direct article-type == newswire
if (directOp.equals("yes")) withValues.put("to_article_type","1");
-
+
// owner is openposting user
withValues.put("to_publisher","1");
if (withValues.get("creator").toString().equals(""))
}
String[] to_topicsArr = mp.getParameterValues("to_topic");
-
+
if (to_topicsArr != null && to_topicsArr.length > 0) {
try{
DatabaseContentToTopics.getInstance().setTopics(cid,to_topicsArr);
throw new ServletModuleException("smod - openindy :: insposting: setting content_x_topic failed: "+e.toString());
} //end try
} //end if
-
+
// if op contains uploaddata
String mediaId=null;
int i=1;
//the browser is in error, better check against the file extension
if (contentType.equals("text/plain") ||
contentType.equals("application/octet-stream")) {
- /**
- * This is just a temporary way to get the content-type via
- * the .extension , we could maybe use a magic method, by looking
- * at the header (first few bytes) of the file. (like the file(1)
- * command).
- * The Oreilly method relies on the content-type that the client
- * browser sends and that sometimes is application-octet stream with
- * broken/mis-configured browsers.
- *
- * The map file should be Mir/content-types.properties, it's the
- * default Sun Java file with some additional entries that it did
- * not have. So if you support a new media type you have to make
- * sure that it is in this file -mh
- */
- contentType = FileUtil.guessContentTypeFromName(fileName);
- if (contentType==null)
- contentType = "text/plain"; // rfc1867 says this is the default
+ /**
+ * Fallback to finding the mime-type through the standard ServletApi
+ * ServletContext getMimeType() method.
+ *
+ * This is a way to get the content-type via the .extension,
+ * we could maybe use a magic method as an additional method of
+ * figuring out the content-type, by looking at the header (first
+ * few bytes) of the file. (like the file(1) command). We could
+ * also call the "file" command through Runtime. This is an
+ * option that I almost prefer as it is already implemented and
+ * exists with an up-to-date map on most modern Unix like systems.
+ * I haven't found a really nice implementation of the magic method
+ * in pure java yet.
+ *
+ * The first method we try thought is the "Oreilly method". It
+ * relies on the content-type that the client browser sends and
+ * that sometimes is application-octet stream with
+ * broken/mis-configured browsers.
+ *
+ * The map file we use for the extensions is the standard web-app
+ * deployment descriptor file (web.xml). See Mir's web.xml or see
+ * your Servlet containers (most likely Tomcat) documentation.
+ * So if you support a new media type you have to make sure that
+ * it is in this file -mh
+ */
+ ServletContext ctx =
+ (ServletContext)MirConfig.getPropAsObject("ServletContext");
+ contentType = ctx.getMimeType(fileName);
+ if (contentType==null)
+ contentType = "text/plain"; // rfc1867 says this is the default
}
HashMap mediaValues = new HashMap();
theLog.printInfo("CONTENT TYPE IS: "+contentType);
-
+
if (contentType.equals("text/plain") ||
contentType.equals("application/octet-stream")) {
contentModule.deleteById(cid);
String mediaTypeId = null;
MirMedia mediaHandler;
Database mediaStorage;
- ProducerMedia mediaProducer;
-
+// ProducerMedia mediaProducer;
+
//if we didn't find an entry matching the
//content-type int the table.
if (mediaTypesList.size() == 0) {
Entity mediaType = null;
Entity mediaType2 = null;
-
+
// find out if we an exact content-type match if so take it.
// otherwise try to match majortype/*
// @todo this should probably be moved to DatabaseMediaType -mh
mediaType = mediaTypesList.elementAt(j);
else if ((mediaTypesList.elementAt(j).getValue("mime_type")).equals(
cTypeSplit[0]+"/*") )
- mediaType2= mediaTypesList.elementAt(j);
- }
+ mediaType2= mediaTypesList.elementAt(j);
+ }
if ( (mediaType == null) && (mediaType2 == null) ) {
contentModule.deleteById(cid);
mediaHandler = MediaHelper.getHandler(mediaType);
mediaStorage = MediaHelper.getStorage(mediaType,
"mircoders.storage.Database");
- Class prodCls = Class.forName("mircoders.producer.Producer"
- +mediaType.getValue("tablename"));
- mediaProducer = (ProducerMedia)prodCls.newInstance();
+// Class prodCls = Class.forName("mircoders.producer.Producer"
+// +mediaType.getValue("tablename"));
+// mediaProducer = (ProducerMedia)prodCls.newInstance();
} catch (Exception e) {
theLog.printError("getting media handler failed: "+e.toString());
contentModule.deleteById(cid);
//were done with mpReq at this point, dereference it.
//as it contains mucho mem. -mh 01.10.2001
mpReq=null;
-
+
//we got this far, associate the media to the article
mediaEnt.setValueForProperty("is_published","1");
mediaEnt.update();
//produce it
- mediaProducer.handle(null, null, false, false, mediaId);
+// mediaProducer.handle(null, null, false, false, mediaId);
DatabaseContentToMedia.getInstance().addMedia(cid,mediaId);
} catch (Exception e) {
theLog.printError("setting media failed: "+e.toString());
//dereference mp. -mh
mp=null;
- // producing openpostinglist
- new ProducerOpenPosting().handle(null,null,false,false);
- // producing new page
- new ProducerContent().handle(null, null, false, false,cid);
- //if direct op producing startpage
- if (directOp.equals("yes")) new ProducerStartPage().handle(null,null);
-
- //produce the topicPages if set
- //should be more intelligent
- //if(setTopic==true) new ProducerTopics().handle(null,null);
-
- // sync the server
- //should be configureable
- int exitValue = Helper.rsync();
- theLog.printDebugInfo("rsync: "+exitValue);
+ MirGlobal.localizer().openPostings().afterContentPosting();
}
catch (IOException e) { throw new ServletModuleException("IOException: "+ e.toString());}
catch (StorageObjectException e) { throw new ServletModuleException("StorageObjectException" + e.toString());}
+", we do not support this mime-type. "
+"Error One or more files of unrecognized type. Sorry");
}
-
+
+ protected String createOneTimePasswd(){
+ 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);
+ }
+
}
projects / mir.git / blobdiff