Outstanding work from this ticket has been moved into https://sakaiproject.atlassian.net/browse/SAK-19184#icft=SAK-19184

Beth,

The last patch I emailed you (I think it is the one you've uploaded as SAK-14401-osp-message.patch) solves f:param issues you comment and also includes espaceHtml patch.

Regarding to CR/LF, I generate the patches with TortoiseSVN under Windows and I don't know how to generate a "clean patch" with this utility. If you (or anybody) knows how to do it, I'll be very happy to listen because cleaning patches by hand it can be really a nightmare.

Thus, as far as I know, the only issues remaining are some <osp:message> items at matrix\tool\src\webapp\WEB-INF\jsp\matrix\scaffolding\addScaffolding.jsp that I don't know how to solve because they are parametrized and if I change osp:message by c:out an exception in launched. For example, at: <osp:message key="${token}_progression_icon" var="icon" />. If you have any suggestion I'll be happy to do the work.

Thank you very much for your help...and also for your patience.

David

These are notes mostly for myself: I've applied half of the escapeHtml patch (related to escapeXml). I've not (yet) applied the patch to the following files:

• presentationTemplate.inc - CR/LF on every line obsfucate the actual changes

• wizardHeader.inc – incorrect/incomplete changes (use of fmt:param elements which need to be resolved)

• wizardFooter.inc – looks good, needs testing

• comments.inc – looks good, needs testing

The osp-message patch is also outstanding

On Aug 18, 2010, at 2:35 AM, DAVID ROLDAN MARTINEZ wrote:

Here you have the patch for issues you mentioned in the last e-mail. There are some <osp:message> items at matrix\tool\src\webapp\WEB-INF\jsp\matrix\scaffolding\addScaffolding.jsp that I don't know how to solve because they are parametrized and if I change osp:message by c:out an exception in launched. For example, at: <osp:message key="${token}_progression_icon" var="icon" />. If you have any suggestion I'll be happy to do the work.

Beth,

I attach a patch containing escapeHTML attributes added.

David