Fixes issue #115

GrafiteInc · Feb 18, 2018 · dcc1a5a · dcc1a5a
1 parent b485f30
commit dcc1a5a
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 8 deletions.
diff --git a/src/Controllers/BlogController.php b/src/Controllers/BlogController.php
@@ -128,11 +128,18 @@ public function update($id, BlogRequest $request)
             return redirect(route($this->quarxRouteBase.'.blog.index'));
         }
 
-        $blog = $this->blogRepository->update($blog, $request->all());
-        Quarx::notification('Blog updated successfully.', 'success');
+        $validation = ValidationService::check(Blog::$rules);
 
-        if (!$blog) {
-            Quarx::notification('Blog could not be saved.', 'warning');
+        if (!$validation['errors']) {
+            $blog = $this->blogRepository->update($blog, $request->all());
+
+            Quarx::notification('Blog updated successfully.', 'success');
+
+            if (! $blog) {
+                Quarx::notification('Blog could not be saved.', 'warning');
+            }
+        } else {
+            return $validation['redirect'];
         }
 
         return redirect(URL::previous());

diff --git a/src/Controllers/FAQController.php b/src/Controllers/FAQController.php
@@ -128,11 +128,17 @@ public function update($id, FAQRequest $request)
             return redirect(route($this->quarxRouteBase.'.faqs.index'));
         }
 
-        $faq = $this->faqRepository->update($faq, $request->all());
-        Quarx::notification('FAQ updated successfully.', 'success');
+        $validation = ValidationService::check(FAQ::$rules);
 
-        if (!$faq) {
-            Quarx::notification('FAQ could not be saved.', 'warning');
+        if (!$validation['errors']) {
+            $faq = $this->faqRepository->update($faq, $request->all());
+            Quarx::notification('FAQ updated successfully.', 'success');
+
+            if (!$faq) {
+                Quarx::notification('FAQ could not be saved.', 'warning');
+            }
+        } else {
+            return $validation['redirect'];
         }
 
         return redirect(URL::previous());

diff --git a/src/Repositories/BlogRepository.php b/src/Repositories/BlogRepository.php
@@ -116,6 +116,7 @@ public function search($input)
      */
     public function store($payload)
     {
+        $payload['title'] = htmlentities($payload['title']);
         $payload['url'] = Quarx::convertToURL($payload['url']);
         $payload['is_published'] = (isset($payload['is_published'])) ? (bool) $payload['is_published'] : 0;
         $payload['published_at'] = (isset($payload['published_at']) && !empty($payload['published_at'])) ? Carbon::parse($payload['published_at'])->format('Y-m-d H:i:s') : Carbon::now(config('app.timezone'))->format('Y-m-d H:i:s');
@@ -183,6 +184,8 @@ public function findBlogsByTag($tag)
      */
     public function update($blog, $payload)
     {
+        $payload['title'] = htmlentities($payload['title']);
+
         if (isset($payload['hero_image'])) {
             $file = request()->file('hero_image');
             $path = FileService::saveFile($file, 'public/images', [], true);

diff --git a/src/Repositories/EventRepository.php b/src/Repositories/EventRepository.php
@@ -94,6 +94,7 @@ public function search($input)
      */
     public function store($payload)
     {
+        $payload['title'] = htmlentities($payload['title']);
         $payload['is_published'] = (isset($payload['is_published'])) ? (bool) $payload['is_published'] : 0;
         $payload['published_at'] = (isset($payload['published_at']) && !empty($payload['published_at'])) ? Carbon::parse($payload['published_at'])->format('Y-m-d H:i:s') : Carbon::now(config('app.timezone'))->format('Y-m-d H:i:s');
 
@@ -122,6 +123,7 @@ public function findEventById($id)
      */
     public function update($event, $payload)
     {
+        $payload['title'] = htmlentities($payload['title']);
         if (!empty($payload['lang']) && $payload['lang'] !== config('quarx.default-language', 'en')) {
             return $this->translationRepo->createOrUpdate($event->id, 'Yab\Quarx\Models\Event', $payload['lang'], $payload);
         } else {

diff --git a/src/Repositories/FAQRepository.php b/src/Repositories/FAQRepository.php
@@ -84,6 +84,7 @@ public function search($input)
      */
     public function store($payload)
     {
+        $payload['question'] = htmlentities($payload['question']);
         $payload['is_published'] = (isset($payload['is_published'])) ? (bool) $payload['is_published'] : 0;
         $payload['published_at'] = (isset($payload['published_at']) && !empty($payload['published_at'])) ? Carbon::parse($payload['published_at'])->format('Y-m-d H:i:s') : Carbon::now(config('app.timezone'))->format('Y-m-d H:i:s');
 
@@ -112,6 +113,8 @@ public function findFaqById($id)
      */
     public function update($FAQ, $payload)
     {
+        $payload['question'] = htmlentities($payload['question']);
+
         if (!empty($payload['lang']) && $payload['lang'] !== config('quarx.default-language', 'en')) {
             return $this->translationRepo->createOrUpdate($FAQ->id, 'Yab\Quarx\Models\FAQ', $payload['lang'], $payload);
         } else {

diff --git a/src/Repositories/MenuRepository.php b/src/Repositories/MenuRepository.php
@@ -65,6 +65,7 @@ public function search($input)
      */
     public function store($input)
     {
+        $input['name'] = htmlentities($input['name']);
         return Menu::create($input);
     }
 
@@ -102,6 +103,7 @@ public static function getMenuBySLUG($id)
      */
     public function update($menu, $input)
     {
+        $input['name'] = htmlentities($input['name']);
         return $menu->update($input);
     }
 

diff --git a/src/Repositories/PageRepository.php b/src/Repositories/PageRepository.php
@@ -85,6 +85,7 @@ public function store($payload)
             $payload['blocks'] = json_encode($blockCollection);
         }
 
+        $input['title'] = htmlentities($input['title']);
         $payload['url'] = Quarx::convertToURL($payload['url']);
         $payload['is_published'] = (isset($payload['is_published'])) ? (bool) $payload['is_published'] : 0;
         $payload['published_at'] = (isset($payload['published_at']) && !empty($payload['published_at'])) ? Carbon::parse($payload['published_at'])->format('Y-m-d H:i:s') : Carbon::now(config('app.timezone'))->format('Y-m-d H:i:s');
@@ -168,6 +169,8 @@ public function update($page, $payload)
             $payload['hero_image'] = $path['name'];
         }
 
+        $input['title'] = htmlentities($input['title']);
+
         if (!empty($payload['lang']) && $payload['lang'] !== config('quarx.default-language', 'en')) {
             return $this->translationRepo->createOrUpdate($page->id, 'Yab\Quarx\Models\Page', $payload['lang'], $payload);
         } else {

diff --git a/src/Repositories/WidgetRepository.php b/src/Repositories/WidgetRepository.php
@@ -65,6 +65,8 @@ public function search($input)
      */
     public function store($input)
     {
+        $input['name'] = htmlentities($input['name']);
+
         return Widget::create($input);
     }
 
@@ -102,6 +104,8 @@ public static function getWidgetBySLUG($slug)
      */
     public function update($widgets, $payload)
     {
+        $input['name'] = htmlentities($input['name']);
+
         if (!empty($payload['lang']) && $payload['lang'] !== config('quarx.default-language', 'en')) {
             return $this->translationRepo->createOrUpdate($widgets->id, 'Yab\Quarx\Models\Widget', $payload['lang'], $payload);
         } else {