cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed email setup

Browse Source
This commit is contained in:
Manish Verma
2018-08-10 16:56:21 +05:30
parent c6ccd219de
commit fb4d4a5363
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Admin/helpdesk/EmailsController.php
View File

@@ -253,10 +253,10 @@ class EmailsController extends Controller
$this->emailService($driver, $service_request);
$this->setMailConfig($driver, $address, $name, $username, $password, $enc, $host, $port);
$transport = \Swift_SmtpTransport::newInstance($host, $port, $enc);
$transport = (new \Swift_SmtpTransport($host, $port, $enc));
$transport->setUsername($username);
$transport->setPassword($password);
$mailer = \Swift_Mailer::newInstance($transport);
$mailer = (new \Swift_Mailer($transport));
$mailer->getTransport()->start();
return 1;
@@ -459,10 +459,13 @@ class EmailsController extends Controller
$service = $request->input('fetching_protocol');
$encryption = $request->input('fetching_encryption');
$validate = $request->input('imap_validate');
$username = $request->input('user_name');
$username = $request->input('email_address');
$password = $request->input('password');
$server = new Fetch($host, $port, $service);
//$server->setFlag('novalidate-cert');
if ($request->filled('user_name')) {
$username = $request->input('user_name');
}
if ($encryption != '') {
$server->setFlag($encryption);
}

12
resources/views/themes/default1/admin/helpdesk/emails/emails/create.blade.php
View File

@@ -45,19 +45,25 @@ class="active"
<div class="box-body">
<div class="row">
<!-- email address -->
<div class="col-xs-4 form-group {!! $errors->has('email_address') ? 'has-error' : '' !!}" id = "email_address_error">
<div class="col-xs-6 form-group {!! $errors->has('email_address') ? 'has-error' : '' !!}" id = "email_address_error">
{!! Form::label('email_address',Lang::get('lang.email_address')) !!} <span class="text-red"> *</span>
{!! $errors->first('email_address', '<spam class="help-block">:message</spam>') !!}
{!! Form::text('email_address',null,['class' => 'form-control', 'id' => 'email_address']) !!}
</div>
<!-- user name -->
<div class="col-xs-6 form-group {{ $errors->has('user_name') ? 'has-error' : '' }}" id="user_name_error">
{!! Form::label('user_name',Lang::get('lang.user_name')) !!}
{!! $errors->first('user_name', '<spam class="help-block">:message</spam>') !!}
{!! Form::text('user_name',null,['class' => 'form-control']) !!}
</div>
<!-- Email name -->
<div class="col-xs-4 form-group {!! $errors->has('email_name') ? 'has-error' : ''!!}" id="email_name_error">
<div class="col-xs-6 form-group {!! $errors->has('email_name') ? 'has-error' : ''!!}" id="email_name_error">
{!! Form::label('email_name',Lang::get('lang.from_name')) !!} <span class="text-red"> *</span>
{!! $errors->first('email_name', '<spam class="help-block">:message</spam>') !!}
{!! Form::text('email_name',null,['class' => 'form-control', 'id' => 'email_name']) !!}
</div>
<!-- password -->
<div class="col-xs-4 form-group {!! $errors->has('password') ? 'has-error' : ''!!}" id="password_error">
<div class="col-xs-6 form-group {!! $errors->has('password') ? 'has-error' : ''!!}" id="password_error">
{!! Form::label('password',Lang::get('lang.password')) !!} <span class="text-red"> *</span>
{!! $errors->first('password', '<spam class="help-block">:message</spam>') !!}
{!! Form::password('password',['class' => 'form-control', 'id' => 'password']) !!}

2
resources/views/themes/default1/admin/helpdesk/emails/emails/edit.blade.php
View File

@@ -53,7 +53,7 @@ class="active"
</div>
<!-- user name -->
<div class="col-xs-6 form-group {{ $errors->has('user_name') ? 'has-error' : '' }}" id="user_name_error">
{!! Form::label('user_name',Lang::get('lang.user_name')) !!} <span class="text-red"> *</span>
{!! Form::label('user_name',Lang::get('lang.user_name')) !!}
{!! $errors->first('user_name', '<spam class="help-block">:message</spam>') !!}
{!! Form::text('user_name',null,['class' => 'form-control']) !!}
</div>