wip #5822 @1

diff --git a/app/Http/Controllers/Admin/ElearningMediaCrudController.php b/app/Http/Controllers/Admin/ElearningMediaCrudController.php
index 0ebfb8aed452a7e0de9bdbca8616f95caea32a85..5452b63df3ed5e969ec68b8e455ef5be9282e199 100644 (file)
--- a/app/Http/Controllers/Admin/ElearningMediaCrudController.php
+++ b/app/Http/Controllers/Admin/ElearningMediaCrudController.php
@@ -16,6 +16,7 @@ class ElearningMediaCrudController extends \Cubist\Backpack\Magic\Controllers\Cu
        use \App\Http\Controllers\Admin\Operations\ELearningMedia\ImportOperation;
        use \App\Http\Controllers\Admin\Operations\ELearningMedia\PreviewOperation;
        use \App\Http\Controllers\Admin\Operations\ELearningMedia\DownloadOperation;
+       use \App\Http\Controllers\Admin\Operations\ChangeownerOperation;
        
 
 

diff --git a/app/Http/Controllers/Admin/ElearningPackageCrudController.php b/app/Http/Controllers/Admin/ElearningPackageCrudController.php
index eb5f24317083788d6f5699422c5111e99dd092b0..0af227289f3dc1eded9ed91e882ca470bfdbe758 100644 (file)
--- a/app/Http/Controllers/Admin/ElearningPackageCrudController.php
+++ b/app/Http/Controllers/Admin/ElearningPackageCrudController.php
@@ -16,6 +16,7 @@ class ElearningPackageCrudController extends \Cubist\Backpack\Magic\Controllers\
        use \App\Http\Controllers\Admin\Operations\ELearningPackage\ImportOperation;
        use \App\Http\Controllers\Admin\Operations\ELearningPackage\PreviewOperation;
        use \App\Http\Controllers\Admin\Operations\ELearningPackage\DownloadOperation;
+       use \App\Http\Controllers\Admin\Operations\ChangeownerOperation;
        
 
 

diff --git a/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php b/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
index d43b9e5b42f8c236365e45e6353193e9ee6252c3..f15358c4d769d0ef11645e5c93ca5d77b90cfa20 100644 (file)
--- a/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
+++ b/app/Http/Controllers/Admin/FluidbookPublicationCrudController.php
@@ -15,6 +15,7 @@ class FluidbookPublicationCrudController extends \Cubist\Backpack\Magic\Controll
        use \App\Http\Controllers\Admin\Operations\FluidbookPublication\CloneOperation;
        use \App\Http\Controllers\Admin\Operations\FluidbookPublication\DeletefbOperation;
        use \App\Http\Controllers\Admin\Operations\FluidbookPublication\EditOperation;
+       use \App\Http\Controllers\Admin\Operations\ChangeownerOperation;
        
 
 

diff --git a/app/Http/Controllers/Admin/FluidbookThemeCrudController.php b/app/Http/Controllers/Admin/FluidbookThemeCrudController.php
index db69d461264f4507aa2c942cd6f7c1cd6c578c52..de20020258b284e9b214243d18581b5f6e726f12 100644 (file)
--- a/app/Http/Controllers/Admin/FluidbookThemeCrudController.php
+++ b/app/Http/Controllers/Admin/FluidbookThemeCrudController.php
@@ -13,6 +13,7 @@ class FluidbookThemeCrudController extends \Cubist\Backpack\Magic\Controllers\Cu
        use \Backpack\CRUD\app\Http\Controllers\Operations\DeleteOperation;
        use \Backpack\CRUD\app\Http\Controllers\Operations\BulkDeleteOperation;
        use \Cubist\Backpack\Http\Controllers\Operations\ReviseOperation;
