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

src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_de.properties

@@ -18,7 +18,7 @@ footer.no.userdata=<p>Diese Nachricht wurde automatisch von der Lernplattform Op
 footer.with.userdata=<p>Absender: {2} {3} ({0}), {4} {5}</p><p>Diese Nachricht wurde \u00FCber die Lernplattform OpenOlat versandt: <a href="{1}">{1}</a></p>
 help.variable.names=Es stehen folgende Variablen zu Verf\u00FCgung: {0}
 mailhelper.error.attachment=Die E-Mail konnte nicht verschickt werden\: ung\u00FCltiges Attachment. Bitte benachrichtigen Sie die Empf\u00E4nger manuell. 
-mailhelper.error.failedadresses=Diese Email Adresses konnte inval sein:
+mailhelper.error.failedadresses=Diese E-Mail-Adresse scheint ung\u00FCltig zu sein:
 mailhelper.error.failedusers=Den folgenden Benutzern kann Ihre Nachricht nicht zugestellt werden. Bitte benachrichtigen Sie diese Benutzer manuell und bitten Sie diese, ihre E-Mail-Adresse zu \u00FCberpr\u00FCfen\:
 mailhelper.error.failedusers.title = Gesperrte Empf\u00E4nger-Adressen
 mailhelper.error.failedusers.user = {0} {1} mit Mailadresse {2} und Login {3}

src/main/java/org/olat/core/util/mail/_i18n/LocalStrings_en.properties

@@ -63,7 +63,7 @@ mail.unmarked=Unmarked
 mail.unread=Unread
 mailhelper.error.addressinvalid=One or more addresses are invalid\: {0}
 mailhelper.error.attachment=Mail could not be sent\: invalid attachments. Please notify your recipients manually.
-mailhelper.error.failedadresses=These e-mail addresses are perhaps invalid:
+mailhelper.error.failedadresses=This e-mail address seems to be invalid:
 mailhelper.error.failedusers=Your e-mail cannot be sent to the following users. Please notify them manually and ask them to check their e-mail address\:
 mailhelper.error.failedusers.title=Disabled recipients' addresses
 mailhelper.error.failedusers.user={0} {1} using mail address {2} and login {3}

src/main/java/org/olat/course/export/CourseExportMediaResource.java

@@ -384,6 +384,8 @@ public class CourseExportMediaResource implements MediaResource, StreamingOutput
 	}
 	
 	private void exportBCCourseNode(PersistingCourseImpl sourceCourse, BCCourseNode courseNode, ZipOutputStream zout) {
+		if(courseNode.isSharedFolder()) return;
+		
 		try(ShieldOutputStream fOut = new ShieldOutputStream(zout)) {
 			VFSContainer nodeContainer = VFSManager.olatRootContainer(BCCourseNode.getFoldernodePathRelToFolderBase(sourceCourse.getCourseEnvironment(), courseNode), null);
 	

src/main/java/org/olat/course/nodes/BCCourseNode.java

@@ -216,7 +216,7 @@ public class BCCourseNode extends AbstractAccessableCourseNode {
 					.olatRootContainer(getFoldernodePathRelToFolderBase(course.getCourseEnvironment(), this), null);
 			ZipUtil.unzipNonStrict(fFolderNodeZip, nodeContainer, owner, false);
 		} else {
-			// the whole folder can be moved back to the root direcotry of foldernodes
+			// the whole folder can be moved back to the root directory of foldernodes
 			// of this course
 			File fFolderNodeDir = new File(FolderConfig.getCanonicalRoot() + getFoldernodePathRelToFolderBase(course.getCourseEnvironment(), this));
 			fFolderNodeDir.mkdirs();

src/main/java/org/olat/registration/RequestAccountDeletionController.java

@@ -142,7 +142,7 @@ public class RequestAccountDeletionController extends FormBasicController {
 		contactMessage.setBodyText(translate("request.delete.account.body", args));
 		
 		String mailAddress = userModule.getMailToRequestAccountDeletion();
-		ContactList contact = new ContactList(mailAddress);
+		ContactList contact = new ContactList(translate("request.delete.email.name"));
 		contact.add(mailAddress);
 		contactMessage.addEmailTo(contact);
 

src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties

@@ -122,6 +122,7 @@ request.delete.account.body=Ich m\u00F6chte mein Benutzerkonto l\u00F6schen.<br>
 request.delete.account.title.date=Die Zustimmung erfolgte am {0} um {1}
 request.delete.account.text=Falls sie den Nutzungsbedingungen nicht mehr zustimmen, k\u00F6nnen Sie die L\u00F6schung Ihres Benutzerkontos beantragen.
 request.delete.account.sent=Die Anfrage wurde erfolgreich abgeschickt.
+request.delete.email.name=Administrator
 select.language=Sprache
 select.language.description=W\u00E4hlen Sie die Sprache f\u00FCr die OpenOlat Registrierung und Ihr Benutzerkonto. Sie k\u00F6nnen die Sprache sp\u00E4ter in Ihrem Benutzerprofil jederzeit anpassen. Anschliessend werden Sie durch den Registrationprozess gef\u00FChrt.
 sr.error.disclaimer.checkbox=Sie m\u00FCssen durch Anklicken des K\u00E4stchens best\u00E4tigen, dass Sie die Nutzungsbedingungen gelesen und verstanden haben und diese akzeptieren.

src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties

@@ -121,6 +121,7 @@ request.delete.account.body=I want to delete my user account.<br>Account ID: {0}
 request.delete.account.title.date=The consent came at {0} {1}
 request.delete.account.text=If you no longer agree to the terms of use, you can request the deletion of your user account.
 request.delete.account.sent=The request was sent successfully.
+request.delete.email.name=Administrator
 remote.login.title=Embed login form into external website/CMS
 select.language=Language
 select.language.description=Please select a language for your OpenOlat registration and user account. Later on you can adapt your choice in your user profile at any time. You will then be guided through the registration process.

src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java

@@ -50,7 +50,6 @@ import org.olat.core.gui.exception.MsgFactory;
 import org.olat.core.gui.media.MediaResource;
 import org.olat.core.gui.media.RedirectMediaResource;
 import org.olat.core.gui.translator.Translator;
-import org.olat.core.helpers.Settings;
 import org.olat.core.id.Identity;
 import org.olat.core.logging.AssertException;
 import org.olat.core.logging.OLATRuntimeException;
@@ -122,15 +121,6 @@ public class ShibbolethDispatcher implements Dispatcher{
 		String uriPrefix = DispatcherModule.getLegacyUriPrefix(req);
 
 		Map<String, String> attributesMap = getShibbolethAttributesFromRequest(req);
-		if(Settings.isDebuging()) {
-			attributesMap.put("Shib-InetOrgPerson-mail", "shibboleth3@cybericafe.ch");
-			attributesMap.put("Shib-SwissEP-HomeOrganization", "Shibboleth 3");
-			attributesMap.put("Shib-InetOrgPerson-givenName", "Shibboleth 3");
-			attributesMap.put("Shib-Person-surname", "Deamon");
-			attributesMap.put("Shib-InetOrgPerson-employeeNumber", "shibd3");
-			attributesMap.put("Shib-SwissEP-UniqueID", "shibd3");
-		}
-		
 		ShibbolethAttributes shibbolethAttriutes = CoreSpringFactory.getImpl(ShibbolethAttributes.class);
 		shibbolethAttriutes.init(attributesMap);
 		String uid = shibbolethAttriutes.getUID();