fix: VueFileManager default title in mails, ShareCreate / ShareEdit opening via CopyInput

This commit is contained in:
Milos Holba
2021-02-25 18:11:20 +01:00
parent 725a34b7d0
commit 7a963cf5b3
26 changed files with 522 additions and 22 deletions

View File

@@ -2,6 +2,7 @@
namespace App\Notifications;
use App\Setting;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\MailMessage;
@@ -41,14 +42,17 @@ class ResetPassword extends Notification
public function toMail($notifiable)
{
$reset_url = url('/create-new-password?token=' . $this->token);
$get_name = strval(Setting::where('name', 'app_title')->pluck('value')[0]);
$app_name = $get_name ? $get_name : 'VueFileManager';
return (new MailMessage)
->subject(__('vuefilemanager.reset_password_subject') . config('vuefilemanager.app_name'))
->subject(__('vuefilemanager.reset_password_subject') . $app_name)
->greeting(__('vuefilemanager.reset_password_greeting'))
->line(__('vuefilemanager.reset_password_line_1'))
->action(__('vuefilemanager.reset_password_action'), $reset_url)
->line(__('vuefilemanager.reset_password_line_2'))
->salutation(__('vuefilemanager.salutation') . ', ' . config('vuefilemanager.app_name'));
->salutation(__('vuefilemanager.salutation') . ', ' . $app_name );
}
/**

View File

@@ -2,6 +2,7 @@
namespace App\Notifications;
use App\Setting;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Support\Facades\Auth;
@@ -42,11 +43,14 @@ class SharedSendViaEmail extends Notification
*/
public function toMail($notifiable)
{
$app_name = strval(Setting::where('name', 'app_title')->pluck('value')[0]);
return (new MailMessage)
->subject(__('vuefilemanager.shared_link_email_subject' , ['user' => $this->user->name]))
->greeting(__('vuefilemanager.shared_link_email_greeting'))
->line(__('vuefilemanager.shared_link_email_user', ['user' => $this->user->name, 'email' => $this->user->email]))
->action(__('vuefilemanager.shared_link_email_link'), url('/shared', ['token' => $this->token]));
->action(__('vuefilemanager.shared_link_email_link'), url('/shared', ['token' => $this->token]))
->salutation(__('vuefilemanager.shared_link_email_salutation', ['app_name' => $app_name ? $app_name : 'VueFileManager']));
}
/**