Merge remote-tracking branch 'origin/OpenOLAT_15.3' into OpenOLAT_15.4

src/main/java/org/olat/core/util/pdf/PdfDocument.java

@@ -218,9 +218,14 @@ public class PdfDocument {
     }
     
     public static String cleanString(String string) {
-    	return string.replace('\n', ' ')
+    	String text = string.replace('\n', ' ')
     			.replace('\r', ' ')
-    			.replace('\t', ' ')
+    			.replace('\t', ' ');
+    	return cleanCharacters(text);
+    }
+    
+    public static String cleanCharacters(String string) {
+    	return string.replace("\u00AD", "")
     			.replace('\u00A0', ' ')
     			.replace('\u2212', '-');
     }
@@ -230,6 +235,7 @@ public class PdfDocument {
     	try {
 			stream.showText(cleanedText);
 		} catch (IllegalArgumentException e) {
+			log.warn("Cannot show PDF text: {}", text, e);
 			stream.showText(Normalizer.normalize(cleanedText, Normalizer.Form.NFKD)
 					.replaceAll("\\p{InCombiningDiacriticalMarks}+",""));
 		}

src/main/java/org/olat/course/certificate/manager/CertificatePDFFormWorker.java

@@ -25,6 +25,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.text.Normalizer;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -41,6 +42,7 @@ import org.olat.core.id.UserConstants;
 import org.olat.core.logging.Tracing;
 import org.olat.core.util.Formatter;
 import org.olat.core.util.StringHelper;
+import org.olat.core.util.pdf.PdfDocument;
 import org.olat.course.assessment.AssessmentHelper;
 import org.olat.course.certificate.CertificateTemplate;
 import org.olat.course.certificate.CertificatesManager;
@@ -274,7 +276,14 @@ public class CertificatePDFFormWorker {
 			if (value == null) {
 				field.setValue("");
 			} else {
-				field.setValue(value);
+				value = PdfDocument.cleanCharacters(value);
+		    	try {
+					field.setValue(value);
+				} catch (IllegalArgumentException e) {
+					log.warn("Cannot set PDF field value: {}", value, e);
+					field.setValue(Normalizer.normalize(value, Normalizer.Form.NFKD)
+							.replaceAll("\\p{InCombiningDiacriticalMarks}+",""));
+				}
 			}
 
 			field.setReadOnly(true);

src/main/java/org/olat/course/nodes/cl/ui/CheckListBoxListEditController.java

@@ -253,7 +253,7 @@ public class CheckListBoxListEditController extends FormBasicController {
 
 		Boolean sum = (Boolean)config.get(CheckListCourseNode.CONFIG_KEY_PASSED_SUM_CHECKBOX);
 		Integer cut = (Integer)config.get(CheckListCourseNode.CONFIG_KEY_PASSED_SUM_CUTVALUE);
-		if (sum.booleanValue() && cut.intValue() > list.getNumOfCheckbox()) {
+		if ((sum != null && sum.booleanValue()) && (cut != null && cut.intValue() > list.getNumOfCheckbox())) {
 			config.set(CheckListCourseNode.CONFIG_KEY_PASSED_SUM_CUTVALUE, Integer.valueOf(list.getNumOfCheckbox()));
 			showWarning("error.cut.adjusted", new String[] {String.valueOf(list.getNumOfCheckbox())});
 		}