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

Merge branch 'master' into language-suggestions

Browse Source
This commit is contained in:
Manish Verma
2018-08-06 12:43:31 +05:30
committed by GitHub
parent d0fa55e426 188add3afe
commit faf28b8bf0
18 changed files with 1824 additions and 1366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@ class EmailsController extends Controller
{
//dd($request->all());
try {
$service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode', 'code');
$service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'user_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode', 'code');
$service = $request->input('sending_protocol');
$validate = '/novalidate-cert';
$fetch = 1;
@@ -174,6 +174,7 @@ class EmailsController extends Controller
$email->email_address = $request->email_address;
$email->email_name = $request->email_name;
$email->user_name = $request->user_name;
$email->fetching_host = $request->fetching_host;
$email->fetching_port = $request->fetching_port;
$email->fetching_protocol = $request->fetching_protocol;
@@ -241,16 +242,17 @@ class EmailsController extends Controller
{
$mailservice_id = $request->input('sending_protocol');
$driver = $this->getDriver($mailservice_id);
$username = $request->input('email_address');
$address = $request->input('email_address');
$username = $request->input('user_name');
$password = $request->input('password');
$name = $request->input('email_name');
$host = $request->input('sending_host');
$port = $request->input('sending_port');
$enc = $request->input('sending_encryption');
$service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode');
$service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'user_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode');
$this->emailService($driver, $service_request);
$this->setMailConfig($driver, $username, $name, $password, $enc, $host, $port);
$this->setMailConfig($driver, $address, $name, $username, $password, $enc, $host, $port);
$transport = \Swift_SmtpTransport::newInstance($host, $port, $enc);
$transport->setUsername($username);
$transport->setPassword($password);
@@ -264,30 +266,31 @@ class EmailsController extends Controller
{
$mailservice_id = $request->input('sending_protocol');
$driver = $this->getDriver($mailservice_id);
$username = $request->input('email_address');
$address = $request->input('email_address');
$username = $request->input('user_name');
$password = $request->input('password');
$name = $request->input('email_name');
$host = $request->input('sending_host');
$port = $request->input('sending_port');
$enc = $request->input('sending_encryption');
$service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode');
$service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'user_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode');
$this->emailService($driver, $service_request);
$this->setMailConfig($driver, $username, $name, $password, $enc, $host, $port);
$this->setMailConfig($driver, $address, $name, $username, $password, $enc, $host, $port);
$controller = new \App\Http\Controllers\Common\PhpMailController();
$subject = 'test';
$data = 'test';
//dd(\Config::get('mail'),\Config::get('services'));
$send = $controller->laravelMail($username, $name, $subject, $data, [], []);
$send = $controller->laravelMail($address, $name, $subject, $data, [], []);
return $send;
}
public function setMailConfig($driver, $username, $name, $password, $enc, $host, $port)
public function setMailConfig($driver, $address, $name, $username, $password, $enc, $host, $port)
{
$configs = [
'username' => $username,
'from' => ['address' => $username, 'name' => $name],
'from' => ['address' => $address, 'name' => $name],
'password' => $password,
'encryption' => $enc,
'host' => $host,
@@ -456,7 +459,7 @@ class EmailsController extends Controller
$service = $request->input('fetching_protocol');
$encryption = $request->input('fetching_encryption');
$validate = $request->input('imap_validate');
$username = $request->input('email_address');
$username = $request->input('user_name');
$password = $request->input('password');
$server = new Fetch($host, $port, $service);
//$server->setFlag('novalidate-cert');
@@ -510,7 +513,7 @@ class EmailsController extends Controller
$mail->isSMTP();
$mail->Host = $request->input('sending_host'); // Specify main and backup SMTP servers
//$mail->SMTPAuth = true; // Enable SMTP authentication
$mail->Username = $request->input('email_address'); // SMTP username
$mail->Username = $request->input('user_name'); // SMTP username
$mail->Password = $request->input('password'); // SMTP password
$mail->SMTPSecure = $request->input('sending_encryption'); // Enable TLS encryption, `ssl` also accepted
$mail->Port = $request->input('sending_port'); // TCP port to connect to

2
app/Http/Controllers/Api/v1/TokenAuthController.php
View File

@@ -172,7 +172,7 @@ class TokenAuthController extends Controller
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) {
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
// $password_reset_table->token = $code;
// $password_reset_table->token = $code;
// $password_reset_table->update(['token' => $code]);
} else {
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);

2
app/Http/Controllers/Auth/PasswordController.php
View File

@@ -62,7 +62,7 @@ class PasswordController extends Controller
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) {
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
// $password_reset_table->token = $code;
// $password_reset_table->token = $code;
// $password_reset_table->update(['token' => $code]);
} else {
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);

2
app/Http/Controllers/Client/helpdesk/UnAuthController.php
View File

@@ -339,7 +339,7 @@ class UnAuthController extends Controller
// app()->setLocale($lang);
\Cache::forever('language', $lang);
// dd(Cache::get('language'));
// dd(Cache::get('language'));
// dd()
} else {
return false;

2
app/Http/Middleware/CheckRoleAgent.php
View File

@@ -25,6 +25,6 @@ class CheckRoleAgent
return $next($request);
}
return redirect('dashboard')->with('fails', 'You are not Autherised');
return redirect('dashboard')->with('fails', 'You are not Authorised');
}
}

4
app/Http/Requests/helpdesk/EmailsEditRequest.php
View File

@@ -35,8 +35,8 @@ class EmailsEditRequest extends Request
// 'priority' => 'required',
// 'help_topic' => 'required',
// 'imap_config' => 'required',
'password' => 'required|min:6',
// 'user_name' => 'required',
'password' => 'required|min:6',
'user_name' => 'required',
// 'sending_host' => 'required',
// 'sending_port' => 'required',
//'mailbox_protocol' => 'required'