feat: Title (#98)

64knl · web-flow · commit a10857cb7b3f · 2023-09-08T10:55:46.000+02:00
* feat: add $title for use in blade (#95) * fix: form permissions fixed (#96) * fix: checkRights now accepts null as input * fix: form policies + config comment line formatting * fix: upload errors for ContentBlocks (#97)
diff --git a/config/app.php b/config/app.php
@@ -1,5 +1,7 @@
 <?php
 
+// This file is published by the siteboss-framework package
+
 use Illuminate\Support\Facades\Facade;
 use Illuminate\Support\ServiceProvider;
 
diff --git a/config/auth.php b/config/auth.php
@@ -1,6 +1,6 @@
 <?php
 
-//this file is published by the siteboss-framework package
+// This file is published by the siteboss-framework package
 
 return [
 
diff --git a/config/clamav.php b/config/clamav.php
@@ -1,6 +1,6 @@
 <?php
 
-//this file is published by the siteboss-framework package
+// This file is published by the siteboss-framework package
 
 return [
     /*
diff --git a/config/database.php b/config/database.php
@@ -1,6 +1,6 @@
 <?php
 
-//this file is published by the siteboss-framework package
+// This file is published by the siteboss-framework package
 
 use Illuminate\Support\Str;
 
diff --git a/config/honeypot.php b/config/honeypot.php
@@ -1,6 +1,6 @@
 <?php
 
-//this file is published by the siteboss-framework package
+// This file is published by the siteboss-framework package
 
 use NotFound\Framework\SpamResponder\SpamDetectedResponder;
 
diff --git a/config/indexer.php b/config/indexer.php
@@ -1,6 +1,6 @@
 <?php
 
-//this file is published by the siteboss-framework package
+// This file is published by the siteboss-framework package
 
 return [
 
diff --git a/config/laravellocalization.php b/config/laravellocalization.php
@@ -1,5 +1,7 @@
 <?php
 
+// This file is published by the siteboss-framework package
+
 return [
 
     // Uncomment the languages that your site supports - or add new ones.
diff --git a/config/openid.php b/config/openid.php
@@ -1,6 +1,6 @@
 <?php
 
-//this file is published by the siteboss-framework package
+// This file is published by the siteboss-framework package
 
 return [
     /*
diff --git a/config/siteboss.php b/config/siteboss.php
@@ -1,6 +1,6 @@
 <?php
 
-//this file is published by the siteboss-framework package
+// This file is published by the siteboss-framework package
 
 return [
     /*
diff --git a/database/migrations/2021_10_27_182234_create_cms_upload_table.php b/database/migrations/2021_10_27_182234_create_cms_upload_table.php
@@ -16,7 +16,7 @@ public function up()
         Schema::create('cms_upload', function (Blueprint $table) {
             $table->id();
             $table->integer('containerId')->nullable();
-            $table->string('containerType', 8)->nullable();
+            $table->string('containerType', 256)->nullable();
             $table->string('filename')->nullable();
             $table->string('mimetype', 128)->nullable();
         });
diff --git a/src/Http/Controllers/Forms/DownloadController.php b/src/Http/Controllers/Forms/DownloadController.php
@@ -103,6 +103,7 @@ private function getFile($fieldId, $dataId, $arrayIndex)
     {
         $dataContainer = Data::where('id', $dataId)->first();
         $field = $dataContainer->data->$fieldId;
+
         // array index added 1, since it doesn't accept 0 as a paramter
         return $field->value[$arrayIndex - 1];
     }
diff --git a/src/Http/Controllers/Pages/PageController.php b/src/Http/Controllers/Pages/PageController.php
@@ -33,6 +33,7 @@ public function __construct(
             $pageValues = $this->getPageValues();
             $pvObj = new AssetValues($pageValues);
             if ($this->currentPage) {
+                View::share('title', $this->getFullTitle());
                 View::share('p', $pvObj);
                 View::share('c', $this);
                 View::share('g', $globalPageValues);
@@ -65,6 +66,11 @@ public function getTitle(): ?string
         return $this->menuItem()->getTitle() ?? '';
     }
 
+    public function getFullTitle(): string
+    {
+        return $this->getTitle().' - '.config('app.name');
+    }
+
     public function slug(): string
     {
         return $this->menuItem()->url;
diff --git a/src/Models/CmsUser.php b/src/Models/CmsUser.php
@@ -119,7 +119,7 @@ public function checkRights($expression, $default = true): bool
             return true;
         }
 
-        if (! isset($expression) || empty(trim($expression))) {
+        if ($expression === null || empty(trim($expression))) {
             // Rights have not been set => return true;
             // This is to make things backwards compatible
             return $default;
diff --git a/src/Providers/AuthServiceProvider.php b/src/Providers/AuthServiceProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+// This file is published by the siteboss-framework package
+
 namespace App\Providers;
 
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
@@ -14,15 +16,18 @@ class AuthServiceProvider extends ServiceProvider
      *
      * @var array
      */
-    protected $policies = [];
+    protected $policies = [
+        'NotFound\Framework\Models\Forms\Data' => 'NotFound\Framework\Policies\Forms\DataPolicy',
+        'NotFound\Framework\Models\Forms\Form' => 'NotFound\Framework\Policies\Forms\FormPolicy',
+        'NotFound\Framework\Models\Forms\Category' => 'NotFound\Framework\Policies\Forms\CategoryPolicy',
+        'NotFound\Framework\Models\Table' => 'NotFound\Framework\Policies\TablePolicy',
+    ];
 
     /**
      * Register any authentication / authorization services.
      */
     public function boot()
     {
-        // $this->registerPolicies();
-
         Auth::extend('openid-token', function ($app, $name, array $config) {
             return new OpenIDGuard(Auth::createUserProvider($config['provider']), $app->request);
         });
diff --git a/src/Services/Assets/Components/ComponentText.php b/src/Services/Assets/Components/ComponentText.php
@@ -42,6 +42,7 @@ private function getRegEx(): ?string
                 case 'custom': return $this->assetItem->server_properties->regEx ?? '';
             }
         }
+
         //$inputText->setEndpoint($endPoint);
         return null;
     }
diff --git a/src/Services/Forms/Fields/AbstractType.php b/src/Services/Forms/Fields/AbstractType.php
@@ -38,7 +38,7 @@ protected function setValue($value): void
      */
     public function setValueFromPost(): void
     {
-        if (null !== request($this->id)) {
+        if (request($this->id) !== null) {
             $this->setValue(request($this->id) ?? null);
         }
     }
