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

95986: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94456: Merged DEV (5.0.1) to 5.0.N (5.0.1)
         94352: MNT-12995: Items are not accessible using the urls received via IMAP
         Changed the URLs in IMAP templates to point to Share instead of Explorer(EOL).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@96015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco.ftl

@@ -64,13 +64,13 @@
 <h2> Content links </h2>
 <table class="links">
    <tr>
-   <td>Content folder:</td><td><a href="${contextUrl}/navigate/browse${document.parent.webdavUrl}">${contextUrl}/navigate/browse${document.parent.webdavUrl}</a></td>
+   <td>Content folder:</td><td><a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
-   <td>Content URL:</td><td><a href="${contextUrl}${document.url}">${contextUrl}${document.url}</a></td>
+   <td>Content URL:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>
    </tr>
    <tr>
-   <td>Download URL:</td><td><a href="${contextUrl}${document.downloadUrl}">${contextUrl}${document.downloadUrl}</a></td>
+   <td>Download URL:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true</a></td>
    </tr>
    <tr>
    <td>WebDAV URL:</td><td><a href="${contextUrl}${document.webdavUrl}">${contextUrl}${document.webdavUrl}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_de.ftl

@@ -64,13 +64,13 @@
 <h2> Links zum Inhalt </h2>
 <table class="links">
    <tr>
-   <td>Dokumenten Ordner:</td><td><a href="${contextUrl}/navigate/browse${document.parent.webdavUrl}">${contextUrl}/navigate/browse${document.parent.webdavUrl}</a></td>
+   <td>Dokumenten Ordner:</td><td><a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
-   <td>URL zum Inhalt:</td><td><a href="${contextUrl}${document.url}">${contextUrl}${document.url}</a></td>
+   <td>URL zum Inhalt:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>
    </tr>
    <tr>
-   <td>Download URL:</td><td><a href="${contextUrl}${document.downloadUrl}">${contextUrl}${document.downloadUrl}</a></td>
+   <td>Download URL:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true</a></td>
    </tr>
    <tr>
    <td>WebDAV URL:</td><td><a href="${contextUrl}${document.webdavUrl}">${contextUrl}${document.webdavUrl}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_es.ftl

@@ -64,13 +64,13 @@
 <h2> Enlaces de contenido: </h2>
 <table class="links">
    <tr>
-   <td>Carpeta de contenido:</td><td><a href="${contextUrl}/navigate/browse${document.parent.webdavUrl}">${contextUrl}/navigate/browse${document.parent.webdavUrl}</a></td>
+   <td>Carpeta de contenido:</td><td><a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
-   <td>Dirección URL de contenido:</td><td><a href="${contextUrl}${document.url}">${contextUrl}${document.url}</a></td>
+   <td>Dirección URL de contenido:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>
    </tr>
    <tr>
-   <td>Dirección URL de descarga:</td><td><a href="${contextUrl}${document.downloadUrl}">${contextUrl}${document.downloadUrl}</a></td>
+   <td>Dirección URL de descarga:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true</a></td>
    </tr>
    <tr>
    <td>Dirección URL de WebDAV:</td><td><a href="${contextUrl}${document.webdavUrl}">${contextUrl}${document.webdavUrl}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_fr.ftl

@@ -65,13 +65,13 @@
 
 <table class="links">
    <tr>
-   <td>Dossier du contenu :</td><td><a href="${contextUrl}/navigate/browse${document.parent.webdavUrl}">${contextUrl}/navigate/browse${document.parent.webdavUrl}</a></td>
+   <td>Dossier du contenu :</td><td><a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
-   <td>URL du contenu :</td><td><a href="${contextUrl}${document.url}">${contextUrl}${document.url}</a></td>
+   <td>URL du contenu :</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>
    </tr>
    <tr>
-   <td>Adresse de téléchargement :</td><td><a href="${contextUrl}${document.downloadUrl}">${contextUrl}${document.downloadUrl}</a></td>
+   <td>Adresse de téléchargement :</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true</a></td>
    </tr>
    <tr>
    <td>Adresse Webdav :</td><td><a href="${contextUrl}${document.webdavUrl}">${contextUrl}${document.webdavUrl}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_it.ftl

@@ -64,13 +64,13 @@
 <h2> Collegamenti del contenuto </h2>
 <table class="links">
    <tr>
