[FEATURE] Stability improvments

Classes/Controller/JoblistController.php

@@ -256,8 +256,7 @@ class JoblistController extends ActionController {
 		$newName = date('Ymd-His') . '_' . $applicationData->getJobId() . '-' . $applicationData->getFirstName()
 			. '-' . $applicationData->getLastName();
 		$storage = $resourceFactory->getStorageObject(1);
-		$applicationFilePath = PATH_site . $storage->getConfiguration(
-			)['basePath'] . 'JobApplication/temp/' . $folderName .
+		$applicationFilePath = PATH_site . $storage->getConfiguration()['basePath'] . 'JobApplication/' . $folderName .
 			'/' . $newName . '.csv';
 		$this->writeApplicationFile($applicationData, $applicationFilePath);
 	}
@@ -291,6 +290,7 @@ class JoblistController extends ActionController {
 				$this->jobApplicationRepository->update($applyData);
 			}
 
+			$this->moveTmpFolder($folderName);
 			$this->submitApplicationFiles($applyData, $folderName);
 
 			/** @noinspection PhpMethodParametersCountMismatchInspection */
@@ -340,8 +340,6 @@ class JoblistController extends ActionController {
 
 			$mailService->sendEmail();
 
-			$this->moveTmpFolder($folderName);
-
 			$redirectPageUid = (int) $this->settings['redirectPage'];
 			if ($redirectPageUid) {
 				$url = $this->configurationManager->getContentObject()->getTypoLink_URL($redirectPageUid);

Resources/Private/Language/de.locallang.xlf

@@ -271,8 +271,8 @@
 			<target>Postleitzahl *</target>
 		</trans-unit>
 		<trans-unit id="frontend.apply.privacyPolicy">
-			<source>I have read the %s and confirm the usage of my personal data according to it</source>
-			<target>Ich habe die %s zur Kenntnis genommen und bin mit der dort beschriebenen Verwendung meiner Daten einverstanden</target>
+			<source>I have read the %s and confirm the usage of my personal data according to it. *</source>
+			<target>Ich habe die %s zur Kenntnis genommen und bin mit der dort beschriebenen Verwendung meiner Daten einverstanden. *</target>
 		</trans-unit>
 		<trans-unit id="frontend.apply.privacyPolicy.link">
 			<source>privacy policy</source>
@@ -368,4 +368,4 @@
 		</trans-unit>
 		</body>
 	</file>
-</xliff>
\ No newline at end of file
+</xliff>

Resources/Private/Language/locallang.xlf

@@ -205,7 +205,7 @@
 			<source>Zip code *</source>
 		</trans-unit>
 		<trans-unit id="frontend.apply.privacyPolicy">
-			<source>I have read the %s and confirm the usage of my personal data according to it</source>
+			<source>I have read the %s and confirm the usage of my personal data according to it. *</source>
 		</trans-unit>
 		<trans-unit id="frontend.apply.privacyPolicy.link">
 			<source>privacy policy</source>
@@ -278,4 +278,4 @@
 		</trans-unit>
 		</body>
 	</file>
-</xliff>
\ No newline at end of file
+</xliff>

Resources/Private/Templates/Joblist/ApplyForm.html

@@ -332,11 +332,9 @@
 			</div>
 
 			<div class="form-group">
-				<f:form.checkbox id="privacy-policy" property="privacyPolicy" value="1" />
-				<label for="privacy-policy">
-					<f:format.raw>
-						<f:translate key="frontend.apply.privacyPolicy" arguments="{0: '{f:render(section:\'privacyPolicyCheckboxLink\')}'}"/>
-					</f:format.raw>
+				<label>
+					<f:form.checkbox id="privacy-policy" property="privacyPolicy" value="1" />
+					<f:format.raw><f:translate key="frontend.apply.privacyPolicy" arguments="{0: '{f:render(section:\'privacyPolicyCheckboxLink\')}'}"/></f:format.raw>
 				</label>
 				<f:form.validationResults for="applyData.privacyPolicy">
 					<ul class="sg-jobs-validation-error parsley-errors-list filled">
@@ -353,7 +351,7 @@
 </f:section>
 
 <f:section name="privacyPolicyCheckboxLink">
-	<f:link.typolink parameter="{settings.privacyPolicyPage}">
+	<f:link.typolink target="_blank" parameter="{settings.privacyPolicyPage}">
 		<f:translate key="frontend.apply.privacyPolicy.link" />
 	</f:link.typolink>
-</f:section>
\ No newline at end of file
+</f:section>

Resources/Private/Templates/SgMail/ApplicationMail/template.html

@@ -29,3 +29,5 @@ Höchster Bildungsstand: {application.education}
 Nachricht:
 
 {application.message}
+
+{f:if(condition: '{application.privacyPolicy}', then: 'Die Datenschutzvereinbarung wurde aktzeptiert.')}