LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[UPDATE] 

In der Klasse ccm-cms/src/com/arsdigita/cms/contenttypes/ui/AbstractTextUploadForm.java die FormProcessException in den Zeilen 236, 244, 262, 285 und 319 umgebaut. Zeilenumbrüchen in ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java eingefügt.

git-svn-id: https://svn.libreccm.org/ccm/trunk@3186 8810af33-2d31-482b-a856-94f89814c4df
master
tosmers 2015-02-15 16:17:07 +00:00
parent 8dabe6b043
commit da58216124
6 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-cms/src/com/arsdigita/cms/CMSResources.properties
View File

@ -1106,4 +1106,3 @@ cms.ui.authoring.invalid_file_type=Files with invalide type connot be loaded int
cms.ui.authoring.couldnt_convert_missing_inso=Could not convert to html format because interMedia INSO filter is not installed cms.ui.authoring.couldnt_convert_missing_inso=Could not convert to html format because interMedia INSO filter is not installed
cms.ui.authoring.couldnt_convert_inso_failed=Could not convert to html format because interMedia INSO filter conversion failed cms.ui.authoring.couldnt_convert_inso_failed=Could not convert to html format because interMedia INSO filter conversion failed
cms.ui.authoring.html_file_missing_body_tags=The file (which should be type HTML) is missing the <body> or </body> tag. cms.ui.authoring.html_file_missing_body_tags=The file (which should be type HTML) is missing the <body> or </body> tag.
cms.contenttypes.ui.cannot_load_files_into_article_body=Cannot load files of type {0} into the article body

1
ccm-cms/src/com/arsdigita/cms/CMSResources_de.properties
View File

@ -1100,4 +1100,3 @@ cms.ui.authoring.invalid_file_type=Dateien mit ung\u00fcltigem Typ k\u00f6nnen n
cms.ui.authoring.couldnt_convert_missing_inso=Konnte nicht ins html Format umgewandelt werden, da der interMedia INSO Filter nicht installiert ist cms.ui.authoring.couldnt_convert_missing_inso=Konnte nicht ins html Format umgewandelt werden, da der interMedia INSO Filter nicht installiert ist
cms.ui.authoring.couldnt_convert_inso_failed=Konnte nicht ins html Format umgewandelt werden, da die interMedia INSO Umwandlung fehlschlug cms.ui.authoring.couldnt_convert_inso_failed=Konnte nicht ins html Format umgewandelt werden, da die interMedia INSO Umwandlung fehlschlug
cms.ui.authoring.html_file_missing_body_tags=Der Datei (vom Type HTML) fehlt der <body> oder </body> Tag cms.ui.authoring.html_file_missing_body_tags=Der Datei (vom Type HTML) fehlt der <body> oder </body> Tag
cms.contenttypes.ui.cannot_load_files_into_article_body=Dateine vom Typ {0} k\u00f6nnen nicht in den Artikel-K\u00f6rper geladen werden

1
ccm-cms/src/com/arsdigita/cms/CMSResources_en_GB.properties
View File

@ -144,4 +144,3 @@ cms.ui.authoring.invalid_file_type=
cms.ui.authoring.couldnt_convert_missing_inso= cms.ui.authoring.couldnt_convert_missing_inso=
cms.ui.authoring.couldnt_convert_inso_failed= cms.ui.authoring.couldnt_convert_inso_failed=
cms.ui.authoring.html_file_missing_body_tags= cms.ui.authoring.html_file_missing_body_tags=
cms.contenttypes.ui.cannot_load_files_into_article_body=

1
ccm-cms/src/com/arsdigita/cms/CMSResources_fr.properties
View File

@ -616,4 +616,3 @@ cms.ui.authoring.invalid_file_type=Fichiers de type invalide connot \u00eatre ch
cms.ui.authoring.couldnt_convert_missing_inso=Impossible de convertir au format HTML car le filtre interMedia INSO n'est pas install\u00e9 cms.ui.authoring.couldnt_convert_missing_inso=Impossible de convertir au format HTML car le filtre interMedia INSO n'est pas install\u00e9
cms.ui.authoring.couldnt_convert_inso_failed=Impossible de convertir au format HTML car la conversion de filtre interMedia INSO a \u00e9chou\u00e9 cms.ui.authoring.couldnt_convert_inso_failed=Impossible de convertir au format HTML car la conversion de filtre interMedia INSO a \u00e9chou\u00e9
cms.ui.authoring.html_file_missing_body_tags=Le fichier (qui devrait \u00eatre de type HTML) est absent de la <body> ou </ body> cms.ui.authoring.html_file_missing_body_tags=Le fichier (qui devrait \u00eatre de type HTML) est absent de la <body> ou </ body>
cms.contenttypes.ui.cannot_load_files_into_article_body=Impossible de charger les fichiers de type {0} dans le corps de l'article

25
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/AbstractTextUploadForm.java
View File

