From 8ef5444136743e60356b56bf58a49e8ef0a3ccfa Mon Sep 17 00:00:00 2001
From: Peter Papp <peterpapp@makingcg.com>
Date: Fri, 12 Mar 2021 14:35:12 +0100
Subject: [PATCH] added get_settings_in_json helper

---
 app/Http/Controllers/AppFunctionsController.php | 12 ++++--------
 app/Http/Helpers/helpers.php                    | 12 ++++++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/AppFunctionsController.php b/app/Http/Controllers/AppFunctionsController.php
index 79bf8d60..d89f2383 100644
--- a/app/Http/Controllers/AppFunctionsController.php
+++ b/app/Http/Controllers/AppFunctionsController.php
@@ -67,11 +67,7 @@ class AppFunctionsController extends Controller
             $pages = Page::all();
 
             // Get all settings
-            $settings = json_decode(
-                Setting::all()
-                    ->pluck('value', 'name')
-                    ->toJson()
-            );
+            $settings = get_settings_in_json();
 
         } catch (PDOException $e) {
 
@@ -92,7 +88,7 @@ class AppFunctionsController extends Controller
     public function og_site($token)
     {
         // Get all settings
-        $settings = Setting::all();
+        $settings = get_settings_in_json();
 
         // Get shared token
         $shared = get_shared($token);
@@ -105,7 +101,7 @@ class AppFunctionsController extends Controller
 
             // Get file record
             $file = File::where('user_id', $shared->user_id)
-                ->where('unique_id', $shared->item_id)
+                ->where('id', $shared->item_id)
                 ->first();
 
             if ($file->thumbnail) {
@@ -142,7 +138,7 @@ class AppFunctionsController extends Controller
 
         // Return view
         return view("og-view")
-            ->with('settings', json_decode($settings->pluck('value', 'name')->toJson()))
+            ->with('settings', $settings)
             ->with('metadata', $metadata);
     }
 
diff --git a/app/Http/Helpers/helpers.php b/app/Http/Helpers/helpers.php
index 5826dcda..d03c87e7 100644
--- a/app/Http/Helpers/helpers.php
+++ b/app/Http/Helpers/helpers.php
@@ -38,6 +38,18 @@ function get_setting($setting)
     return Setting::find($setting)->value ?? null;
 }
 
+/**
+ * Get all app settings and return them as json
+ */
+function get_settings_in_json()
+{
+    return json_decode(
+        Setting::all()
+            ->pluck('value', 'name')
+            ->toJson()
+    );
+}
+
 /**
  * Create paragraph from text
  *