From 7319d091e2090ee3549f8a8f922136d4b910295a Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Wed, 27 Jan 2021 02:01:59 +0000
Subject: [PATCH 01/16] Add exit popup

---
 public/js/unsaved.js | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 public/js/unsaved.js

diff --git a/public/js/unsaved.js b/public/js/unsaved.js
new file mode 100644
index 0000000..7406b14
--- /dev/null
+++ b/public/js/unsaved.js
@@ -0,0 +1,4 @@
+// Load this on all pages requiring exit confirmation.
+$(window).bind('beforeunload', function(){
+  return "Are you sure you want to exit this page? You might have unsaved work.";
+});
\ No newline at end of file

From 9c597eeb65ab83c17f07a888a64f692aad218ba5 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Wed, 27 Jan 2021 02:07:34 +0000
Subject: [PATCH 02/16] Update
 'resources/views/dashboard/administration/formbuilder.blade.php'

---
 .../views/dashboard/administration/formbuilder.blade.php    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/views/dashboard/administration/formbuilder.blade.php b/resources/views/dashboard/administration/formbuilder.blade.php
index 6a1129a..e808c1a 100755
--- a/resources/views/dashboard/administration/formbuilder.blade.php
+++ b/resources/views/dashboard/administration/formbuilder.blade.php
@@ -10,6 +10,12 @@
 
 @section('js')
 
+       <script>
+            jQuery(window).bind('beforeunload', function(){
+                return 'Are you sure you want to leave the form builder? You might have unsaved work.';
+            });
+        </script>
+
     @if (session()->has('success'))
 
         <script>

From d234415d3849d339fc3b12d25be75e63cd12b531 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Wed, 27 Jan 2021 02:23:30 +0000
Subject: [PATCH 03/16] Logic changes for confirmation dialog

This commit changes the deletion mechanism for forms. Currently, it sets the wanted deletion ID to the session, and redirects the user to the previous page, to open a confirmation dialog for deletion.
---
 app/Http/Controllers/FormController.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/Http/Controllers/FormController.php b/app/Http/Controllers/FormController.php
index 7c8407a..7c22a0f 100755
--- a/app/Http/Controllers/FormController.php
+++ b/app/Http/Controllers/FormController.php
@@ -82,6 +82,23 @@ class FormController extends Controller
     public function destroy(Request $request, Form $form)
     {
         $this->authorize('delete', $form);
+
+        $request->session()->put('pendingObjectID', $form->id);
+        $request->session()->put('openConfirmationDialog', true);
+
+        return redirect()->back();
+                
+    }
+
+    public function performConfirmedDeletion(Request $request, Form $form)
+    {
+        $this->authorize('delete', $form);
+        if (!$request->has('confirmed') && $request->confirmed !== 'yes')
+        {
+            $request->session()->flash('error', 'You must confirm this action.');
+            return redirect()->back();
+        }
+
         $deletable = true;
 
         if (! is_null($form) && ! is_null($form->vacancies) && $form->vacancies->count() !== 0 || ! is_null($form->responses)) {
@@ -96,6 +113,9 @@ class FormController extends Controller
             $request->session()->flash('error', 'You cannot delete this form because it\'s tied to one or more applications and ranks, or because it doesn\'t exist.');
         }
 
+        $request->session()->forget('pendingObjectID');
+        $request->session()->forget('openConfirmationDialog');
+        
         return redirect()->back();
     }
 

From 8769f279accca8475ad0d99b0f0d6b8cce65479a Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Wed, 27 Jan 2021 02:26:12 +0000
Subject: [PATCH 04/16] Add confirmation route

---
 routes/web.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/routes/web.php b/routes/web.php
index b13425b..4d2452a 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -266,6 +266,9 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
             Route::delete('forms/destroy/{form}', [FormController::class, 'destroy'])
                 ->name('destroyForm');
 
+            Route::delete('forms/destroy/{form}/confirm', [FormController::class, 'performConfirmedDeletion'])
+                ->name('destroyFormConfirm');
+
             Route::get('forms', [FormController::class, 'index'])
                 ->name('showForms');
 

From 685ec75d0c6868610612a19c45f8e746910c3ca3 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Wed, 27 Jan 2021 02:31:57 +0000
Subject: [PATCH 05/16] Reverse

---
 app/Http/Controllers/FormController.php | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/app/Http/Controllers/FormController.php b/app/Http/Controllers/FormController.php