@ -234,17 +234,15 @@ public abstract class AbstractTextUploadForm
if (!validType) { if (!validType) {
throw new FormProcessException(GlobalizationUtil.globalize( throw new FormProcessException(GlobalizationUtil.globalize(
"cms.contenttypes.ui.cannot_load_files_into_article_body", new Object[]{mime. "cms.ui.authoring.invalid_file_type"));
getMimeType()}));
} else { } else {
boolean insoWorks = MimeTypeStatus.getMimeTypeStatus(). boolean insoWorks = MimeTypeStatus.getMimeTypeStatus().
getInsoFilterWorks().intValue() == 1; getInsoFilterWorks().intValue() == 1;
if (!textType && !insoWorks) { if (!textType && !insoWorks) {
// Can't convert. inso filter is not working. Give message. // Can't convert. inso filter is not working. Give message.
throw new FormProcessException( throw new FormProcessException(GlobalizationUtil.globalize(
"Could not convert to html " "cms.ui.authoring.couldnt_convert_missing_inso"));
+ "format because interMedia INSO filter is not installed.");
} }
} }
} }
@ -260,10 +258,8 @@ public abstract class AbstractTextUploadForm
fs.read(file_bytes); fs.read(file_bytes);
fs.close(); fs.close();
} catch (Exception e) { } catch (Exception e) {
throw new FormProcessException( throw new FormProcessException(GlobalizationUtil.globalize(
((String) GlobalizationUtil.globalize( "cms.ui.authoring.unable_to_load_file"));
"cms.ui.authoring.unable_to_load_file").
localize()).concat(e.getMessage()));
} }
return file_bytes; return file_bytes;
} }
@ -283,9 +279,8 @@ public abstract class AbstractTextUploadForm
// Converted successfully, flag type should be html // Converted successfully, flag type should be html
used_inso[0] = true; used_inso[0] = true;
} else { } else {
throw new FormProcessException( throw new FormProcessException(GlobalizationUtil.globalize(
"Could not convert to html format. " "cms.ui.authoring.couldnt_convert_inso_failed"));
+ "interMedia INSO filter conversion failed.");
} }
} else { } else {
// Text type, no need to convert // Text type, no need to convert
@ -314,10 +309,8 @@ public abstract class AbstractTextUploadForm
int bodyStart_v = lc.indexOf(">", bodyStart); int bodyStart_v = lc.indexOf(">", bodyStart);
int bodyEnd = lc.indexOf("</body>", bodyStart_v); int bodyEnd = lc.indexOf("</body>", bodyStart_v);
if (bodyStart == -1 || bodyEnd == -1) { if (bodyStart == -1 || bodyEnd == -1) {
final String errMsg = throw new FormProcessException(GlobalizationUtil.globalize(
"The file (which should be type " "cms.ui.authoring.html_file_missing_body_tags"));
+ "HTML) is missing the <body> or </body> tag.";
throw new FormProcessException(errMsg);
} }
return htmlText.substring(bodyStart_v + 1, bodyEnd); return htmlText.substring(bodyStart_v + 1, bodyEnd);
} }

9
ccm-cms/src/com/arsdigita/cms/ui/authoring/TextAssetBody.java
View File

@ -331,7 +331,8 @@ public abstract class TextAssetBody extends SecurityPropertyEditor
allowINSOConvert().booleanValue()); allowINSOConvert().booleanValue());
if (!validType) { if (!validType) {
throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.authoring.invalid_file_type")); throw new FormProcessException(GlobalizationUtil.globalize(
"cms.ui.authoring.invalid_file_type"));
} }
boolean insoWorks = MimeTypeStatus.getMimeTypeStatus(). boolean insoWorks = MimeTypeStatus.getMimeTypeStatus().
@ -339,7 +340,8 @@ public abstract class TextAssetBody extends SecurityPropertyEditor
if (!textType && !insoWorks) { if (!textType && !insoWorks) {
// Can't convert. inso filter is not working. Give message. // Can't convert. inso filter is not working. Give message.
throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.authoring.couldnt_convert_missing_inso")); throw new FormProcessException(GlobalizationUtil.globalize(
"cms.ui.authoring.couldnt_convert_missing_inso"));
} }
} }
@ -405,7 +407,8 @@ public abstract class TextAssetBody extends SecurityPropertyEditor
int bodyStart_v = lc.indexOf(">", bodyStart); int bodyStart_v = lc.indexOf(">", bodyStart);
int bodyEnd = lc.indexOf("</body>", bodyStart_v); int bodyEnd = lc.indexOf("</body>", bodyStart_v);
if (bodyStart == -1 || bodyEnd == -1) { if (bodyStart == -1 || bodyEnd == -1) {
throw new FormProcessException(GlobalizationUtil.globalize("cms.ui.authoring.html_file_missing_body_tags")); throw new FormProcessException(GlobalizationUtil.globalize(
"cms.ui.authoring.html_file_missing_body_tags"));
} }
return htmlText.substring(bodyStart_v + 1, bodyEnd); return htmlText.substring(bodyStart_v + 1, bodyEnd);
} }