X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=source%2Fmircoders%2Fservlet%2FServletModuleContent.java;h=5feb152c9be4cb424b77af298a0ddce2d32dff23;hb=63e0ee1fb8038eb6d8f0190cf38c3b3ab2727216;hp=bb666740def4843eca0fca1a4207652372201c98;hpb=b3e74676b764e0188c6ace935d464d9e55f594ff;p=mir.git diff --git a/source/mircoders/servlet/ServletModuleContent.java b/source/mircoders/servlet/ServletModuleContent.java index bb666740..5feb152c 100755 --- a/source/mircoders/servlet/ServletModuleContent.java +++ b/source/mircoders/servlet/ServletModuleContent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001, 2002 The Mir-coders group + * Copyright (C) 2001, 2002 The Mir-coders group * * This file is part of Mir. * @@ -18,15 +18,14 @@ * 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; @@ -35,68 +34,55 @@ import java.util.GregorianCalendar; import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Locale; import java.util.Map; +import java.util.Vector; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import mir.entity.adapter.EntityAdapterModel; import mir.entity.adapter.EntityIteratorAdapter; +import mir.entity.adapter.EntityAdapter; import mir.log.LoggerWrapper; import mir.misc.StringUtil; import mir.servlet.ServletModule; import mir.servlet.ServletModuleExc; import mir.servlet.ServletModuleFailure; -import mir.storage.StorageObjectFailure; import mir.util.CachingRewindableIterator; import mir.util.HTTPRequestParser; import mir.util.JDBCStringRoutines; import mir.util.SQLQueryBuilder; +import mir.util.StringRoutines; import mir.util.URLBuilder; -import mircoders.entity.EntityContent; -import mircoders.entity.EntityUsers; +import mir.generator.Generator; +import mircoders.entity.*; import mircoders.global.MirGlobal; import mircoders.module.ModuleContent; -import mircoders.search.IndexUtil; -import mircoders.storage.DatabaseComment; import mircoders.storage.DatabaseContent; import mircoders.storage.DatabaseContentToTopics; -import org.apache.lucene.index.IndexReader; - -import freemarker.template.SimpleHash; - -/* - * ServletModuleContent - - * deliver html for the article admin form. - * - * @version $Id: ServletModuleContent.java,v 1.43 2003/03/09 19:14:21 idfx Exp $ - * @author rk, mir-coders - * +/** + * Article admin interface code */ public class ServletModuleContent extends ServletModule { - private String editTemplate = configuration.getString("ServletModule.Content.ObjektTemplate");; - private String listTemplate = configuration.getString("ServletModule.Content.ListTemplate"); - private static ServletModuleContent instance = new ServletModuleContent(); public static ServletModule getInstance() { return instance; } + private static ModuleContent contentModule; private ServletModuleContent() { super(); - logger = new LoggerWrapper("ServletModule.Content"); - try { - templateListString = configuration.getString("ServletModule.Content.ListTemplate"); - templateObjektString = configuration.getString("ServletModule.Content.ObjektTemplate"); - templateConfirmString = configuration.getString("ServletModule.Content.ConfirmTemplate"); + logger = new LoggerWrapper("ServletModule.Content"); - mainModule = new ModuleContent(DatabaseContent.getInstance()); + try { + contentModule = new ModuleContent(); + mainModule = contentModule; } - catch (StorageObjectFailure e) { - logger.error("servletmodulecontent konnte nicht initialisiert werden"); + catch (Throwable e) { + logger.fatal("ServletModuleContent could not be initialized: " + e.toString()); } } @@ -109,7 +95,7 @@ public class ServletModuleContent extends ServletModule int offset = requestParser.getIntegerWithDefault("offset", 0); String selectArticleUrl = requestParser.getParameter("selectarticleurl"); - returnArticleList(aRequest, aResponse, where, order, offset, selectArticleUrl); + returnList(aRequest, aResponse, where, order, offset, selectArticleUrl); } public void search(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc, ServletModuleFailure { @@ -124,7 +110,10 @@ public class ServletModuleContent extends ServletModule String selectArticleUrl = requestParser.getParameter("selectarticleurl"); if (searchValue.length()>0) { - if (searchField.equals("contents")) + if (searchField.equals("id")) + queryBuilder.appendAndCondition( + "id='"+JDBCStringRoutines.escapeStringLiteral(searchValue)+"'"); + else if (searchField.equals("contents")) queryBuilder.appendAndCondition( "(lower(content_data) like " + "'%" + JDBCStringRoutines.escapeStringLiteral(searchValue.toLowerCase()) + "%')"+ " or (lower(description) like " + "'%" + JDBCStringRoutines.escapeStringLiteral(searchValue.toLowerCase()) + "%')"); @@ -147,168 +136,197 @@ public class ServletModuleContent extends ServletModule if (searchOrder.length()>0) { if (searchOrder.equals("datedesc")) - queryBuilder.appendAscendingOrder("webdb_create"); - else if (searchOrder.equals("dateasc")) queryBuilder.appendDescendingOrder("webdb_create"); + else if (searchOrder.equals("dateasc")) + queryBuilder.appendAscendingOrder("webdb_create"); else if (searchOrder.equals("title")) - queryBuilder.appendDescendingOrder("title"); + queryBuilder.appendAscendingOrder("title"); else if (searchOrder.equals("creator")) - queryBuilder.appendDescendingOrder("creator"); + queryBuilder.appendAscendingOrder("creator"); } - returnArticleList(aRequest, aResponse, queryBuilder.getWhereClause(), queryBuilder.getOrderByClause(), 0, selectArticleUrl); + returnList(aRequest, aResponse, queryBuilder.getWhereClause(), queryBuilder.getOrderByClause(), 0, selectArticleUrl); } catch (Throwable e) { throw new ServletModuleFailure(e); } } - public void add(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc { - _showObject(null, req, res); + public void add(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { + editObject(aRequest, aResponse, null); } - - public void insert(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc - { -//theLog.printDebugInfo(":: content :: trying to insert"); + public void insert(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { try { - EntityUsers user = _getUser(req); - Map withValues = getIntersectingValues(req, DatabaseContent.getInstance()); + Map withValues = getIntersectingValues(aRequest, DatabaseContent.getInstance()); String now = StringUtil.date2webdbDate(new GregorianCalendar()); withValues.put("date", now); withValues.put("publish_path", StringUtil.webdbDate2path(now)); - withValues.put("to_publisher", user.getId()); + withValues.put("to_publisher", ServletHelper.getUser(aRequest).getId()); withValues.put("is_produced", "0"); if (!withValues.containsKey("is_published")) withValues.put("is_published","0"); if (!withValues.containsKey("is_html")) withValues.put("is_html","0"); + String webdbCreate = (String) withValues.get("webdb_create"); + if (webdbCreate==null || webdbCreate.trim().length()==0) + withValues.remove("webdb_create"); + String id = mainModule.add(withValues); - DatabaseContentToTopics.getInstance().setTopics(id,req.getParameterValues("to_topic")); + logAdminUsage(aRequest, id, "object added"); + + DatabaseContentToTopics.getInstance().setTopics(id, aRequest.getParameterValues("to_topic")); - _showObject(id, req, res); + editObject(aRequest, aResponse, id); } catch (Throwable e) { throw new ServletModuleFailure(e); } } - public void delete(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc - { - EntityUsers user = _getUser(req); - - String idParam = req.getParameter("id"); - if (idParam == null) throw new ServletModuleExc("Invalid call: id missing"); - - String confirmParam = req.getParameter("confirm"); - String cancelParam = req.getParameter("cancel"); - - logger.info("where = " + req.getParameter("where")); - - if (confirmParam == null && cancelParam == null) { - - SimpleHash mergeData = new SimpleHash(); - mergeData.put("module", "Content"); - mergeData.put("infoString", "Content: " + idParam); - mergeData.put("id", idParam); - mergeData.put("where", req.getParameter("where")); - mergeData.put("order", req.getParameter("order")); - mergeData.put("offset", req.getParameter("offset")); - deliver(req, res, mergeData, templateConfirmString); - } - else { - if (confirmParam!= null && !confirmParam.equals("")) { - try { - mainModule.deleteById(idParam); - - /** @todo the following two should be implied in - * DatabaseContent */ - - //delete rows in the content_x_topic-table - DatabaseContentToTopics.getInstance().deleteByContentId(idParam); - //delete rows in the comment-table - DatabaseComment.getInstance().deleteByContentId(idParam); - //delete from lucene index, if any - String index = configuration.getString("IndexPath"); - if (IndexReader.indexExists(index)){ - IndexUtil.unindexID(idParam,index); - } - - } - catch (Throwable e) { - throw new ServletModuleFailure(e); - } - list(req,res); - } - else { - // Datensatz anzeigen - _showObject(idParam, req, res); - } - } - } - - public void edit(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc - { - String idParam = req.getParameter("id"); + public void edit(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { + String idParam = aRequest.getParameter("id"); if (idParam == null) throw new ServletModuleExc("Invalid call: id not supplied "); - _showObject(idParam, req, res); + editObject(aRequest, aResponse, idParam); } -// methods for attaching media file - public void attach(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc - { - String mediaIdParam = req.getParameter("mid"); - String idParam = req.getParameter("cid"); - if (idParam == null||mediaIdParam==null) throw new ServletModuleExc("smod content :: attach :: cid/mid missing"); + /** + * Attaches media to an article + * + */ + public void attach(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { + String mediaIdParam = aRequest.getParameter("mid"); + String articleId = aRequest.getParameter("articleid"); + + if (articleId == null || mediaIdParam==null) + throw new ServletModuleExc("smod content :: attach :: articleid/mid missing"); + + if (!MirGlobal.accessControl().article().mayEditArticle(ServletHelper.getUser(aRequest), articleId)) + throw new ServletModuleExc("Article has been locked"); try { - EntityContent entContent = (EntityContent)mainModule.getById(idParam); + EntityContent entContent = (EntityContent) mainModule.getById(articleId); entContent.attach(mediaIdParam); } catch(Throwable e) { - logger.error("smod content :: attach :: could not get entityContent"); + throw new ServletModuleFailure(e); } - _showObject(idParam, req, res); + logAdminUsage(aRequest, articleId, "media " + mediaIdParam + " attached"); + + editObject(aRequest, aResponse, articleId); } - public void dettach(HttpServletRequest req, HttpServletResponse res) throws ServletModuleExc + /** + * Deattaches media from an article + */ + public void dettach(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { - String cidParam = req.getParameter("cid"); - String midParam = req.getParameter("mid"); - if (cidParam == null) - throw new ServletModuleExc("smod content :: dettach :: cid missing"); + String articleId = aRequest.getParameter("articleid"); + String midParam = aRequest.getParameter("mid"); + if (articleId == null) + throw new ServletModuleExc("smod content :: dettach :: articleid missing"); if (midParam == null) throw new ServletModuleExc("smod content :: dettach :: mid missing"); + if (!MirGlobal.accessControl().article().mayEditArticle(ServletHelper.getUser(aRequest), articleId)) + throw new ServletModuleExc("Article has been locked"); + try { - EntityContent entContent = (EntityContent)mainModule.getById(cidParam); - entContent.dettach(cidParam,midParam); + EntityContent entContent = (EntityContent)mainModule.getById(articleId); + entContent.dettach(articleId, midParam); } catch(Throwable e) { - logger.error("smod content :: dettach :: could not get entityContent"); + throw new ServletModuleFailure(e); } - _showObject(cidParam, req, res); + logAdminUsage(aRequest, articleId, "media " + midParam + " deattached"); + + editObject(aRequest, aResponse, articleId); } + /** + * Locks an article + */ + public void lock(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc + { + HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); + + String idParam = requestParser.getParameter("id"); + if (idParam == null) + throw new ServletModuleExc("Wrong call: (id) is missing"); + + EntityUsers user = ServletHelper.getUser(aRequest); + + if (!MirGlobal.accessControl().article().mayLockArticle(user, idParam)) + throw new ServletModuleExc("Unable to lock"); + + contentModule.lockArticle(idParam, user.getId(), false); + + editObject(aRequest, aResponse, idParam); + } + + /** + * Unlocks an article + */ + public void unlock(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc + { + HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); + + String idParam = requestParser.getParameter("id"); + if (idParam == null) + throw new ServletModuleExc("Wrong call: (id) is missing"); + + EntityUsers user = ServletHelper.getUser(aRequest); + + if (!MirGlobal.accessControl().article().mayUnlockArticle(user, idParam)) + throw new ServletModuleExc("Unable to unlock"); + + contentModule.unlockArticle(idParam, user.getId(), false); + + editObject(aRequest, aResponse, idParam); + } + + /** + * Forcelocks an article + */ + public void forcelock(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc + { + HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); + + String idParam = requestParser.getParameter("id"); + if (idParam == null) + throw new ServletModuleExc("Wrong call: (id) is missing"); + + EntityUsers user = ServletHelper.getUser(aRequest); + + if (!MirGlobal.accessControl().article().mayForceLockArticle(user, idParam)) + throw new ServletModuleExc("Unable to force lock"); + + contentModule.lockArticle(idParam, user.getId(), true); + + editObject(aRequest, aResponse, idParam); + } + + /** + * Stores an article + */ public void update(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { try { HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); - String returnUrl = requestParser.getParameter("returnurl"); - - String idParam = aRequest.getParameter("id"); + String idParam = requestParser.getParameter("id"); if (idParam == null) throw new ServletModuleExc("Wrong call: (id) is missing"); + if (!MirGlobal.accessControl().article().mayEditArticle(ServletHelper.getUser(aRequest), idParam)) + throw new ServletModuleExc("Article has been locked"); + Map withValues = getIntersectingValues(aRequest, DatabaseContent.getInstance()); - String[] topic_id = aRequest.getParameterValues("to_topic"); - String content_id = aRequest.getParameter("id"); withValues.put("is_produced", "0"); if (!withValues.containsKey("is_published")) @@ -316,34 +334,40 @@ public class ServletModuleContent extends ServletModule if (!withValues.containsKey("is_html")) withValues.put("is_html","0"); + String webdbCreate = (String) withValues.get("webdb_create"); + if (webdbCreate==null || webdbCreate.trim().length()==0) + withValues.remove("webdb_create"); + String id = mainModule.set(withValues); - DatabaseContentToTopics.getInstance().setTopics(aRequest.getParameter("id"),topic_id); - String whereParam = aRequest.getParameter("where"); - String orderParam = aRequest.getParameter("order"); + logAdminUsage(aRequest, id, "object modified"); + + DatabaseContentToTopics.getInstance().setTopics(aRequest.getParameter("id"), aRequest.getParameterValues("to_topic")); - if (returnUrl!=null){ - redirect(aResponse, returnUrl); + if (MirGlobal.accessControl().article().mayUnlockArticle(ServletHelper.getUser(aRequest), idParam) && + (requestParser.getParameterWithDefault("unlock", "0").equals("1"))) { + contentModule.unlockArticle(id, ServletHelper.getUser(aRequest).getId(), false); } - else - _showObject(idParam, aRequest, aResponse); + + editObject(aRequest, aResponse, idParam); } catch (Throwable e) { throw new ServletModuleFailure(e); } } -/* - * HelperMethod shows the basic article editing form. - * - * if the "id" parameter is null, it means show an empty form to add a new - * article. -*/ - public void _showObject(String id, HttpServletRequest aRequest, HttpServletResponse aResponse) + + /** + * Returns the basic article editing form. + * + * @param id identifier of the article. null, means show an + * empty form to add a new article. + */ + public void editObject(HttpServletRequest aRequest, HttpServletResponse aResponse, String id) throws ServletModuleExc { try { HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); - Map responseData = ServletHelper.makeGenerationData(getLocale(aRequest)); + Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)}); EntityAdapterModel model = MirGlobal.localizer().dataModel().adapterModel(); Map article; URLBuilder urlBuilder = new URLBuilder(); @@ -356,9 +380,16 @@ public class ServletModuleContent extends ServletModule if (id!=null) { responseData.put("new", Boolean.FALSE); article = model.makeEntityAdapter("content", mainModule.getById(id)); + + EntityUsers user = ServletHelper.getUser(aRequest); + + responseData.put("mayEdit", new Boolean(MirGlobal.accessControl().article().mayEditArticle(user, id))); + responseData.put("mayLock", new Boolean(MirGlobal.accessControl().article().mayLockArticle(user, id))); + responseData.put("mayForceLock", new Boolean(MirGlobal.accessControl().article().mayForceLockArticle(user, id))); + responseData.put("mayUnlock", new Boolean(MirGlobal.accessControl().article().mayUnlockArticle(user, id))); } else { - List fields = DatabaseContent.getInstance().getFields(); + List fields = DatabaseContent.getInstance().getFieldNames(); responseData.put("new", Boolean.TRUE); article = new HashMap(); Iterator i = fields.iterator(); @@ -369,20 +400,86 @@ public class ServletModuleContent extends ServletModule article.put("to_topics", null); MirGlobal.localizer().adminInterface().initializeArticle(article); + + responseData.put("mayEdit", Boolean.TRUE); + responseData.put("mayLock", Boolean.FALSE); + responseData.put("mayForceLock", Boolean.FALSE); + responseData.put("mayUnlock", Boolean.FALSE); } responseData.put("article", article); + List topicsList = new Vector(); + + String[] topicCategories = configuration.getStringArray("Mir.Localizer.Admin.TopicLists"); + + if (topicCategories.length==0 ) { + Map categoryMap = new HashMap(); + categoryMap.put("key", "topic"); + categoryMap.put("listtype", "0"); + categoryMap.put("listparameter", "3"); + categoryMap.put("items", + new EntityIteratorAdapter("", "title", + 20, MirGlobal.localizer().dataModel().adapterModel(), "topic")); + topicsList.add(categoryMap); + } + else + { + + for (int i = 0; i < topicCategories.length; i++) { + try { + Map categoryMap = new HashMap(); + List parts = StringRoutines.splitString(topicCategories[i], ":"); + String key = null; + String listtype = "0"; + String listparameter = "5"; + String where = ""; + String order = ""; + + if (parts.size() > 0) + key = (String) parts.get(0); + if (parts.size() > 1) + listtype = (String) parts.get(1); + if (parts.size() > 2) + listparameter = (String) parts.get(2); + if (parts.size() > 3) + where = (String) parts.get(3); + if (parts.size() > 4) + order = (String) parts.get(4); + + if (key != null) { + categoryMap.put("key", key); + categoryMap.put("listtype", listtype); + categoryMap.put("listparameter", listparameter); + categoryMap.put("items", + new EntityIteratorAdapter(where, order, + 20, MirGlobal.localizer().dataModel().adapterModel(), "topic")); + topicsList.add(categoryMap); + } + } + catch (Throwable t) { + logger.error("error while preparing topics: " + t.toString()); + } + } + } + + responseData.put("topics", topicsList); + responseData.put("returnurl", requestParser.getParameter("returnurl")); responseData.put("thisurl", urlBuilder.getQuery()); - ServletHelper.generateResponse(aResponse.getWriter(), responseData, editTemplate); + ServletHelper.generateResponse(aResponse.getWriter(), responseData, editGenerator); } catch (Throwable e) { throw new ServletModuleFailure(e); } } - public void returnArticleList( + public void returnList(HttpServletRequest aRequest, HttpServletResponse aResponse, + String aWhereClause, String anOrderByClause, int anOffset) throws ServletModuleExc { + this.returnList(aRequest, aResponse, aWhereClause, anOrderByClause, anOffset, null); + } + + public void returnList( HttpServletRequest aRequest, HttpServletResponse aResponse, String aWhereClause, @@ -392,18 +489,14 @@ public class ServletModuleContent extends ServletModule HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); URLBuilder urlBuilder = new URLBuilder(); - EntityAdapterModel model; - int nrArticlesPerPage = 20; int count; try { - Map responseData = ServletHelper.makeGenerationData(getLocale(aRequest)); - model = MirGlobal.localizer().dataModel().adapterModel(); - + Map responseData = ServletHelper.makeGenerationData(aRequest, aResponse, new Locale[] { getLocale(aRequest), getFallbackLocale(aRequest)}); Object articleList = new CachingRewindableIterator( - new EntityIteratorAdapter( aWhereClause, anOrderByClause, nrArticlesPerPage, - MirGlobal.localizer().dataModel().adapterModel(), "content", nrArticlesPerPage, anOffset) + new EntityIteratorAdapter( aWhereClause, anOrderByClause, nrEntitiesPerListPage, + MirGlobal.localizer().dataModel().adapterModel(), "content", nrEntitiesPerListPage, anOffset) ); responseData.put("nexturl", null); @@ -435,13 +528,13 @@ public class ServletModuleContent extends ServletModule responseData.put("offset" , new Integer(anOffset).toString()); responseData.put("thisurl" , urlBuilder.getQuery()); - if (count>=anOffset+nrArticlesPerPage) { - urlBuilder.setValue("offset", (anOffset + nrArticlesPerPage)); + if (count>=anOffset+nrEntitiesPerListPage) { + urlBuilder.setValue("offset", (anOffset + nrEntitiesPerListPage)); responseData.put("nexturl" , urlBuilder.getQuery()); } if (anOffset>0) { - urlBuilder.setValue("offset", Math.max(anOffset - nrArticlesPerPage, 0)); + urlBuilder.setValue("offset", Math.max(anOffset - nrEntitiesPerListPage, 0)); responseData.put("prevurl" , urlBuilder.getQuery()); } @@ -449,12 +542,12 @@ public class ServletModuleContent extends ServletModule responseData.put("from" , Integer.toString(anOffset+1)); responseData.put("count", Integer.toString(count)); - responseData.put("to", Integer.toString(Math.min(anOffset+nrArticlesPerPage, count))); + responseData.put("to", Integer.toString(Math.min(anOffset+nrEntitiesPerListPage, count))); responseData.put("offset" , Integer.toString(anOffset)); responseData.put("order", anOrderByClause); responseData.put("where" , aWhereClause); - ServletHelper.generateResponse(aResponse.getWriter(), responseData, listTemplate); + ServletHelper.generateResponse(aResponse.getWriter(), responseData, listGenerator); } catch (Throwable e) { throw new ServletModuleFailure(e); @@ -472,15 +565,14 @@ public class ServletModuleContent extends ServletModule urlBuilder.setValue("childid", requestParser.getParameter("id")); urlBuilder.setValue("returnurl", requestParser.getParameter("returnurl")); - returnArticleList(aRequest, aResponse, "", "", 0, urlBuilder.getQuery()); + returnList(aRequest, aResponse, "", "", 0, urlBuilder.getQuery()); } catch (Throwable e) { throw new ServletModuleFailure(e); } } - public void listchildren(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc - { + public void listchildren(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { try { HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); String articleId = requestParser.getParameter("article_id"); @@ -488,7 +580,7 @@ public class ServletModuleContent extends ServletModule if (articleId == null) throw new ServletModuleExc("ServletModuleContent.listchildren: article_id not set!"); - returnArticleList(aRequest, aResponse, "to_content = " + articleId, "", 0, null); + returnList(aRequest, aResponse, "to_content = " + articleId, "webdb_create desc", 0, null); } catch (Throwable e) { throw new ServletModuleFailure(e); @@ -498,22 +590,26 @@ public class ServletModuleContent extends ServletModule public void setparent(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); - String articleId = aRequest.getParameter("childid"); - String parentId = aRequest.getParameter("id"); - String returnUrl = aRequest.getParameter("returnurl"); + String articleId = requestParser.getParameter("childid"); + String parentId = requestParser.getParameter("id"); + String returnUrl = requestParser.getParameter("returnurl"); + + if (!MirGlobal.accessControl().article().mayEditArticle(ServletHelper.getUser(aRequest), articleId)) + throw new ServletModuleExc("Article has been locked"); try { EntityContent article = (EntityContent) mainModule.getById(articleId); - article.setValueForProperty("to_content", parentId); + article.setFieldValue("to_content", parentId); article.setProduced(false); article.update(); + logAdminUsage(aRequest, articleId, "parent set to " + parentId); } catch(Throwable e) { logger.error("ServletModuleContent.setparent: " + e.getMessage()); throw new ServletModuleFailure(e); } - redirect(aResponse, returnUrl); + ServletHelper.redirect(aResponse, returnUrl); } public void clearparent(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc @@ -524,9 +620,10 @@ public class ServletModuleContent extends ServletModule try { EntityContent article = (EntityContent) mainModule.getById(articleId); - article.setValueForProperty("to_content", ""); + article.setFieldValue("to_content", ""); article.setProduced(false); article.update(); + logAdminUsage(aRequest, articleId, "parent cleared"); } catch(Throwable e) { e.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE)); @@ -535,13 +632,24 @@ public class ServletModuleContent extends ServletModule throw new ServletModuleFailure("ServletModuleContent.clearparent: " + e.getMessage(), e); } - redirect(aResponse, returnUrl); + ServletHelper.redirect(aResponse, returnUrl); } - private EntityUsers _getUser(HttpServletRequest req) - { - HttpSession session=req.getSession(false); + public void showPreview(HttpServletRequest aRequest, HttpServletResponse aResponse) throws ServletModuleExc { + try { + HTTPRequestParser requestParser = new HTTPRequestParser(aRequest); + String articleId = requestParser.getParameter("id"); + EntityAdapter article = model.makeEntityAdapter("content", mainModule.getById(articleId)); + String preview = requestParser.getParameterWithDefault("preview", "default"); + + Map generationValues = new HashMap(); + Generator generator = + MirGlobal.localizer().adminInterface().prepareArticlePreview(preview, article, generationValues); - return (EntityUsers)session.getAttribute("login.uid"); + generator.generate(aResponse.getWriter(), generationValues, logger); + } + catch (Exception e) { + throw new ServletModuleFailure(e); + } } }