-   <td>Cartella del contenuto:</td><td><a href="${contextUrl}/navigate/browse${document.parent.webdavUrl}">${contextUrl}/navigate/browse${document.parent.webdavUrl}</a></td>
+   <td>Cartella del contenuto:</td><td><a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
-   <td>URL del contenuto</td><td><a href="${contextUrl}${document.url}">${contextUrl}${document.url}</a></td>
+   <td>URL del contenuto</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>
    </tr>
    <tr>
-   <td>URL di download:</td><td><a href="${contextUrl}${document.downloadUrl}">${contextUrl}${document.downloadUrl}</a></td>
+   <td>URL di download:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true</a></td>
    </tr>
    <tr>
    <td>URL WebDAV:</td><td><a href="${contextUrl}${document.webdavUrl}">${contextUrl}${document.webdavUrl}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ja.ftl

@@ -64,13 +64,13 @@
 <h2> コンテンツリンク </h2>
 <table class="links">
    <tr>
-   <td>コンテンツ フォルダー:</td><td><a href="${contextUrl}/navigate/browse${document.parent.webdavUrl}">${contextUrl}/navigate/browse${document.parent.webdavUrl}</a></td>
+   <td>コンテンツ フォルダー:</td><td><a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
-   <td>コンテンツ URL:</td><td><a href="${contextUrl}${document.url}">${contextUrl}${document.url}</a></td>
+   <td>コンテンツ URL:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>
    </tr>
    <tr>
-   <td>ダウンロード URL:</td><td><a href="${contextUrl}${document.downloadUrl}">${contextUrl}${document.downloadUrl}</a></td>
+   <td>ダウンロード URL:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true</a></td>
    </tr>
    <tr>
    <td>WebDAV URL:</td><td><a href="${contextUrl}${document.webdavUrl}">${contextUrl}${document.webdavUrl}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_nl.ftl

@@ -63,13 +63,13 @@
 <h2> Contentkoppelingen </h2>
 <table class="links">
    <tr>
-   <td>Contentmap:</td><td> <a href="${contextUrl}/navigate/browse${document.parent.webdavUrl}">${contextUrl}/navigate/browse${document.parent.webdavUrl}</a></td>
+   <td>Contentmap:</td><td> <a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
-   <td>Content-URL:</td><td> <a href="${contextUrl}${document.url}">${contextUrl}${document.url}</a></td>
+   <td>Content-URL:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>
    </tr>
    <tr>
-   <td>Download-URL:</td><td> <a href="${contextUrl}${document.downloadUrl}">${contextUrl}${document.downloadUrl}</a></td>
+   <td>Download-URL:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true</a></td>
    </tr>
    <tr>
    <td>WebDAV-URL:</td><td> <a href="${contextUrl}${document.webdavUrl}">${contextUrl}${document.webdavUrl}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ru.ftl

@@ -63,13 +63,13 @@
 <h2> Ссылки на контент </h2>
 <table class="links">
    <tr>
-   <td>Папка с контентом:</td><td> <a href="${contextUrl}/navigate/browse${document.parent.webdavUrl}">${contextUrl}/navigate/browse${document.parent.webdavUrl}</a></td>
+   <td>Папка с контентом:</td><td> <a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
-   <td>URL-адрес контента:</td><td> <a href="${contextUrl}${document.url}">${contextUrl}${document.url}</a></td>
+   <td>URL-адрес контента:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>
    </tr>
    <tr>
-   <td>Загрузить с URL-адреса:</td><td> <a href="${contextUrl}${document.downloadUrl}">${contextUrl}${document.downloadUrl}</a></td>
+   <td>Загрузить с URL-адреса:</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true</a></td>
    </tr>
    <tr>
    <td>URL-адрес WebDAV:</td><td> <a href="${contextUrl}${document.webdavUrl}">${contextUrl}${document.webdavUrl}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_zh_CN.ftl

@@ -64,13 +64,13 @@
 <h2> 内容链接 </h2>
 <table class="links">
    <tr>
-   <td>内容文件夹：</td><td> <a href="${contextUrl}/navigate/browse${document.parent.webdavUrl}">${contextUrl}/navigate/browse${document.parent.webdavUrl}</a></td>
+   <td>内容文件夹：</td><td> <a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
-   <td>内容 URL：</td><td> <a href="${contextUrl}${document.url}">${contextUrl}${document.url}</a></td>
+   <td>内容 URL：</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>
    </tr>
    <tr>
