From: Vincent Vanwaelscappel Date: Tue, 28 Mar 2023 06:30:34 +0000 (+0200) Subject: wip #5822 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9072f1bc854c3f934e8a910cfeecc87b5ad4b68e;p=fluidbook-toolbox.git wip #5822 @1 --- diff --git a/app/Http/Controllers/Admin/ElearningMediaCrudController.php b/app/Http/Controllers/Admin/ElearningMediaCrudController.php index 0ebfb8aed..5452b63df 100644 --- 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 eb5f24317..0af227289 100644 --- 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 d43b9e5b4..f15358c4d 100644 --- 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 db69d4612..de2002025 100644 --- 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 190c89579..4dfb8784d 100644 --- 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 6f426e495..370d135ca 100644 --- 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 5430ede88..597c2f0c1 100644 --- 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 17b7cc8d9..dc1581868 100644 --- 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 index 000000000..594d921af --- /dev/null +++ b/app/Listeners/MessageSendingListener.php @@ -0,0 +1,17 @@ +message->addBcc($bcc); // you can pass an array as well + } +} diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 723a290d5..69af8ecb2 100644 --- 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 3c65eb3fb..03e5b39bc 100644 --- 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), + ];