Author: shuber
Date: Thu Aug 16 14:25:03 2007
New Revision: 18178
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18178&repname=
=3Djahia
Log:
Fix for JAHIA-2133 : http://www.jahia.net/jira/browse/JAHIA-2133
- All engines have a new meta tag that disables indexing
- Workflow engine is now only available in EDIT mode
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/workflow/A=
dvancedWorkflowEngine.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/engine.j=
sp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/work=
flow/AdvancedWorkflowEngine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.jav=
a&rev=3D18178&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/workflow/A=
dvancedWorkflowEngine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/workflow/A=
dvancedWorkflowEngine.java Thu Aug 16 14:25:03 2007
@@ -26,6 +26,7 @@
import org.jahia.engines.JahiaEngine;
import org.jahia.engines.validation.EngineValidationHelper;
import org.jahia.exceptions.JahiaException;
+import org.jahia.exceptions.JahiaForbiddenAccessException;
import org.jahia.hibernate.manager.SpringContextSingleton;
import org.jahia.params.ParamBean;
import org.jahia.params.ProcessingContext;
@@ -111,9 +112,7 @@
* @return Always true
*/
public boolean authoriseRender(ProcessingContext jParams) {
- // Always allowed to render workflow. In other hand the button is =
displayed
- // only if the logged user has write or admin access.
- return true;
+ return toolBox.authoriseRender(jParams);
}
=
/**
@@ -170,6 +169,11 @@
final String actionScreen =3D jParams.getParameter("screen");
final String obj =3D jParams.getParameter("obj");
final HttpSession session =3D ((ParamBean) jParams).getRequest().g=
etSession();
+
+ if (!toolBox.authoriseRender(jParams)) {
+ throw new JahiaForbiddenAccessException();
+ }
+
if (session.getAttribute("initialObj") =3D=3D null) {
session.setAttribute("initialObj", obj);
}
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/en=
gine.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/engine.jsp&rev=3D18178&repname=3D=
jahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/engine.j=
sp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/engine.j=
sp Thu Aug 16 14:25:03 2007
@@ -153,6 +153,7 @@
<html xmlns=3D"http://www.w3.org/1999/xhtml"; xml:lang=3D"<%=3DjParams.getL=
ocale()%>" lang=3D"<%=3DjParams.getLocale()%>">
<head>
<meta http-equiv=3D"content-type" content=3D"text/html; charset=3DUTF-8"/>
+<meta name=3D"robots" content=3D"noindex,nofollow"/>
<title>Jahia Engine - <%=3DengineTitle%></title>
<link rel=3D"stylesheet"
href=3D"<jahia:serverHttpPath/>/jsp/jahia/engines/css/menu.css" type=
=3D"text/css"/>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
