Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

92683: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92655: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92648: Merged V4.2.3 (4.2.3.14) to V4.2-BUG-FIX (4.2.5)
            92547: MNT-13022: /alfresco/wcservice/calendar/SaveCalendarEvent vulnerable to Reflected Cross-site Scripting (XSS)
               - Encoding to html was added
            92548: MNT-13021: /alfresco/wcservice/api/search/person.html vulnerable to Reflected Cross-site Scripting (XSS)
               - Add html escape to avoid XSS vulnerability
            92565: MNT-13022: /alfresco/wcservice/calendar/SaveCalendarEvent vulnerable to Reflected Cross-site Scripting (XSS)
               - Removed reference to space
         92650: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5) (RECORD ONLY)
            92649: MNT-13063/MNT-13065: Merged V4.2-BUG-FIX (4.2.5) to V4.2.4 (4.2.4)
               92648: Merged V4.2.3 (4.2.3.14) to V4.2-BUG-FIX (4.2.5)
                  92547: MNT-13022: /alfresco/wcservice/calendar/SaveCalendarEvent vulnerable to Reflected Cross-site Scripting (XSS)
                     - Encoding to html was added
                  92548: MNT-13021: /alfresco/wcservice/api/search/person.html vulnerable to Reflected Cross-site Scripting (XSS)
                     - Add html escape to avoid XSS vulnerability
                  92565: MNT-13022: /alfresco/wcservice/calendar/SaveCalendarEvent vulnerable to Reflected Cross-site Scripting (XSS)
                     - Removed reference to space
         92652: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5) (RECORD ONLY)
            92651: Merged V4.2-BUG-FIX (4.2.5) to V4.1-BUG-FIX (4.1.10)
               92648: Merged V4.2.3 (4.2.3.14) to V4.2-BUG-FIX (4.2.5)
                  92547: MNT-13022: /alfresco/wcservice/calendar/SaveCalendarEvent vulnerable to Reflected Cross-site Scripting (XSS)
                     - Encoding to html was added
                  92548: MNT-13021: /alfresco/wcservice/api/search/person.html vulnerable to Reflected Cross-site Scripting (XSS)
                     - Add html escape to avoid XSS vulnerability
                  92565: MNT-13022: /alfresco/wcservice/calendar/SaveCalendarEvent vulnerable to Reflected Cross-site Scripting (XSS)
                     - Removed reference to space


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94905 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 11:56:20 +00:00
parent 03f407f2d1
commit b0bc4b7189
2 changed files with 2 additions and 2 deletions

View File

@@ -61,7 +61,7 @@ if (nodeWhereToCreate != null)
}
else
{
response = "SPACE not found with Ref " + spaceRef;
response = "SPACE not found";
}
model.result = response;

View File

@@ -17,7 +17,7 @@
<br>
<table>
<tr>
<td>Results <b>${search.startIndex}</b> - <b><#if search.startIndex == 0>0<#else>${search.startIndex + search.totalPageItems - 1}</#if></b> of <b>${search.totalResults}</b> for <b>${search.searchTerms}</b> visible to user <b><#if person??>${person.properties.userName}<#else>unknown</#if>.</b></td>
<td>Results <b>${search.startIndex}</b> - <b><#if search.startIndex == 0>0<#else>${search.startIndex + search.totalPageItems - 1}</#if></b> of <b>${search.totalResults}</b> for <b>${search.searchTerms?html}</b> visible to user <b><#if person??>${person.properties.userName}<#else>unknown</#if>.</b></td>
</tr>
</table>
<br>