diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco.ftl index babd395012..a1cdf9ee7d 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco.ftl @@ -64,13 +64,13 @@

Content links

- + - + - + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_de.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_de.ftl index e3a8cd9198..fe8b4223ac 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_de.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_de.ftl @@ -64,13 +64,13 @@

Links zum Inhalt

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}
- + - + - + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_es.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_es.ftl index da53f8ac35..1845f0bdfc 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_es.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_es.ftl @@ -64,13 +64,13 @@

Enlaces de contenido:

Dokumenten Ordner:${contextUrl}/navigate/browse${document.parent.webdavUrl}Dokumenten Ordner:${contentFolderUrl}
URL zum Inhalt:${contextUrl}${document.url}URL zum Inhalt:${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}
- + - + - + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_fr.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_fr.ftl index 1cc6f3066c..74ddd83e86 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_fr.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_fr.ftl @@ -65,13 +65,13 @@
Carpeta de contenido:${contextUrl}/navigate/browse${document.parent.webdavUrl}Carpeta de contenido:${contentFolderUrl}
Dirección URL de contenido:${contextUrl}${document.url}Dirección URL de contenido:${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
Dirección URL de descarga:${contextUrl}${document.downloadUrl}Dirección URL de descarga:${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true
Dirección URL de WebDAV:${contextUrl}${document.webdavUrl}
- + - + - + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_it.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_it.ftl index 7cfa6510b3..a75e113195 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_it.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_it.ftl @@ -64,13 +64,13 @@

Collegamenti del contenuto

Dossier du contenu :${contextUrl}/navigate/browse${document.parent.webdavUrl}Dossier du contenu :${contentFolderUrl}
URL du contenu :${contextUrl}${document.url}URL du contenu :${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
Adresse de téléchargement :${contextUrl}${document.downloadUrl}Adresse de téléchargement :${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true
Adresse Webdav :${contextUrl}${document.webdavUrl}
- + - + - + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ja.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ja.ftl index 5d7234d18f..fefeb93d0f 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ja.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ja.ftl @@ -64,13 +64,13 @@

コンテンツリンク

Cartella del contenuto:${contextUrl}/navigate/browse${document.parent.webdavUrl}Cartella del contenuto:${contentFolderUrl}
URL del contenuto${contextUrl}${document.url}URL del contenuto${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
URL di download:${contextUrl}${document.downloadUrl}URL di download:${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true
URL WebDAV:${contextUrl}${document.webdavUrl}
- + - + - + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_nl.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_nl.ftl index 82b5122d4a..5e10ae1d0c 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_nl.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_nl.ftl @@ -63,13 +63,13 @@

Contentkoppelingen

コンテンツ フォルダー:${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}
- + - + - + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ru.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ru.ftl index 68f064a2a7..3acb70f3fc 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ru.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_ru.ftl @@ -63,13 +63,13 @@

Ссылки на контент

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}
- + - + - + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_zh_CN.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_zh_CN.ftl index 9b38c60b9b..49b582ac44 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_zh_CN.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_alfresco_zh_CN.ftl @@ -64,13 +64,13 @@

内容链接

Папка с контентом: ${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}
- + - + - + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share.ftl index 824b4c6f5d..7a2a15ea15 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share.ftl @@ -84,7 +84,7 @@ Content links
内容文件夹： ${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}
- + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_de.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_de.ftl index 696f5008be..5a64a2a6ce 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_de.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_de.ftl @@ -84,7 +84,7 @@ Links zum Inhalt
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}
- + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_es.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_es.ftl index de2119d36b..0d4eb9426c 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_es.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_es.ftl @@ -84,7 +84,7 @@ Enlaces de contenido:
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}
- + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_fr.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_fr.ftl index 5ad655c61f..371d81b0e8 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_fr.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_fr.ftl @@ -84,7 +84,7 @@ Liens de contenu
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}
- + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_it.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_it.ftl index 9eb1ebd16d..1751851df1 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_it.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_it.ftl @@ -84,7 +84,7 @@ Collegamenti del contenuto
Dossier du contenu :${shareContextUrl}/page/site/${parentPathFromSites}Dossier du contenu :${contentFolderUrl}
URL du contenu :${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
- + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ja.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ja.ftl index df927dfe7f..3b63b66a40 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ja.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ja.ftl @@ -84,7 +84,7 @@ コンテンツリンク
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}
- + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_nl.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_nl.ftl index d1a5fb284d..75ccfc6142 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_nl.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_nl.ftl @@ -1,8 +1,8 @@ - + - - + + - +
-

Document (naam): ${document.name}

+

Document (naam): ${document.name}

Metagegevens -
コンテンツ フォルダー:${shareContextUrl}/page/site/${parentPathFromSites}コンテンツ フォルダー:${contentFolderUrl}
コンテンツ URL:${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
+
<#if document.properties.title?exists> - + <#else> - - + + <#if document.properties.description?exists> - + <#else> - + @@ -82,7 +82,7 @@ Contentkoppelingen
Titel: ${document.properties.title}
Titel: ${document.properties.title}
Titel: 
Titel: 
Beschrijving: ${document.properties.description}
Beschrijving: ${document.properties.description}
Beschrijving: 
Beschrijving: 
Maker: ${document.properties.creator}
Gemaakt op: ${document.properties.created?datetime}
- + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ru.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ru.ftl index 5e69e74aae..b2492e6f71 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ru.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_ru.ftl @@ -1,8 +1,8 @@ - + - - + + - +
-

Документ (имя): ${document.name}

+

Документ (имя): ${document.name}

Метаданные -
Contentmap: ${shareContextUrl}/page/site/${parentPathFromSites}Contentmap: ${contentFolderUrl}
Content-URL: ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
+
<#if document.properties.title?exists> - + <#else> - - + + <#if document.properties.description?exists> - + <#else> - + @@ -82,7 +82,7 @@ Ссылки на контент
Заголовок: ${document.properties.title}
Заголовок: ${document.properties.title}
Заголовок: 
Заголовок: 
Описание: ${document.properties.description}
Описание: ${document.properties.description}
Описание: 
Описание: 
Создатель: ${document.properties.creator}
Создано: ${document.properties.created?datetime}
- + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_zh_CN.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_zh_CN.ftl index c3aa447ce8..7f5abfa97a 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_zh_CN.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_texthtml_share_zh_CN.ftl @@ -1,8 +1,8 @@ - + - - + + - +
-

文档（名称）： ${document.name}

+

文档（名称）： ${document.name}

元数据 -
Папка с контентом: ${shareContextUrl}/page/site/${parentPathFromSites}Папка с контентом: ${contentFolderUrl}
URL-адрес контента: ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}
+
<#if document.properties.title?exists> - + <#else> - - + + <#if document.properties.description?exists> - + <#else> - + @@ -82,7 +82,7 @@ 内容链接
标题： ${document.properties.title}
标题： ${document.properties.title}
标题： 
标题： 
说明： ${document.properties.description}
说明： ${document.properties.description}
说明： 
说明： 
创建者： ${document.properties.creator}
创建时间： ${document.properties.created?datetime}
- + diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco.ftl index 155102daa6..70d702d4e8 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco.ftl +++ b/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 URL: ${contextUrl}${document.url} -Download URL: ${contextUrl}${document.downloadUrl} +Content folder: ${contentFolderUrl} +Content URL: ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name} +Download URL: ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true WebDAV URL: ${contextUrl}${document.webdavUrl} diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ja.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ja.ftl index f2670c8811..ca29fcfc65 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ja.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ja.ftl @@ -21,9 +21,9 @@ コンテンツリンク -コンテンツ フォルダー: ${contextUrl}/navigate/browse${document.parent.webdavUrl} -コンテンツ URL: ${contextUrl}${document.url} -ダウンロード URL: ${contextUrl}${document.downloadUrl} +コンテンツ フォルダー: ${contentFolderUrl} +コンテンツ URL: ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name} +ダウンロード URL: ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true WebDAV URL: ${contextUrl}${document.webdavUrl} diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_nl.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_nl.ftl index f2b175baad..f846f8359d 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_nl.ftl +++ b/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} -Content-URL: ${contextUrl}${document.url} -Download-URL: ${contextUrl}${document.downloadUrl} +Contentmap: ${contentFolderUrl} +Content-URL: ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name} +Download-URL: ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true WebDAV-URL: ${contextUrl}${document.webdavUrl} diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ru.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ru.ftl index c06bf8acfa..4acbdc725e 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ru.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_ru.ftl @@ -21,7 +21,7 @@ ССЫЛКИ НА КОНТЕНТ -Папка с контентом: ${contextUrl}/navigate/browse${document.parent.webdavUrl} -URL-адрес контента: ${contextUrl}${document.url} -Загрузить с URL-адреса: ${contextUrl}${document.downloadUrl} +Папка с контентом: ${contentFolderUrl} +URL-адрес контента: ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name} +Загрузить с URL-адреса: ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true URL-адрес WebDAV: ${contextUrl}${document.webdavUrl} diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_zh_CN.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_zh_CN.ftl index 97caeb0753..f06c872acf 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_zh_CN.ftl +++ b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_alfresco_zh_CN.ftl @@ -21,7 +21,7 @@ 内容链接 -内容文件夹： ${contextUrl}/navigate/browse${document.parent.webdavUrl} -内容 URL： ${contextUrl}${document.url} -下载 URL： ${contextUrl}${document.downloadUrl} +内容文件夹： ${contentFolderUrl} +内容 URL： ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name} +下载 URL： ${contextUrl}/service/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}?a=true WebDAV URL： ${contextUrl}${document.webdavUrl} diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share.ftl index 6061e54334..88d7e7f8a8 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share.ftl +++ b/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 diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_de.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_de.ftl index 34dc76ab70..eee24791cd 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_de.ftl +++ b/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 diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_es.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_es.ftl index f3b73a4f56..592a275ac2 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_es.ftl +++ b/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 diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_fr.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_fr.ftl index 6710d95784..724ff6fa14 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_fr.ftl +++ b/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 \ No newline at end of file diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_it.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_it.ftl index 09053b3a93..24e16443b6 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_it.ftl +++ b/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 diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ja.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ja.ftl index 572cb43959..884788b135 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ja.ftl +++ b/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 diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_nl.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_nl.ftl index ec33087a6f..3e59fa83d2 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_nl.ftl +++ b/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 diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ru.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ru.ftl index b7067f05f5..1800786ee9 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_ru.ftl +++ b/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 diff --git a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_zh_CN.ftl b/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_zh_CN.ftl index 78cfe2c274..62dfa12f29 100644 --- a/config/alfresco/imap/imapSpacesTemplates/emailbody_textplain_share_zh_CN.ftl +++ b/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 diff --git a/source/java/org/alfresco/repo/imap/AbstractMimeMessage.java b/source/java/org/alfresco/repo/imap/AbstractMimeMessage.java index e9fdbb1053..a4c38ba0e9 100644 --- a/source/java/org/alfresco/repo/imap/AbstractMimeMessage.java +++ b/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 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()); - } + String contentFolderUrl = imapService.getContentFolderUrl(ref); + model.put("shareContextUrl", new String(imapService.getShareApplicationContextUrl())); + model.put("contentFolderUrl", contentFolderUrl); return model; } diff --git a/source/java/org/alfresco/repo/imap/ImapService.java b/source/java/org/alfresco/repo/imap/ImapService.java index bc314484ef..70e1d301ab 100644 --- a/source/java/org/alfresco/repo/imap/ImapService.java +++ b/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); } diff --git a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java index 31a22d379a..7abb339a88 100644 --- a/source/java/org/alfresco/repo/imap/ImapServiceImpl.java +++ b/source/java/org/alfresco/repo/imap/ImapServiceImpl.java @@ -1975,46 +1975,131 @@ public class ImapServiceImpl implements ImapService, OnRestoreNodePolicy, OnCrea }); } } - - /** - * Return true if provided nodeRef is in Sites/.../documentlibrary - */ - public boolean isNodeInSitesLibrary(final NodeRef inputNodeRef) + + public NodeRef getNodeSiteContainer(final NodeRef inputNodeRef) { - return doAsSystem(new RunAsWork() + return doAsSystem(new RunAsWork() { @Override - public Boolean doWork() throws Exception + public NodeRef doWork() throws Exception { NodeRef nodeRef = inputNodeRef; - boolean isInDocLibrary = false; - NodeRef parent = nodeService.getPrimaryParent(nodeRef).getParentRef(); - while (parent != null && !nodeService.getType(parent).equals(SiteModel.TYPE_SITE)) + while (true) { - String parentName = (String) nodeService.getProperty(parent, ContentModel.PROP_NAME); - if (parentName.equalsIgnoreCase("documentlibrary")) + NodeRef parent = nodeService.getPrimaryParent(nodeRef).getParentRef(); + if (parent == null) { - isInDocLibrary = true; + if (logger.isDebugEnabled()) + { + logger.debug("The node with nodeRef:" + inputNodeRef + " is not in the site."); + } + nodeRef = null; + break; } nodeRef = parent; - if (nodeService.getPrimaryParent(nodeRef) != null) + if (nodeService.hasAspect(parent, SiteModel.ASPECT_SITE_CONTAINER)) { - parent = nodeService.getPrimaryParent(nodeRef).getParentRef(); + if (logger.isDebugEnabled()) + { + logger.debug("The node with nodeRef:" + inputNodeRef + " is in the site."); + } + // found the container + break; } } - if (parent == null) - { - return false; - } - else - { - return nodeService.getType(parent).equals(SiteModel.TYPE_SITE) && isInDocLibrary; - } + 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() + { + @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; + } + } + }); + } } \ No newline at end of file
内容文件夹： ${shareContextUrl}/page/site/${parentPathFromSites}内容文件夹： ${contentFolderUrl}
内容 URL： ${shareContextUrl}/proxy/alfresco/api/node/content/${document.storeType}/${document.storeId}/${document.id}/${document.name}