Author: xlawrence
Date: Fri Jun 29 11:05:13 2007
New Revision: 17829
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17829&repname=
=3Djahia
Log:
Backport addition of 2 roles for WAI and url integrity checks
Modified:
trunk/core/src/java/org/jahia/engines/shared/BigText_Field.java
trunk/core/src/java/org/jahia/services/htmlparser/WAIValidator.java
trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services.xml
Modified: trunk/core/src/java/org/jahia/engines/shared/BigText_Field.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/shared/BigText_Field.java&rev=3D17829&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
--- trunk/core/src/java/org/jahia/engines/shared/BigText_Field.java (origin=
al)
+++ trunk/core/src/java/org/jahia/engines/shared/BigText_Field.java Fri Jun=
29 11:05:13 2007
@@ -31,10 +31,7 @@
import org.jahia.data.containers.JahiaContainer;
import org.jahia.data.containers.JahiaContainerList;
import org.jahia.data.fields.*;
-import org.jahia.engines.EngineMessage;
-import org.jahia.engines.EngineMessages;
-import org.jahia.engines.JahiaEngine;
-import org.jahia.engines.JahiaEngineTools;
+import org.jahia.engines.*;
import org.jahia.engines.validation.EngineValidationHelper;
import org.jahia.engines.validation.ValidationError;
import org.jahia.exceptions.JahiaException;
@@ -181,11 +178,15 @@
Vector DOMVisitors =3D ServicesRegistry.getInstance().
getHtmlParserService().
getHtmlDOMVisitors(theField.getJahiaID());
+ // Special processing for image links
+ fieldValue =3D StringUtils.replace(fieldValue, "/></a>", "=
/>///</a>");
fieldValue =3D StringUtils.replace(fieldValue, "></a>", ">=
</a>");
fieldValue =3D JahiaTextContentTidy.tidyPreProcessing(fiel=
dValue);
fieldValue =3D ServicesRegistry.getInstance().getHtmlParse=
rService().
parse(fieldValue, DOMVisitors, theField.getSiteID(=
));
fieldValue =3D JahiaTextContentTidy.tidyPostProcessing(fie=
ldValue);
+ // Special processing for image links =
+ fieldValue =3D StringUtils.replace(fieldValue, "/>///</a>"=
, "/></a>");
}
=
// Check for HTML parser errors
@@ -546,6 +547,17 @@
//theField.setValue( FormDataManager.formEncode( fieldValue ) =
);
=
theField.setValue(fieldValue);
+
+ if (site.getURLIntegrityCheck() =3D=3D 1) {
+ final EngineMessages warningMessages =3D composeWarningMes=
sages(jParams,
+ engineMap, theField, false);
+
+ if (! warningMessages.isEmpty()) {
+ warningMessages.saveMessages(theField.getID() + ".warn=
ing.", ((ParamBean) jParams).getRequest());
+ logger.debug("There are some Integrity warning message=
s !");
+ }
+ }
+
output =3D ServicesRegistry.getInstance().getJahiaFetcherServi=
ce().
fetchServlet((ParamBean) jParams, forward);
} else {
@@ -791,9 +803,17 @@
* If set to False, the method will only consider the =
current language
* of the ProcessingContext instance.
*/
- protected EngineMessages composeWarningMessages(final ProcessingContex=
t jParams, final Map engineMap,
- final JahiaField theFi=
eld, final boolean allLangs) throws JahiaException {
-
+ protected EngineMessages composeWarningMessages(final ProcessingContex=
t jParams,
+ final Map engineMap,
+ final JahiaField theFi=
eld,
+ final boolean allLangs=
) throws JahiaException {
+ final EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMa=
p.get(JahiaEngine.ENGINE_LANGUAGE_HELPER);
+ final Locale oldLoc =3D jParams.getLocale();
+ if (elh !=3D null) {
+ if (! elh.getCurrentLocale().toString().equals(oldLoc.toString=
())) {
+ return new EngineMessages();
+ }
+ }
final String value =3D theField.getValue();
if (logger.isDebugEnabled())
logger.debug("composeWarningMessages... " + value);
@@ -832,7 +852,7 @@
} catch (JahiaPageNotFoundException e) {
final EngineMessage msg =3D new EngineMessage(
"org.jahia.engines.shared.BigText_Field.notExi=
stingWarning",
- Integer.toString(pid));
+ new String[]{Integer.toString(pid)});
result.add("BigText.notExisting", msg);
continue;
}
@@ -840,7 +860,7 @@
if (page =3D=3D null) {
final EngineMessage msg =3D new EngineMessage(
"org.jahia.engines.shared.BigText_Field.notExi=
stingWarning",
- Integer.toString(pid));
+ new String[]{Integer.toString(pid)});
result.add("BigText.notExisting", msg);
continue;
}
@@ -885,7 +905,7 @@
} else if ("markForDeleted".equals(state)) {
final EngineMessage msg =3D new EngineMessage(
"org.jahia.engines.shared.BigText_Field.ma=
rkForDeleteWarning",
- Integer.toString(pid));
+ new String[]{Integer.toString(pid)});
result.add("BigText.markForDeleted", msg);
=
} else if ("waiting".equals(state)) {
@@ -899,6 +919,7 @@
}
=
} else {
+ jParams.setCurrentLocale(oldLoc);
throw new JahiaException("Unknown state value: " +=
state,
"Unknown state value: " + state,
JahiaException.ENGINE_ERROR,
@@ -914,12 +935,13 @@
final String urlKey =3D (String) ite.next();
final EngineMessage msg =3D new EngineMessage(
"org.jahia.engines.shared.BigText_Field.wrongKeys",
- urlKey);
+ new String[]{urlKey});
result.add("BigText.wrongURLKeys", msg);
}
}
if (logger.isDebugEnabled())
logger.debug("Returning " + result.getSize() + " warning messa=
ge(s): " + result);
+ jParams.setCurrentLocale(oldLoc);
return result;
}
}
Modified: trunk/core/src/java/org/jahia/services/htmlparser/WAIValidator.ja=
va
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/htmlparser/WAIValidator.java&rev=3D17829&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
--- trunk/core/src/java/org/jahia/services/htmlparser/WAIValidator.java (or=
iginal)
+++ trunk/core/src/java/org/jahia/services/htmlparser/WAIValidator.java Fri=
Jun 29 11:05:13 2007
@@ -917,9 +917,16 @@
serial.reset();
}
}
+ if (node.getClass() =3D=3D HTMLImageElementImpl.class) {
+ final String src =3D node.getAttributes().getNamedItem("sr=
c").getNodeValue();
+ buff.append("<img border=3D'0' src=3D'");
+ buff.append(src);
+ buff.append("' />");
+ } else {
buff.append("<b><u>");
buff.append(boldText);
buff.append("</u></b>");
+ }
=
Node next =3D node.getNextSibling();
if (next =3D=3D null) node.getFirstChild();
Modified: trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-servi=
ces.xml
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/spring/applicationcontext-services.xml&rev=3D17829&repname=3Dj=
ahia
=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
--- trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services.xm=
l (original)
+++ trunk/core/src/webapp/WEB-INF/etc/spring/applicationcontext-services.xm=
l Fri Jun 29 11:05:13 2007
@@ -475,7 +475,7 @@
<value>org.jahia.actions.sites.*.engines.v=
ersioning.PagesVersioningAction</value>
<value>org.jahia.actions.sites.*.engines.i=
mportexport.ManageImport</value>
<value>org.jahia.actions.sites.*.engines.i=
mportexport.ManageExport</value>
- <value>org.jahia.actions.sites.*.engines.c=
ontentdefinition.ContentDefinitionEngine</value>
+ <!--<value>org.jahia.actions.sites.*.engin=
es.contentdefinition.ContentDefinitionEngine</value>-->
<value>org.jahia.actions.sites.*.engines.w=
orkflow.ManageWorkflow</value> =
<value>org.jahia.actions.sites.*.engines.a=
udit.ManageLogs_Engine</value>
<value>org.jahia.actions.sites.*.ajax.chat=
</value>
@@ -490,6 +490,8 @@
<value>org.jahia.actions.sites.*.engines.a=
ctions.copy</value>
<value>org.jahia.actions.sites.*.engines.a=
ctions.paste</value>
<value>org.jahia.actions.sites.*.engines.a=
ctions.editMode</value>
+ <value>org.jahia.actions.sites.*.engines.a=
ctions.byPassIntegrityChecks</value>
+ <value>org.jahia.actions.sites.*.engines.a=
ctions.byPassWAIChecks</value>
</list>
</entry>
<entry>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
