Feature 1 6

Classes/Controller/JoblistController.php

@@ -272,9 +272,8 @@ class JoblistController extends ActionController {
 			$job = $applyData->getJob();
 
 			// look for a configured default job, in case of unsolicited application
-			if ($job === NULL && $this->settings['defaultJobId']) {
-				$unsoliticedJob = $this->settings['defaultJobId'];
-				$applyData->setJobId($unsoliticedJob);
+			if (($job === NULL || $applyData->getJobId() === NULL) && $applyData->getCompany() !== NULL) {
+				$applyData->setJobId($applyData->getCompany()->getJobId());
 			}
 
 			if ($applyData->_isNew()) {
@@ -403,8 +402,14 @@ class JoblistController extends ActionController {
 	 * @return array
 	 */
 	private function getApplicationMailMarkers($applyData): array {
+		$location = '';
+		if ($applyData->getCompany() !== NULL) {
+			$location = $applyData->getCompany()->getCity();
+		}
+
 		return [
 			'salutation' => $applyData->getGender(),
+			'location' => $location,
 			'firstname' => $applyData->getFirstName(),
 			'lastname' => $applyData->getLastName(),
 			'street' => $applyData->getStreet(),