From f07afa83073e72e60663360e7333f72a335358d5 Mon Sep 17 00:00:00 2001 From: Sujit Prasad Date: Thu, 4 Aug 2016 19:54:26 +0530 Subject: [PATCH] Update v1.0.7.9 --- .../Admin/helpdesk/AgentController.php | 2 +- .../Agent/helpdesk/TicketController.php | 29 ++++++++++--------- .../Agent/helpdesk/UserController.php | 2 +- .../Api/v1/InstallerApiController.php | 2 +- app/Http/Controllers/Auth/AuthController.php | 3 +- .../Controllers/Auth/PasswordController.php | 2 +- .../Client/helpdesk/GuestController.php | 2 +- .../Client/helpdesk/UnAuthController.php | 2 +- 8 files changed, 23 insertions(+), 21 deletions(-) diff --git a/app/Http/Controllers/Admin/helpdesk/AgentController.php b/app/Http/Controllers/Admin/helpdesk/AgentController.php index 8eae59cd2..4a0922335 100644 --- a/app/Http/Controllers/Admin/helpdesk/AgentController.php +++ b/app/Http/Controllers/Admin/helpdesk/AgentController.php @@ -137,7 +137,7 @@ class AgentController extends Controller // save user credentails if ($user->save() == true) { // fetch user credentails to send mail - $name = $user->user_name; + $name = $user->first_name; $email = $user->email; if($request->input('send_email')) { try { diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 7de06469f..0f67c13a5 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -630,10 +630,8 @@ class TicketController extends Controller { $password = $this->generateRandomString(); // create user $user = new User(); - if ($username == null) { - $username = $emailadd; - } - $user->user_name = $username; + $user->first_name = $username; + $user->user_name = $emailadd; $user->email = $emailadd; $user->password = Hash::make($password); $user->phone_number = $phone; @@ -649,14 +647,14 @@ class TicketController extends Controller { \Event::fire(new \App\Events\ReadMailEvent($user_id, $password)); try { if ($auto_response == 0) { - $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => null, 'scenario' => 'registration-notification'], $template_variables = ['user' => $username, 'email_address' => $emailadd, 'user_password' => $password]); + $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->first_name, 'email' => $emailadd], $message = ['subject' => null, 'scenario' => 'registration-notification'], $template_variables = ['user' => $user->first_name, 'email_address' => $emailadd, 'user_password' => $password]); } } catch (\Exception $e) { } } } else { - $username = $checkemail->user_name; + $username = $checkemail->first_name; $user_id = $checkemail->id; } $ticket_number = $this->check_ticket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $from_data, $status); @@ -688,7 +686,7 @@ class TicketController extends Controller { $body2 = null; try { if ($auto_response == 0) { - $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket'], $template_variables = ['user' => $username, 'ticket_number' => $ticket_number2, 'department_sign' => '']); + $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['name' => $username, 'email' => $emailadd], $message = ['subject' => $updated_subject, 'scenario' => 'create-ticket'], $template_variables = ['user' => $user->first_name, 'ticket_number' => $ticket_number2, 'department_sign' => '']); } } catch (\Exception $e) { @@ -701,11 +699,11 @@ class TicketController extends Controller { if (Alert::first()->ticket_status == 1 || Alert::first()->ticket_admin_email == 1) { // send email to admin $admins = User::where('role', '=', 'admin')->get(); -// $set_mails = ''; + // $set_mails = ''; foreach ($admins as $admin) { $to_email = $admin->email; $to_user = $admin->first_name; - $to_user_name = $admin->first_name . ' ' . $admin->last_name; + $to_user_name = $admin->first_name; $set_mails[] = ['to_email' => $to_email, 'to_user' => $to_user, 'to_user_name' => $to_user_name]; } } @@ -720,7 +718,7 @@ class TicketController extends Controller { if ($department_data->name == $agent->primary_dpt) { $to_email = $agent->email; $to_user = $agent->first_name; - $to_user_name = $agent->first_name . ' ' . $agent->last_name; + $to_user_name = $agent->first_name; $set_mails[] = ['to_email' => $to_email, 'to_user' => $to_user, 'to_user_name' => $to_user_name]; } } @@ -732,7 +730,7 @@ class TicketController extends Controller { $assigned_to = User::where('id', '=', $ticketdata->assigned_to)->first(); $to_email = $assigned_to->email; $to_user = $assigned_to->first_name; - $to_user_name = $assigned_to->first_name . ' ' . $assigned_to->last_name; + $to_user_name = $assigned_to->first_name; $set_mails[] = ['to_email' => $to_email, 'to_user' => $to_user, 'to_user_name' => $to_user_name]; } $emails_to_be_sent = array_unique($set_mails, SORT_REGULAR); @@ -1360,7 +1358,8 @@ class TicketController extends Controller { $email = $email; if ($this->checkEmail($email) == false) { $create_user = new User(); - $create_user->user_name = $name; + $create_user->first_name = $name; + $create_user->user_name = $email; $create_user->email = $email; $create_user->active = 1; $create_user->role = 'user'; @@ -1562,7 +1561,8 @@ class TicketController extends Controller { } else { $company = $this->company(); $user = new User(); - $user->user_name = $name; + $user->first_name = $name; + $user->user_name = $email; $user->email = $email; $password = $this->generateRandomString(); $user->password = \Hash::make($password); @@ -2025,7 +2025,8 @@ class TicketController extends Controller { } else { $company = $this->company(); $user = new User(); - $user->user_name = $name; + $user->first_name = $name; + $user->user_name = $email; $user->email = $email; $password = $this->generateRandomString(); $user->password = \Hash::make($password); diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 7fcc97ac8..346cc4ef3 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -205,7 +205,7 @@ class UserController extends Controller // save user credentails if ($user->save() == true) { // fetch user credentails to send mail - $name = $user->user_name; + $name = $user->first_name; $email = $user->email; if($request->input('send_email')) { try { diff --git a/app/Http/Controllers/Api/v1/InstallerApiController.php b/app/Http/Controllers/Api/v1/InstallerApiController.php index a4d82c4b2..60855d60b 100644 --- a/app/Http/Controllers/Api/v1/InstallerApiController.php +++ b/app/Http/Controllers/Api/v1/InstallerApiController.php @@ -98,7 +98,7 @@ class InstallerApiController extends Controller $ENV['QUEUE_DRIVER'] = 'sync'; $config = ''; - + foreach ($ENV as $key => $val) { $config .= "{$key}={$val}\n"; } diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index fa2012a96..33633b0db 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -91,7 +91,8 @@ class AuthController extends Controller $password = Hash::make($request->input('password')); $user->password = $password; $name = $request->input('full_name'); - $user->user_name = $name; + $user->first_name = $name; + $user->user_name = $request->input('email'); $user->email = $request->input('email'); $user->role = 'user'; diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index 0d3b75cb2..436f5a4df 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -67,7 +67,7 @@ class PasswordController extends Controller } else { $create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]); } - $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->user_name, 'email' => $user->email], $message = ['subject' => 'Your Password Reset Link', 'scenario' => 'reset-password'], $template_variables = ['user' => $user->user_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/'.$code)]); + $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $user->user_name, 'email' => $user->email], $message = ['subject' => 'Your Password Reset Link', 'scenario' => 'reset-password'], $template_variables = ['user' => $user->first_name, 'email_address' => $user->email, 'password_reset_link' => url('password/reset/'.$code)]); return redirect()->back()->with('status', Lang::get('lang.we_have_e-mailed_your_password_reset_link')); } else { diff --git a/app/Http/Controllers/Client/helpdesk/GuestController.php b/app/Http/Controllers/Client/helpdesk/GuestController.php index 47dde9b41..d9b274861 100644 --- a/app/Http/Controllers/Client/helpdesk/GuestController.php +++ b/app/Http/Controllers/Client/helpdesk/GuestController.php @@ -288,7 +288,7 @@ class GuestController extends Controller $userId = $ticket->user_id; $user = User::where('id', '=', $userId)->first(); if ($user->role == 'user') { - $username = $user->user_name; + $username = $user->first_name; } else { $username = $user->first_name.' '.$user->last_name; } diff --git a/app/Http/Controllers/Client/helpdesk/UnAuthController.php b/app/Http/Controllers/Client/helpdesk/UnAuthController.php index 6d297229c..296f3fd82 100644 --- a/app/Http/Controllers/Client/helpdesk/UnAuthController.php +++ b/app/Http/Controllers/Client/helpdesk/UnAuthController.php @@ -75,7 +75,7 @@ class UnAuthController extends Controller } if ($ticket->user_id == $user_details->id) { if ($user_details->role == 'user') { - $username = $user_details->user_name; + $username = $user_details->first_name; } else { $username = $user_details->first_name.' '.$user_details->last_name; }