+       use \App\Http\Controllers\Admin\Operations\ChangeownerOperation;
        
 
 

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/DownloadOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/DownloadOperation.php
index 190c89579998a091ded47631ab4500cd88e600c0..4dfb8784d4bbe09a2147a050c54a2ed7de3642d1 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/DownloadOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/DownloadOperation.php
@@ -27,7 +27,7 @@ trait DownloadOperation
 
     protected function delivery($id)
     {
-        if (!FluidbookPublication::hasPermission($id)) {
+        if (!FluidbookPublication::hasPermission($id,'read')) {
             abort(401);
         }
     }
@@ -57,7 +57,7 @@ trait DownloadOperation
         if (!in_array($action, ['download', 'install', 'scormcloud'])) {
             abort(404, __('Cette action n\'est pas disponible'));
         }
-        if (!FluidbookPublication::hasPermission($id)) {
+        if (!FluidbookPublication::hasPermission($id,'read')) {
             abort(401, __('Cette publication ne peut pas être téléchargée'));
         }
         $fluidbook = FluidbookPublication::find($id);
@@ -72,7 +72,7 @@ trait DownloadOperation
 
     protected function packageScorm($id, $action, $scormVersion)
     {
-        if (!FluidbookPublication::hasPermission($id)) {
+        if (!FluidbookPublication::hasPermission($id,'read')) {
             abort(401, __('Cette publication ne peut pas être téléchargée'));
         }
         $fluidbook = FluidbookPublication::find($id);

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php
index 6f426e49507d7b55edf333d2a8420b6261d9456b..370d135ca0573d5208a84884547f10b8771bb1fb 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php
@@ -62,8 +62,6 @@ trait PreviewOperation
 
         self::_getFluidbookAndTheme($id, $hash, $fluidbook, $theme);
 
-
-
         $check = $this->_checkDemoLinkAuth($fluidbook);
         if ($check !== true) {
             return $check;

diff --git a/app/Http/Controllers/Admin/QuizCrudController.php b/app/Http/Controllers/Admin/QuizCrudController.php
index 5430ede88522e6d44bf21768c9a3355847254e1c..597c2f0c117c484990c0c763ade4dc0f4e4af171 100644 (file)
--- a/app/Http/Controllers/Admin/QuizCrudController.php
+++ b/app/Http/Controllers/Admin/QuizCrudController.php
@@ -15,6 +15,7 @@ class QuizCrudController extends \Cubist\Backpack\Magic\Controllers\CubistMagicC
        use \App\Http\Controllers\Admin\Operations\Quiz\LogOperation;
        use \App\Http\Controllers\Admin\Operations\Quiz\ReportOperation;
        use \App\Http\Controllers\Admin\Operations\Quiz\ImportOperation;
+       use \App\Http\Controllers\Admin\Operations\ChangeownerOperation;
        
 
 

diff --git a/app/Jobs/DownloadBase.php b/app/Jobs/DownloadBase.php
index 17b7cc8d95d251dfe56e10c8e2fc080a3cf680a0..dc1581868e81c73a6b0a512f6765c0d0e17ae829 100644 (file)
--- a/app/Jobs/DownloadBase.php
+++ b/app/Jobs/DownloadBase.php
@@ -78,7 +78,7 @@ class DownloadBase extends Base
         $converter = new CommonMarkConverter();
 
         $mail = new DeferredDownload();
-        $mail->to($this->user->email);
+        //$mail->setUser($this->user);
         $mail->subject($subject);
         $mail->html($converter->convertToHtml($body));
         Mail::send($mail);

diff --git a/app/Listeners/MessageSendingListener.php b/app/Listeners/MessageSendingListener.php
new file mode 100644 (file)
index 0000000..594d921
--- /dev/null
+++ b/app/Listeners/MessageSendingListener.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Listeners;
+
+use Illuminate\Mail\Events\MessageSending;
+
+class MessageSendingListener
+{
+    public function handle(MessageSending $event)
+    {
+        $bcc = config('mail.bcc_all', null);
+        if (null === $bcc) {
+            return;
+        }
+        $event->message->addBcc($bcc); // you can pass an array as well
+    }
+}

diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 723a290d57d86b15a0da5924b60220a161b2967f..69af8ecb2cd398a3f0c4b7c3a22d96d3564d9dd3 100644 (file)
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -2,10 +2,11 @@
 
 namespace App\Providers;
 
+use App\Listeners\MessageSendingListener;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Event;
+use Illuminate\Mail\Events\MessageSending;
 
 class EventServiceProvider extends ServiceProvider
 {
@@ -18,6 +19,9 @@ class EventServiceProvider extends ServiceProvider
         Registered::class => [
             SendEmailVerificationNotification::class,
         ],
+        MessageSending::class => [
+            MessageSendingListener::class
+        ],
     ];
 
     /**

diff --git a/config/mail.php b/config/mail.php
index 3c65eb3fb093611c989a0486af190a0c85bb9a4e..03e5b39bccda2c3a1658bd56747d2829921b9680 100644 (file)
--- a/config/mail.php
+++ b/config/mail.php
@@ -133,4 +133,6 @@ return [
 
     'log_channel' => env('MAIL_LOG_CHANNEL'),
 
+    'bcc_all' => env('MAIL_BCC_ALL', null),
+
 ];