QT/InvoiceShelf
1
0
Fork 0
mirror of https://github.com/InvoiceShelf/InvoiceShelf.git synced 2026-04-07 13:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add "none" as choice for MAIL_ENCRYPTION settings/install that translates to =NULL

Browse Source
This commit is contained in:
Darko Gjorgjijoski
2024-07-21 10:42:00 +02:00
parent 532a044bb9
commit 19bf467068
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/V1/Admin/Settings/MailConfigurationController.php
View File

@@ -50,7 +50,7 @@ class MailConfigurationController extends Controller
'mail_port' => config('mail.port'),
'mail_username' => config('mail.username'),
'mail_password' => config('mail.password'),
'mail_encryption' => config('mail.encryption'),
'mail_encryption' => is_null(config('mail.encryption')) ? 'none' : config('mail.encryption'),
'from_name' => config('mail.from.name'),
'from_mail' => config('mail.from.address'),
'mail_mailgun_endpoint' => config('services.mailgun.endpoint'),

2
app/Space/EnvironmentManager.php
View File

@@ -255,7 +255,7 @@ class EnvironmentManager
'MAIL_PORT' => $request->get('mail_port'),
'MAIL_USERNAME' => $request->get('mail_username'),
'MAIL_PASSWORD' => $request->get('mail_password'),
'MAIL_ENCRYPTION' => $request->get('mail_encryption'),
'MAIL_ENCRYPTION' => $request->get('mail_encryption') !== 'none' ? $request->get('mail_encryption') : 'null',
'MAIL_FROM_ADDRESS' => $request->get('from_mail'),
'MAIL_FROM_NAME' => $request->get('from_name'),
];

2
resources/scripts/admin/views/installation/mail-driver/SmtpMailDriver.vue
View File

@@ -200,7 +200,7 @@ const props = defineProps({
const emit = defineEmits(['submit-data', 'on-change-driver'])
let isShowPassword = ref(false)
const encryptions = reactive(['tls', 'ssl', 'starttls'])
const encryptions = reactive(['none', 'tls', 'ssl', 'starttls'])
const { t } = useI18n()
const mailDriverStore = useMailDriverStore()

2
resources/scripts/admin/views/settings/mail-driver/SmtpMailDriver.vue
View File

@@ -211,7 +211,7 @@ const mailDriverStore = useMailDriverStore()
const { t } = useI18n()
let isShowPassword = ref(false)
const encryptions = reactive(['tls', 'ssl', 'starttls'])
const encryptions = reactive(['none','tls', 'ssl', 'starttls'])
const getInputType = computed(() => {
if (isShowPassword.value) {