Updated linebreak processing
This commit is contained in:
parent
f17bb0e3cc
commit
f83b3a6860
|
@ -38,14 +38,14 @@ class ApplicationController extends Controller
|
||||||
|
|
||||||
private function processOSLinebreaks(array $structuredResponses)
|
private function processOSLinebreaks(array $structuredResponses)
|
||||||
{
|
{
|
||||||
$processedResponses = $structuredResponses;
|
$processedResponses = $structuredResponses;
|
||||||
|
foreach ($structuredResponses as $field)
|
||||||
foreach ($structuredResponses as $responseKey => $response)
|
|
||||||
{
|
{
|
||||||
// We can't use nl2br because it preserves the line breaks and doesn't include all line breaks used by other operating systems
|
foreach($field as $fieldKey => $fieldData)
|
||||||
$originalResponse = $response['response'];
|
{
|
||||||
$processedResponses[$responseKey]['response'] = str_replace(["\r\n", "\r", "\n"], "<br/>", $originalResponse);
|
$originalResponse = $fieldData['response'];
|
||||||
}
|
$processedResponses['responses'][$fieldKey]['response'] = str_replace(["\r\n", "\r", "\n"], "<br/>", $$ }
|
||||||
|
// We can't use nl2br because it preserves the line breaks and doesn't include all line breaks used by othe$ }
|
||||||
|
|
||||||
return $processedResponses;
|
return $processedResponses;
|
||||||
}
|
}
|
||||||
|
@ -79,7 +79,7 @@ class ApplicationController extends Controller
|
||||||
[
|
[
|
||||||
'application' => $application,
|
'application' => $application,
|
||||||
'comments' => $application->comments,
|
'comments' => $application->comments,
|
||||||
'structuredResponses' => json_decode($application->response->responseData, true),
|
'structuredResponses' => $this->processOSLinebreaks(json_decode($application->response->responseData, true)),
|
||||||
'formStructure' => $application->response->form,
|
'formStructure' => $application->response->form,
|
||||||
'vacancy' => $application->response->vacancy,
|
'vacancy' => $application->response->vacancy,
|
||||||
'canVote' => $this->canVote($application->votes),
|
'canVote' => $this->canVote($application->votes),
|
||||||
|
|
Loading…
Reference in New Issue