merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2689 from rahulshukla-webkul/development 

Issue #2637 fixed
This commit is contained in:
Jitendra Singh 2020-03-18 17:32:08 +05:30 committed by GitHub
parent 001262e6de a0f17a1866
commit 18c790b232
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/installer/Email.php
View File

@ -21,6 +21,7 @@
<select name="mail_encryption" class="control">
<option value="ssl">SSL</option>
<option value="tls">TLS</option>
<option value="">None</option>
</select>
</div>

3
public/installer/EmailConfig.php
View File

@ -27,6 +27,9 @@ $data = array();
if (empty($_POST['mail_username']))
$errors['mail_username'] = 'Please enter your email address or username.';
if (preg_match('/\s/', $_POST['mail_username']))
$errors['mail_username'] = 'There should be no space in Username.';
if (empty($_POST['mail_password']))
$errors['mail_password'] = 'Please enter the password for this email address.';

5
resources/views/vendor/notifications/email.blade.php vendored
View File

@ -52,13 +52,12 @@
@slot('subcopy')
@lang(
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\n".
'into your web browser: [:displayableActionUrl](:actionURL)',
'into your web browser: [:actionURL](:actionURL)',
[
'actionText' => $actionText,
'actionURL' => $actionUrl,
'displayableActionUrl' => $displayableActionUrl,
]
)
@endslot
@endisset
@endcomponent
@endcomponent