-   <td>下载 URL：</td><td> <a href="${contextUrl}${document.downloadUrl}">${contextUrl}${document.downloadUrl}</a></td>
+   <td>下载 URL：</td><td><a href="${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true">${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true</a></td>
    </tr>
    <tr>
    <td>WebDAV URL：</td><td> <a href="${contextUrl}${document.webdavUrl}">${contextUrl}${document.webdavUrl}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share.ftl

@@ -84,7 +84,7 @@
 <legend> Content links </legend>
 <table class="links">
    <tr>
-   <td>Content folder:</td><td><a href="${shareContextUrl}/page/site/${parentPathFromSites}">${shareContextUrl}/page/site/${parentPathFromSites}</a></td>
+   <td>Content folder:</td><td><a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
    <td>Content URL:</td><td><a href="${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_de.ftl

@@ -84,7 +84,7 @@
 <legend> Links zum Inhalt </legend>
 <table class="links">
    <tr>
-   <td>Dokumenten Ordner:</td><td><a href="${shareContextUrl}/page/site/${parentPathFromSites}">${shareContextUrl}/page/site/${parentPathFromSites}</a></td>
+   <td>Dokumenten Ordner:</td><td><a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
    <td>URL zum Inhalt:</td><td><a href="${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_es.ftl

@@ -84,7 +84,7 @@
 <legend> Enlaces de contenido: </legend>
 <table class="links">
    <tr>
-   <td>Carpeta de contenido:</td><td><a href="${shareContextUrl}/page/site/${parentPathFromSites}">${shareContextUrl}/page/site/${parentPathFromSites}</a></td>
+   <td>Carpeta de contenido:</td><td><a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
    <td>Dirección URL de contenido:</td><td><a href="${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_fr.ftl

@@ -84,7 +84,7 @@
 <legend> Liens de contenu  </legend>
 <table class="links">
    <tr>
-   <td>Dossier du contenu :</td><td><a href="${shareContextUrl}/page/site/${parentPathFromSites}">${shareContextUrl}/page/site/${parentPathFromSites}</a></td>
+   <td>Dossier du contenu :</td><td><a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
    <td>URL du contenu :</td><td><a href="${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_it.ftl

@@ -84,7 +84,7 @@
 <legend> Collegamenti del contenuto </legend>
 <table class="links">
    <tr>
-   <td>Cartella del contenuto:</td><td><a href="${shareContextUrl}/page/site/${parentPathFromSites}">${shareContextUrl}/page/site/${parentPathFromSites}</a></td>
+   <td>Cartella del contenuto:</td><td><a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
    <td>URL del contenuto:</td><td><a href="${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ja.ftl

@@ -84,7 +84,7 @@
 <legend> コンテンツリンク  </legend>
 <table class="links">
    <tr>
-   <td>コンテンツ フォルダー:</td><td><a href="${shareContextUrl}/page/site/${parentPathFromSites}">${shareContextUrl}/page/site/${parentPathFromSites}</a></td>
+   <td>コンテンツ フォルダー:</td><td><a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
    <td>コンテンツ URL:</td><td><a href="${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_nl.ftl

@@ -82,7 +82,7 @@
 <legend> Contentkoppelingen </legend>
 <table class="links">
    <tr>
-   <td>Contentmap:</td><td> <a href="${shareContextUrl}/page/site/${parentPathFromSites}">${shareContextUrl}/page/site/${parentPathFromSites}</a></td>
+   <td>Contentmap:</td><td> <a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
    <td>Content-URL:</td><td> <a href="${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ru.ftl

@@ -82,7 +82,7 @@
 <legend> Ссылки на контент </legend>
 <table class="links">
    <tr>
-   <td>Папка с контентом:</td><td> <a href="${shareContextUrl}/page/site/${parentPathFromSites}">${shareContextUrl}/page/site/${parentPathFromSites}</a></td>
+   <td>Папка с контентом:</td><td> <a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
    <td>URL-адрес контента:</td><td> <a href="${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_zh_CN.ftl

@@ -82,7 +82,7 @@
 <legend> 内容链接 </legend>
 <table class="links">
    <tr>
-   <td>内容文件夹：</td><td> <a href="${shareContextUrl}/page/site/${parentPathFromSites}">${shareContextUrl}/page/site/${parentPathFromSites}</a></td>
+   <td>内容文件夹：</td><td> <a href="${contentFolderUrl}">${contentFolderUrl}</a></td>
    </tr>
    <tr>
    <td>内容 URL：</td><td> <a href="${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}">${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}</a></td>

config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco.ftl

@@ -21,7 +21,7 @@ Size:      ${document.size / 1024} Kb
 
 CONTENT LINKS
 
-Content folder:   ${contextUrl}/navigate/browse${document.parent.webdavUrl}
+Content folder:   ${contentFolderUrl}
-Content URL:      ${contextUrl}${document.url}
+Content URL:      ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
-Download URL:     ${contextUrl}${document.downloadUrl}
+Download URL:     ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true
 WebDAV URL:       ${contextUrl}${document.webdavUrl}

config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ja.ftl

@@ -21,9 +21,9 @@
 
 コンテンツリンク
 
-コンテンツ フォルダー:   ${contextUrl}/navigate/browse${document.parent.webdavUrl}
+コンテンツ フォルダー:   ${contentFolderUrl}
-コンテンツ URL:      ${contextUrl}${document.url}
+コンテンツ URL:      ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
-ダウンロード URL:     ${contextUrl}${document.downloadUrl}
+ダウンロード URL:     ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true
 WebDAV URL:       ${contextUrl}${document.webdavUrl}
 
 

config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_nl.ftl

@@ -21,7 +21,7 @@ Grootte:      ${document.size / 1024} Kb
 
 CONTENTKOPPELINGEN
 
-Contentmap:   ${contextUrl}/navigate/browse${document.parent.webdavUrl}
+Contentmap:   ${contentFolderUrl}
-Content-URL:      ${contextUrl}${document.url}
+Content-URL:      ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
-Download-URL:     ${contextUrl}${document.downloadUrl}
+Download-URL:     ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true
 WebDAV-URL:       ${contextUrl}${document.webdavUrl}

config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ru.ftl

@@ -21,7 +21,7 @@
 
 ССЫЛКИ НА КОНТЕНТ
 
-Папка с контентом:   ${contextUrl}/navigate/browse${document.parent.webdavUrl}
+Папка с контентом:   ${contentFolderUrl}
-URL-адрес контента:      ${contextUrl}${document.url}
+URL-адрес контента:      ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
-Загрузить с URL-адреса:     ${contextUrl}${document.downloadUrl}
+Загрузить с URL-адреса:      ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true
 URL-адрес WebDAV:       ${contextUrl}${document.webdavUrl}

config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_zh_CN.ftl

@@ -21,7 +21,7 @@
 
 内容链接
 
-内容文件夹：   ${contextUrl}/navigate/browse${document.parent.webdavUrl}
+内容文件夹：   ${contentFolderUrl}
-内容 URL：      ${contextUrl}${document.url}
+内容 URL：     ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
-下载 URL：     ${contextUrl}${document.downloadUrl}
+下载 URL：     ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true
 WebDAV URL：       ${contextUrl}${document.webdavUrl}

config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share.ftl

@@ -21,6 +21,6 @@ Size:      ${document.size / 1024} Kb
 
 CONTENT LINKS
 
-Content folder:   ${shareContextUrl}/page/site/${parentPathFromSites}
+Content folder:   ${contentFolderUrl}
 Content URL:      ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
 Download URL:     ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true

config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_de.ftl

@@ -21,6 +21,6 @@ Größe:       ${document.size / 1024} Kb
 
 Links zum Inhalt
 
-Dokumenten Ordner:   ${shareContextUrl}/page/site/${parentPathFromSites}
+Dokumenten Ordner:   ${contentFolderUrl}
 URL zum Inhalt:   ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
 Download URL:     ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true

config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_es.ftl

@@ -21,6 +21,6 @@ Tamaño:      ${document.size / 1024} Kb
 
 Enlaces de contenido
 
-Carpeta de contenido:   ${shareContextUrl}/page/site/${parentPathFromSites}
+Carpeta de contenido:   ${contentFolderUrl}
 Dirección URL de contenido:    ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
 Dirección URL de descarga:     ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true

config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_fr.ftl

@@ -21,6 +21,6 @@ Taille:        ${document.size / 1024} Kb
 
 Liens de contenu
 
-Dossier du contenu :   ${shareContextUrl}/page/site/${parentPathFromSites}
+Dossier du contenu :   ${contentFolderUrl}
 URL de contenu :      ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
 Adresse de téléchargement :     ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true

config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_it.ftl

@@ -21,6 +21,6 @@ Dimensioni:          ${document.size / 1024} Kb
 
 Collegamenti del contenuto
 
-Cartella del contenuto:   ${shareContextUrl}/page/site/${parentPathFromSites}
+Cartella del contenuto:   ${contentFolderUrl}
 URL del contenuto:      ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
 URL di download:     ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true

config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ja.ftl

@@ -21,6 +21,6 @@
 
 コンテンツリンク
 
-コンテンツ フォルダー:   ${shareContextUrl}/page/site/${parentPathFromSites}
+コンテンツ フォルダー:   ${contentFolderUrl}
 コンテンツURL:      ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
 ダウンロード URL:     ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true

config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_nl.ftl

@@ -21,6 +21,6 @@ Grootte:      ${document.size / 1024} Kb
 
 CONTENTKOPPELINGEN
 
-Contentmap:   ${shareContextUrl}/page/site/${parentPathFromSites}
+Contentmap:   ${contentFolderUrl}
 Content-URL:      ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
 Download-URL:     ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true

config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ru.ftl

@@ -21,6 +21,6 @@
 
 ССЫЛКИ НА КОНТЕНТ
 
-Папка с контентом:   ${shareContextUrl}/page/site/${parentPathFromSites}
+Папка с контентом:   ${contentFolderUrl}
 URL-адрес контента:      ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
 Загрузить с URL-адреса:     ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true

config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_zh_CN.ftl

@@ -21,6 +21,6 @@
 
 内容链接
 
-内容文件夹：   ${shareContextUrl}/page/site/${parentPathFromSites}
+内容文件夹：   ${contentFolderUrl}
 内容 URL：      ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
 下载 URL：     ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true

source/java/org/alfresco/repo/imap/AbstractMimeMessage.java

@@ -82,7 +82,7 @@ public abstract class AbstractMimeMessage extends MimeMessage
         this.serviceRegistry = serviceRegistry;
         this.imapService = serviceRegistry.getImapService();
         this.messageFileInfo = fileInfo;
-        this.isMessageInSitesLibrary = imapService.isNodeInSitesLibrary(messageFileInfo.getNodeRef());
+        this.isMessageInSitesLibrary = imapService.getNodeSiteContainer(messageFileInfo.getNodeRef()) != null ? true : false;
         RetryingTransactionHelper txHelper = serviceRegistry.getTransactionService().getRetryingTransactionHelper();
         txHelper.setMaxRetries(MAX_RETRIES);
         txHelper.setReadOnly(false);
@@ -216,28 +216,9 @@ public abstract class AbstractMimeMessage extends MimeMessage
         model.put("date", new Date());
         model.put("contextUrl", new String(imapService.getWebApplicationContextUrl()));
         model.put("alfTicket", new String(serviceRegistry.getAuthenticationService().getCurrentTicket()));
-        if (isMessageInSitesLibrary)
+        String contentFolderUrl = imapService.getContentFolderUrl(ref);
-        {
-            String pathFromSites = imapService.getPathFromSites(parent);
-            StringBuilder parsedPath = new StringBuilder();
-            String[] pathParts = pathFromSites.split("/");
-            if (pathParts.length > 2)
-            {
-                parsedPath.append(pathParts[0]).append("/").append(pathParts[1]);
-                parsedPath.append("?filter=path|");
-                for (int i = 2; i < pathParts.length; i++)
-                {
-                    parsedPath.append("/").append(pathParts[i]);
-                }
-
-            }
-            else
-            {
-                parsedPath.append(pathFromSites);
-            }
         model.put("shareContextUrl", new String(imapService.getShareApplicationContextUrl()));
-            model.put("parentPathFromSites", parsedPath.toString());
+        model.put("contentFolderUrl", contentFolderUrl);
-        }
         return model;
     }
 