index 7c22a0f..98d82a0 100755
--- a/app/Http/Controllers/FormController.php
+++ b/app/Http/Controllers/FormController.php
@@ -83,22 +83,6 @@ class FormController extends Controller
     {
         $this->authorize('delete', $form);
 
-        $request->session()->put('pendingObjectID', $form->id);
-        $request->session()->put('openConfirmationDialog', true);
-
-        return redirect()->back();
-                
-    }
-
-    public function performConfirmedDeletion(Request $request, Form $form)
-    {
-        $this->authorize('delete', $form);
-        if (!$request->has('confirmed') && $request->confirmed !== 'yes')
-        {
-            $request->session()->flash('error', 'You must confirm this action.');
-            return redirect()->back();
-        }
-
         $deletable = true;
 
         if (! is_null($form) && ! is_null($form->vacancies) && $form->vacancies->count() !== 0 || ! is_null($form->responses)) {
@@ -113,10 +97,8 @@ class FormController extends Controller
             $request->session()->flash('error', 'You cannot delete this form because it\'s tied to one or more applications and ranks, or because it doesn\'t exist.');
         }
 
-        $request->session()->forget('pendingObjectID');
-        $request->session()->forget('openConfirmationDialog');
-        
         return redirect()->back();
+                
     }
 
     public function preview(Request $request, Form $form)

From 26e5a53efb50b4f7546f17aa56603679aac7a529 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Wed, 27 Jan 2021 02:35:55 +0000
Subject: [PATCH 06/16] Reverse route add

