sanitize array gets in Event, Organizer, Teacher models

davide-casiraghi · Mar 29, 2020 · 1e9bc20 · 1e9bc20
1 parent 1a42fa4
commit 1e9bc20
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 25 deletions.
diff --git a/src/Models/Event.php b/src/Models/Event.php
@@ -36,6 +36,7 @@ class Event extends Model
         'repeat_monthly_on',
         'on_monthly_kind',
         'multiple_dates',
+        'contact_email'
     ];
 
     /***************************************************************************/
@@ -344,22 +345,19 @@ public function preSave(array $requestArray, $eventPicture): void
         $this->title = $requestArray['title'];
         $this->description = clean($requestArray['description']);
 
-        if ($requestArray['created_by']) {
-            $this->created_by = $requestArray['created_by'];
-        }
-
+        $this->created_by = $requestArray['created_by'] ?? null;
+
         if (! $this->slug) {
             $this->slug = Str::slug($this->title, '-').'-'.rand(100000, 1000000);
         }
-        $this->category_id = $requestArray['category_id'];
-        $this->venue_id = $requestArray['venue_id'];
-        $this->contact_email = $requestArray['contact_email'];
-        $this->website_event_link = $requestArray['website_event_link'];
-        $this->facebook_event_link = $requestArray['facebook_event_link'];
-        $this->status = (array_key_exists('status', $requestArray)) ? $requestArray['status'] : null;
-        $this->on_monthly_kind = (array_key_exists('on_monthly_kind', $requestArray)) ? $requestArray['on_monthly_kind'] : null;
-        //$this->on_monthly_kind = $requestArray['on_monthly_kind'];
-        $this->multiple_dates = (array_key_exists('multiple_dates', $requestArray)) ? $requestArray['multiple_dates'] : null;
+        $this->category_id = $requestArray['category_id'] ?? null;
+        $this->venue_id = $requestArray['venue_id'] ?? null;
+        $this->contact_email = $requestArray['contact_email'] ?? null;
+        $this->website_event_link = $requestArray['website_event_link'] ?? null;
+        $this->facebook_event_link = $requestArray['facebook_event_link'] ?? null;
+        $this->status = $requestArray['status'] ?? null;
+        $this->on_monthly_kind = $requestArray['on_monthly_kind'] ?? null;
+        $this->multiple_dates = $requestArray['multiple_dates'] ?? null;
 
         // Event teaser image upload
         //if ($request->file('image')) {
@@ -375,7 +373,7 @@ public function preSave(array $requestArray, $eventPicture): void
         } else {
             //$this->image = $request->get('image');
             if (array_key_exists('image', $requestArray)) {
-                $this->image = $requestArray['image'];
+                $this->image = $requestArray['image'] ?? null;
             }
         }
 

diff --git a/src/Models/Organizer.php b/src/Models/Organizer.php
@@ -44,9 +44,9 @@ public function preSave(array $requestArray, $profilePicture): void
     {
         $this->name = $requestArray['name'];
         $this->description = clean($requestArray['description']);
-        $this->website = $requestArray['website'];
-        $this->email = $requestArray['email'];
-        $this->phone = $requestArray['phone'];
+        $this->website = $requestArray['website'] ?? null;
+        $this->email = $requestArray['email'] ?? null;
+        $this->phone = $requestArray['phone'] ?? null;
 
         // Organizer profile picture upload
         if (! empty($profilePicture)) {
@@ -65,7 +65,7 @@ public function preSave(array $requestArray, $profilePicture): void
         }
 
         //$this->created_by = Auth::id();
-        $this->created_by = $requestArray['created_by'];
+        $this->created_by = $requestArray['created_by'] ?? null;
         if (! $this->slug) {
             $this->slug = Str::slug($this->name, '-').'-'.rand(10000, 100000);
         }

diff --git a/src/Models/Teacher.php b/src/Models/Teacher.php
@@ -78,10 +78,10 @@ public function preSave(array $requestArray, $profilePicture): void
     {
         $this->name = $requestArray['name'];
         $this->bio = clean($requestArray['bio']);
-        $this->country_id = $requestArray['country_id'];
-        $this->year_starting_practice = $requestArray['year_starting_practice'];
-        $this->year_starting_teach = $requestArray['year_starting_teach'];
-        $this->significant_teachers = $requestArray['significant_teachers'];
+        $this->country_id = $requestArray['country_id'] ?? null;
+        $this->year_starting_practice = $requestArray['year_starting_practice'] ?? null;
+        $this->year_starting_teach = $requestArray['year_starting_teach'] ?? null;
+        $this->significant_teachers = $requestArray['significant_teachers'] ?? null;
 
         // Teacher profile picture upload
         if (! empty($profilePicture)) {
@@ -99,11 +99,11 @@ public function preSave(array $requestArray, $profilePicture): void
             }
         }
 
-        $this->website = $requestArray['website'];
-        $this->facebook = $requestArray['facebook'];
+        $this->website = $requestArray['website'] ?? null;
+        $this->facebook = $requestArray['facebook'] ?? null;
 
         //$this->created_by = Auth::id();$requestArray['created_by'];
-        $this->created_by = $requestArray['created_by'];
+        $this->created_by = $requestArray['created_by'] ?? null;
 
         if (! $this->slug) {
             $this->slug = Str::slug($this->name, '-').'-'.rand(10000, 100000);