source/java/org/alfresco/repo/imap/ImapService.java

@@ -29,6 +29,7 @@ import javax.mail.internet.MimeMessage;
 
 import org.alfresco.repo.imap.AlfrescoImapConst.ImapViewMode;
 import org.alfresco.service.cmr.model.FileInfo;
+import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 
 import com.icegreen.greenmail.store.SimpleStoredMessage;
@@ -285,12 +286,20 @@ public interface ImapService
     public String getDefaultEmailBodyTemplate(EmailBodyFormat type);
     
     /**
-     * Determine if provided node belongs to Sites.
+     * Get the node's site container if it belongs to Sites.
      * 
      * @param nodeRef nodeRef
-     * @return true if provided node belongs to sites.
+     * @return nodeRef of the node's site container or null if provided node does not belong to sites.
      */
-    public boolean isNodeInSitesLibrary(NodeRef nodeRef);
+    public NodeRef getNodeSiteContainer(NodeRef nodeRef);
+
+    /**
+     * Get the web URL for the document's parent folder
+     *
+     * @param siteContainerNodeRef or null if the document is not from site
+     * @return url for the content folder
+     */
+    public String getContentFolderUrl(NodeRef siteContainerNodeRef);
 
     /**
      * Determines whether the IMAP server is enabled.
@@ -341,4 +350,10 @@ public interface ImapService
      * @return path for node relatively to site root
      */
     public String getPathFromSites(NodeRef nodeRef);