---
 routes/web.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 4d2452a..ffbc3c5 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -265,10 +265,7 @@ Route::group(['prefix' => LaravelLocalization::setLocale(), 'middleware' => ['lo
 
             Route::delete('forms/destroy/{form}', [FormController::class, 'destroy'])
                 ->name('destroyForm');
-
-            Route::delete('forms/destroy/{form}/confirm', [FormController::class, 'performConfirmedDeletion'])
-                ->name('destroyFormConfirm');
-
+                
             Route::get('forms', [FormController::class, 'index'])
                 ->name('showForms');
 

From 3a56d2bfb2e9e4179426ee1d61182be71a243507 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Fri, 29 Jan 2021 16:27:39 +0000
Subject: [PATCH 07/16] Removed 100 character limit from submissions

---
 app/Helpers/ContextAwareValidator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Helpers/ContextAwareValidator.php b/app/Helpers/ContextAwareValidator.php
index 6f59cb5..6257255 100755
--- a/app/Helpers/ContextAwareValidator.php
+++ b/app/Helpers/ContextAwareValidator.php
@@ -71,7 +71,7 @@ class ContextAwareValidator
         $validator = [];
 
         if ($includeFormName) {
-            $validator['formName'] = 'required|string|max:100';
+            $validator['formName'] = 'required|string';
         }
 
         foreach ($fields as $fieldName => $field) {

From 0f5e812e03d7eac1ad8bb9067c4436c57df2e760 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Fri, 29 Jan 2021 16:56:29 +0000
Subject: [PATCH 08/16] Usability: Turn CRLF/CR/LF into BR

---
 app/Http/Controllers/ApplicationController.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ApplicationController.php b/app/Http/Controllers/ApplicationController.php
index 7b74341..0641dd4 100755
--- a/app/Http/Controllers/ApplicationController.php
+++ b/app/Http/Controllers/ApplicationController.php
@@ -35,6 +35,21 @@ use Illuminate\Support\Facades\Log;
 
 class ApplicationController extends Controller
 {
+
+    private function processOSLinebreaks(array $structuredResponses)
+    {
+        $processedResponses = $structuredResponses;
+
+       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
+           $originalResponse = $response['response'];
+           $processedResponses[$responseKey]['response'] = str_replace(["\r\n", "\r", "\n"], "<br/>", $originalResponse);
+       }
+
+       return $processedResponses;
+    }
+
     private function canVote($votes): bool
     {
         $allvotes = collect([]);
@@ -64,7 +79,7 @@ class ApplicationController extends Controller
                     [
                         'application' => $application,
                         'comments' => $application->comments,
-                        'structuredResponses' => json_decode($application->response->responseData, true),
+                        'structuredResponses' => %this->processOSLinebreaks(json_decode($application->response->responseData, true)),
                         'formStructure' => $application->response->form,
                         'vacancy' => $application->response->vacancy,
                         'canVote'  => $this->canVote($application->votes),

From f941980602757b4e1f94768ea6451dc711d3d316 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Fri, 29 Jan 2021 16:57:57 +0000
Subject: [PATCH 09/16] % to $

---
 app/Http/Controllers/ApplicationController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ApplicationController.php b/app/Http/Controllers/ApplicationController.php
index 0641dd4..27932f9 100755
--- a/app/Http/Controllers/ApplicationController.php
+++ b/app/Http/Controllers/ApplicationController.php
@@ -79,7 +79,7 @@ class ApplicationController extends Controller
                     [
                         'application' => $application,
                         'comments' => $application->comments,
-                        'structuredResponses' => %this->processOSLinebreaks(json_decode($application->response->responseData, true)),
+                        'structuredResponses' => $this->processOSLinebreaks(json_decode($application->response->responseData, true)),
                         'formStructure' => $application->response->form,
                         'vacancy' => $application->response->vacancy,
                         'canVote'  => $this->canVote($application->votes),

From f17bb0e3ccf13a82fca75835199ffc72b15e8204 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Fri, 29 Jan 2021 17:00:35 +0000
Subject: [PATCH 10/16] Update 'app/Http/Controllers/ApplicationController.php'

---
 app/Http/Controllers/ApplicationController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ApplicationController.php b/app/Http/Controllers/ApplicationController.php
index 27932f9..e83bd90 100755
--- a/app/Http/Controllers/ApplicationController.php
+++ b/app/Http/Controllers/ApplicationController.php
@@ -79,7 +79,7 @@ class ApplicationController extends Controller
                     [
                         'application' => $application,
                         'comments' => $application->comments,
-                        'structuredResponses' => $this->processOSLinebreaks(json_decode($application->response->responseData, true)),
+                        'structuredResponses' => json_decode($application->response->responseData, true),
                         'formStructure' => $application->response->form,
                         'vacancy' => $application->response->vacancy,
                         'canVote'  => $this->canVote($application->votes),

From f83b3a6860025dad7f0f81424ea4d8fbd3d93209 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Fri, 29 Jan 2021 17:12:36 +0000
Subject: [PATCH 11/16] Updated linebreak processing

---
 app/Http/Controllers/ApplicationController.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/ApplicationController.php b/app/Http/Controllers/ApplicationController.php
index e83bd90..3537a27 100755
--- a/app/Http/Controllers/ApplicationController.php
+++ b/app/Http/Controllers/ApplicationController.php
@@ -38,14 +38,14 @@ class ApplicationController extends Controller
 
     private function processOSLinebreaks(array $structuredResponses)
     {
-        $processedResponses = $structuredResponses;
-
-       foreach ($structuredResponses as $responseKey => $response)
+       $processedResponses = $structuredResponses;
+       foreach ($structuredResponses as $field)
        {
-           // We can't use nl2br because it preserves the line breaks and doesn't include all line breaks used by other operating systems
-           $originalResponse = $response['response'];
-           $processedResponses[$responseKey]['response'] = str_replace(["\r\n", "\r", "\n"], "<br/>", $originalResponse);
-       }
+           foreach($field as $fieldKey => $fieldData)
+           {
+                $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;
     }
@@ -79,7 +79,7 @@ class ApplicationController extends Controller
                     [
                         'application' => $application,
                         'comments' => $application->comments,
-                        'structuredResponses' => json_decode($application->response->responseData, true),
+                        'structuredResponses' => $this->processOSLinebreaks(json_decode($application->response->responseData, true)),
                         'formStructure' => $application->response->form,
                         'vacancy' => $application->response->vacancy,
                         'canVote'  => $this->canVote($application->votes),

From 5f6f6f693d301ae867618f08c247316d55444609 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Fri, 29 Jan 2021 17:20:28 +0000
Subject: [PATCH 12/16] Remove linebreak processing

This approach would allow users to directly use HTML in their responses. We'd need to purify HTML on the way out to only allow <br>, otherwise, there'd be XSS concerns.

Rendering as Markdown and letting users know they can use it is a better approach in the long run.
---
 app/Http/Controllers/ApplicationController.php | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/ApplicationController.php b/app/Http/Controllers/ApplicationController.php
index 3537a27..d7400b9 100755
--- a/app/Http/Controllers/ApplicationController.php
+++ b/app/Http/Controllers/ApplicationController.php
@@ -36,20 +36,7 @@ use Illuminate\Support\Facades\Log;
 class ApplicationController extends Controller
 {
 
-    private function processOSLinebreaks(array $structuredResponses)
-    {
-       $processedResponses = $structuredResponses;
-       foreach ($structuredResponses as $field)
-       {
-           foreach($field as $fieldKey => $fieldData)
-           {
-                $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;
-    }
-
+   
     private function canVote($votes): bool
     {
         $allvotes = collect([]);
@@ -79,7 +66,7 @@ class ApplicationController extends Controller
                     [
                         'application' => $application,
                         'comments' => $application->comments,
-                        'structuredResponses' => $this->processOSLinebreaks(json_decode($application->response->responseData, true)),
+                        'structuredResponses' => json_decode($application->response->responseData, true),
                         'formStructure' => $application->response->form,
                         'vacancy' => $application->response->vacancy,
                         'canVote'  => $this->canVote($application->votes),

From aad04d6d14905b426a095e82f190d1ca38f65ff2 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Fri, 29 Jan 2021 17:27:03 +0000
Subject: [PATCH 13/16] Support markdown for application fields

---
 resources/views/dashboard/user/viewapp.blade.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/views/dashboard/user/viewapp.blade.php b/resources/views/dashboard/user/viewapp.blade.php
index 5ec4335..d2a9fca 100755
--- a/resources/views/dashboard/user/viewapp.blade.php
+++ b/resources/views/dashboard/user/viewapp.blade.php
@@ -103,7 +103,8 @@
                         <div class="mt-4 mb-3">
 
                             <h5>{{$content['title']}}</h5>
-                            <p>{{$content['response']}}</p>
+                            
+                            <p>{{ GrahamCampbell\Markdown\Facades\Markdown::convertToHtml($content['response']) }}</p>
 
                         </div>
 

From 638b2719a8258051c4b3bbc969cc5d75ee3e6976 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Fri, 29 Jan 2021 17:28:29 +0000
Subject: [PATCH 14/16] Blade change

---
 resources/views/dashboard/user/viewapp.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/dashboard/user/viewapp.blade.php b/resources/views/dashboard/user/viewapp.blade.php
index d2a9fca..d1205e2 100755
--- a/resources/views/dashboard/user/viewapp.blade.php
+++ b/resources/views/dashboard/user/viewapp.blade.php
@@ -104,7 +104,7 @@
 
                             <h5>{{$content['title']}}</h5>
                             
-                            <p>{{ GrahamCampbell\Markdown\Facades\Markdown::convertToHtml($content['response']) }}</p>
+                            <p>{!! GrahamCampbell\Markdown\Facades\Markdown::convertToHtml($content['response']) !!}</p>
 
                         </div>
 

From 5b39c573b31140d2366ead65f0439a53a6326db9 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Fri, 29 Jan 2021 17:32:43 +0000
Subject: [PATCH 15/16] Add Markdown support notice

---
 resources/views/dashboard/application-rendering/apply.blade.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/views/dashboard/application-rendering/apply.blade.php b/resources/views/dashboard/application-rendering/apply.blade.php
index 7c0aa0c..fb5fc9d 100755
--- a/resources/views/dashboard/application-rendering/apply.blade.php
+++ b/resources/views/dashboard/application-rendering/apply.blade.php
@@ -69,6 +69,8 @@
                     <p>{{__('messages.application_r.welcome.line2', ['agerqr' => '18 ' . __('messages.application_r.welcome.yrs_old')])}}.</p>
                     <p class="text-bold">{{__('messages.application_r.welcome.line3')}}.</p>
 
+                    <p class="text-muted"><i class="fab fa-markdown"></i>All fields support <a target="_blank" href="https://www.markdownguide.org/cheat-sheet/">Markdown</a></p>
+
                 </div>
 
             </div>

From 242ba7b31e2033457433f3a9f07f77323e3edf78 Mon Sep 17 00:00:00 2001
From: Miguel N <miguel456@noreply.spacejewel-hosting.com>
Date: Fri, 29 Jan 2021 17:34:45 +0000
Subject: [PATCH 16/16] Update
 'resources/views/dashboard/application-rendering/apply.blade.php'

---
 resources/views/dashboard/application-rendering/apply.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/dashboard/application-rendering/apply.blade.php b/resources/views/dashboard/application-rendering/apply.blade.php
index fb5fc9d..e7d2ec9 100755
--- a/resources/views/dashboard/application-rendering/apply.blade.php
+++ b/resources/views/dashboard/application-rendering/apply.blade.php
@@ -69,7 +69,7 @@
                     <p>{{__('messages.application_r.welcome.line2', ['agerqr' => '18 ' . __('messages.application_r.welcome.yrs_old')])}}.</p>
                     <p class="text-bold">{{__('messages.application_r.welcome.line3')}}.</p>
 
-                    <p class="text-muted"><i class="fab fa-markdown"></i>All fields support <a target="_blank" href="https://www.markdownguide.org/cheat-sheet/">Markdown</a></p>
+                    <p><i class="fab fa-markdown"></i> All fields support <a target="_blank" href="https://www.markdownguide.org/cheat-sheet/">Markdown</a></p>
 
                 </div>