+
+    /**
+     * @param assocRef an association between the node and it's parent
+     * @return path for node relatively to repository
+     */
+    public String getPathFromRepo(ChildAssociationRef assocRef);
 }

source/java/org/alfresco/repo/imap/ImapServiceImpl.java

@@ -1976,45 +1976,130 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea
         }
     }
 
-    /**
+    public NodeRef getNodeSiteContainer(final NodeRef inputNodeRef)
-     * Return true if provided nodeRef is in Sites/.../documentlibrary
-     */
-    public boolean isNodeInSitesLibrary(final NodeRef inputNodeRef)
     {
-        return doAsSystem(new RunAsWork<Boolean>()
+        return doAsSystem(new RunAsWork<NodeRef>()
         {
             @Override
-            public Boolean doWork() throws Exception
+            public NodeRef doWork() throws Exception
             {
                 NodeRef nodeRef = inputNodeRef;
-                boolean isInDocLibrary = false;
+                while (true)
+                {
                     NodeRef parent = nodeService.getPrimaryParent(nodeRef).getParentRef();
-                while (parent != null && !nodeService.getType(parent).equals(SiteModel.TYPE_SITE))
-                {
-                    String parentName = (String) nodeService.getProperty(parent, ContentModel.PROP_NAME);
-                    if (parentName.equalsIgnoreCase("documentlibrary"))
-                    {
-                        isInDocLibrary = true;
-                    }
-                    nodeRef = parent;
-                    if (nodeService.getPrimaryParent(nodeRef) != null)
-                    {
-                        parent = nodeService.getPrimaryParent(nodeRef).getParentRef();
-                    }
-                }
                     if (parent == null)
                     {
-                    return false;
+                        if (logger.isDebugEnabled())
-                }
-                else
                         {
-                    return nodeService.getType(parent).equals(SiteModel.TYPE_SITE) && isInDocLibrary;
+                            logger.debug("The node with nodeRef:" + inputNodeRef + " is not in the site.");
                         }
+                        nodeRef = null;
+                        break;
+                    }
+                    nodeRef = parent;
+                    if (nodeService.hasAspect(parent, SiteModel.ASPECT_SITE_CONTAINER))
+                    {
+                        if (logger.isDebugEnabled())
+                        {
+                            logger.debug("The node with nodeRef:" + inputNodeRef + " is in the site.");
+                        }
+                        // found the container
+                        break;
+                    }
+                }
+                return nodeRef;
             }
         });
 
     }
 
+    public String getContentFolderUrl(NodeRef contentNodeRef)
+    {
+        String url = "";
+        String CONTAINER_URL_TEMPLATE = "%s/page/site/%s";
+        String REPOSITORY_URL_TEMPLATE = "%s/page/%s";
+
+        NodeRef siteContainerNodeRef = getNodeSiteContainer(contentNodeRef);
+
+        if (siteContainerNodeRef != null)
+        {
+            // the node is in site's container
+            // determine which one
+
+            NodeRef siteNodeRef = nodeService.getPrimaryParent(siteContainerNodeRef).getParentRef();
+            String siteName = ((String) nodeService.getProperty(siteNodeRef, ContentModel.PROP_NAME)).toLowerCase();
+            String componentId = (String) nodeService.getProperty(siteContainerNodeRef, SiteModel.PROP_COMPONENT_ID);
+            switch (componentId.toLowerCase())
+            {
+                case "datalists":
+                    url = String.format(CONTAINER_URL_TEMPLATE, getShareApplicationContextUrl(), siteName + "/data-lists");
+                    break;
+                case "wiki":
+                    url = String.format(CONTAINER_URL_TEMPLATE, getShareApplicationContextUrl(), siteName + "/wiki");
+                    break;
+                case "links":
+                    url = String.format(CONTAINER_URL_TEMPLATE, getShareApplicationContextUrl(), siteName + "/links");
+                    break;
+                case "calendar":
+                    url = String.format(CONTAINER_URL_TEMPLATE, getShareApplicationContextUrl(), siteName + "/calendar");
+                    break;
+                case "discussions":
+                    url = String.format(CONTAINER_URL_TEMPLATE, getShareApplicationContextUrl(), siteName + "/discussions-topiclist");
+                    break;
+                case "blog":
+                    url = String.format(CONTAINER_URL_TEMPLATE, getShareApplicationContextUrl(), siteName + "/blog-postlist");
+                    break;
+                case "documentlibrary":
+                    String pathFromSites = getPathFromSites(nodeService.getPrimaryParent(contentNodeRef).getParentRef());
+                    StringBuilder parsedPath = new StringBuilder();
+                    String[] pathParts = pathFromSites.split("/");
+                    if (pathParts.length > 2)
+                    {
+                        parsedPath.append(pathParts[0] + "/" + pathParts[1]);
+                        parsedPath.append("?filter=path|");
+                        for (int i = 2; i < pathParts.length; i++)
+                        {
+                            parsedPath.append("/").append(pathParts[i]);
+                        }
+                    }
+                    else
+                    {
+                        parsedPath.append(pathFromSites);
+                    }
+                    url = String.format(CONTAINER_URL_TEMPLATE, getShareApplicationContextUrl(), parsedPath.toString());
+                    break;
+                default:
+                    break;
+            }
+        }
+        else
+        {
+            // the node is in repository
+            String pathFromRepo = getPathFromRepo(nodeService.getPrimaryParent(contentNodeRef));
+            StringBuilder parsedPath = new StringBuilder();
+            String[] pathParts = pathFromRepo.split("/");
+            if (pathParts.length > 1)
+            {
+                parsedPath.append(pathParts[0]);
+                parsedPath.append("?filter=path|");
+                for (int i = 1; i < pathParts.length; i++)
+                {
+                    parsedPath.append("/").append(pathParts[i]);
+                }
+            }
+            else
+            {
+                parsedPath.append(pathFromRepo);
+            }
+            url = String.format(REPOSITORY_URL_TEMPLATE, getShareApplicationContextUrl(), parsedPath.toString());
+        }
+        if (logger.isDebugEnabled())
+        {
+            logger.debug("Resolved content folder URL:" + url + " for node " + contentNodeRef);
+        }
+        return url;
+    }
+
     public void setNamespaceService(NamespaceService namespaceService)
     {
         this.namespaceService = namespaceService;
@@ -2161,4 +2246,27 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea
         });
     }
 
+    @Override
+    public String getPathFromRepo(final ChildAssociationRef assocRef)
+    {
+        return doAsSystem(new RunAsWork<String>()
+        {
+            @Override
+            public String doWork() throws Exception
+            {
+                NodeRef ref = assocRef.getParentRef();
+                String name = ((String) nodeService.getProperty(ref, ContentModel.PROP_NAME)).toLowerCase();
+                ChildAssociationRef parent = nodeService.getPrimaryParent(ref);
+                QName qname = parent.getQName();
+                if (qname.equals(QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "company_home")))
+                {
+                    return "repository";
+                }
+                else
+                {
+                    return getPathFromRepo(parent) + "/" + name;
+                }
+            }
+        });
+    }
 }