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

api updates

Browse Source
This commit is contained in:
Vijay Sebastian
2017-07-27 16:38:21 +05:30
parent ee200fc18b
commit b0b5bd8637
7 changed files with 1363 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/Http/Controllers/Agent/helpdesk/TicketController.php
View File

@@ -284,29 +284,34 @@ class TicketController extends Controller
if ($result[1]) { if ($result[1]) {
$status = $this->checkUserVerificationStatus(); $status = $this->checkUserVerificationStatus();
if ($status == 1) { if ($status == 1) {
if ($api != false) { if ($api != false)
return Lang::get('lang.Ticket-created-successfully'); {
$ticket = Tickets::where('ticket_number', '=', $result[0])->select('id')->first();
return ['ticket_id' => $ticket->id, 'message' => Lang::get('lang.Ticket-created-successfully')];
} }
return Redirect('newticket')->with('success', Lang::get('lang.Ticket-created-successfully')); return Redirect('newticket')->with('success', Lang::get('lang.Ticket-created-successfully'));
} else { } else {
if ($api != false) { if ($api != false)
return Lang::get('lang.Ticket-created-successfully'); {
return response()->json(['success' => Lang::get('lang.Ticket-created-successfully')]);
} }
return Redirect('newticket')->with('success', Lang::get('lang.Ticket-created-successfully2')); return Redirect('newticket')->with('success', Lang::get('lang.Ticket-created-successfully2'));
} }
} else { } else {
if ($api != false) { if ($api != false)
return Lang::get('lang.failed-to-create-user-tcket-as-mobile-has-been-taken'); {
return response()->json(['error' => Lang::get('lang.failed-to-create-user-tcket-as-mobile-has-been-taken')], 500);
} }
return Redirect('newticket')->with('fails', Lang::get('lang.failed-to-create-user-tcket-as-mobile-has-been-taken'))->withInput($request->except('password')); return Redirect('newticket')->with('fails', Lang::get('lang.failed-to-create-user-tcket-as-mobile-has-been-taken'))->withInput($request->except('password'));
} }
} catch (Exception $e) { } catch (Exception $e) {
// dd($e); dd($e);
if ($api != false) { if ($api != false)
return $e->getMessage(); {
return response()->json(['error' => $e->getMessage()], 500);
} }
return Redirect()->back()->with('fails', '<li>'.$e->getMessage().'</li>'); return Redirect()->back()->with('fails', '<li>'.$e->getMessage().'</li>');
@@ -879,7 +884,7 @@ class TicketController extends Controller
} }
$set_mails = []; $set_mails = [];
if (Alert::first()->ticket_status == 1 || Alert::first()->ticket_admin_email == 1) { if (Alert::first() && (Alert::first()->ticket_status == 1 || Alert::first()->ticket_admin_email == 1)) {
// send email to admin // send email to admin
$admins = User::where('role', '=', 'admin')->get(); $admins = User::where('role', '=', 'admin')->get();
foreach ($admins as $admin) { foreach ($admins as $admin) {
@@ -891,7 +896,7 @@ class TicketController extends Controller
} }
if ($is_reply == 0) { if ($is_reply == 0) {
if (Alert::first()->ticket_status == 1 || Alert::first()->ticket_department_member == 1) { if (Alert::first() && (Alert::first()->ticket_status == 1 || Alert::first()->ticket_department_member == 1)) {
// send email to agents // send email to agents
$agents = User::where('role', '=', 'agent')->get(); $agents = User::where('role', '=', 'agent')->get();
foreach ($agents as $agent) { foreach ($agents as $agent) {

763
app/Http/Controllers/Api/v1/ApiController.php
View File

File diff suppressed because it is too large Load Diff

331
app/Http/Controllers/Api/v1/TicketController.php
View File

@@ -32,6 +32,7 @@ use Mail;
*/ */
class TicketController extends Controller class TicketController extends Controller
{ {
/** /**
* Create a new controller instance. * Create a new controller instance.
* *
@@ -57,14 +58,19 @@ class TicketController extends Controller
*/ */
public function createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $attach = '') public function createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $attach = '')
{ {
try { try
{
//return $headers; //return $headers;
$max_number = Tickets::whereRaw('id = (select max(`id`) from tickets)')->first(); $max_number = Tickets::whereRaw('id = (select max(`id`) from tickets)')->first();
//dd($max_number); //dd($max_number);
if ($max_number == null) { if ($max_number == null)
{
$ticket_number = 'AAAA-9999-9999999'; $ticket_number = 'AAAA-9999-9999999';
} else { }
foreach ($max_number as $number) { else
{
foreach ($max_number as $number)
{
$ticket_number = $max_number->ticket_number; $ticket_number = $max_number->ticket_number;
} }
} }
@@ -83,12 +89,16 @@ class TicketController extends Controller
//dd($ticket); //dd($ticket);
$ticket_number = $ticket->ticket_number; $ticket_number = $ticket->ticket_number;
$id = $ticket->id; $id = $ticket->id;
if ($form_data != null) { if ($form_data != null)
{
$help_topic = Help_topic::where('id', '=', $helptopic)->first(); $help_topic = Help_topic::where('id', '=', $helptopic)->first();
$forms = Fields::where('forms_id', '=', $help_topic->custom_form)->get(); $forms = Fields::where('forms_id', '=', $help_topic->custom_form)->get();
foreach ($form_data as $key => $form_details) { foreach ($form_data as $key => $form_details)
foreach ($forms as $from) { {
if ($from->name == $key) { foreach ($forms as $from)
{
if ($from->name == $key)
{
$form_value = new Ticket_Form_Data(); $form_value = new Ticket_Form_Data();
$form_value->ticket_id = $id; $form_value->ticket_id = $id;
$form_value->title = $from->label; $form_value->title = $from->label;
@@ -102,12 +112,15 @@ class TicketController extends Controller
$this->storeCollaborators($headers, $id); $this->storeCollaborators($headers, $id);
$thread = $this->ticketThread($subject, $body, $id, $user_id); $thread = $this->ticketThread($subject, $body, $id, $user_id);
if (!empty($attach)) { if (!empty($attach))
{
$this->attach($thread, $attach); $this->attach($thread, $attach);
} }
return $thread; return $thread;
} catch (\Exception $e) { }
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -121,14 +134,18 @@ class TicketController extends Controller
*/ */
public function storeCollaborators($headers, $id) public function storeCollaborators($headers, $id)
{ {
try { try
{
//return $headers; //return $headers;
$company = $this->company(); $company = $this->company();
if (isset($headers)) { if (isset($headers))
foreach ($headers as $email) { {
foreach ($headers as $email)
{
$name = $email; $name = $email;
$email = $email; $email = $email;
if ($this->checkEmail($email) == false) { if ($this->checkEmail($email) == false)
{
$create_user = new User(); $create_user = new User();
$create_user->user_name = $name; $create_user->user_name = $name;
$create_user->email = $email; $create_user->email = $email;
@@ -143,7 +160,9 @@ class TicketController extends Controller
// }); // });
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]); $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $email], $message = ['subject' => 'password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $name, 'email_address' => $email, 'user_password' => $password]);
} else { }
else
{
$user = $this->checkEmail($email); $user = $this->checkEmail($email);
$user_id = $user->id; $user_id = $user->id;
} }
@@ -158,7 +177,9 @@ class TicketController extends Controller
} }
return true; return true;
} catch (\Exception $e) { }
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -175,7 +196,8 @@ class TicketController extends Controller
*/ */
public function ticketThread($subject, $body, $id, $user_id) public function ticketThread($subject, $body, $id, $user_id)
{ {
try { try
{
$thread = new Ticket_Thread(); $thread = new Ticket_Thread();
$thread->user_id = $user_id; $thread->user_id = $user_id;
$thread->ticket_id = $id; $thread->ticket_id = $id;
@@ -185,7 +207,9 @@ class TicketController extends Controller
$thread->save(); $thread->save();
return $thread->id; return $thread->id;
} catch (\Exception $e) { }
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -199,20 +223,24 @@ class TicketController extends Controller
*/ */
public function ticketNumber($ticket_number) public function ticketNumber($ticket_number)
{ {
try { try
{
//dd($ticket_number); //dd($ticket_number);
$number = $ticket_number; $number = $ticket_number;
$number = explode('-', $number); $number = explode('-', $number);
$number1 = $number[0]; $number1 = $number[0];
if ($number1 == 'ZZZZ') { if ($number1 == 'ZZZZ')
{
$number1 = 'AAAA'; $number1 = 'AAAA';
} }
$number2 = $number[1]; $number2 = $number[1];
if ($number2 == '9999') { if ($number2 == '9999')
{
$number2 = '0000'; $number2 = '0000';
} }
$number3 = $number[2]; $number3 = $number[2];
if ($number3 == '9999999') { if ($number3 == '9999999')
{
$number3 = '0000000'; $number3 = '0000000';
} }
$number1++; $number1++;
@@ -224,7 +252,9 @@ class TicketController extends Controller
$number = implode('-', $array); $number = implode('-', $array);
return $number; return $number;
} catch (\Exception $e) { }
catch (\Exception $e)
{
dd($e); dd($e);
return $e->getMessage(); return $e->getMessage();
@@ -240,16 +270,20 @@ class TicketController extends Controller
*/ */
public function generateRandomString($length = 10) public function generateRandomString($length = 10)
{ {
try { try
{
$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'; $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
$charactersLength = strlen($characters); $charactersLength = strlen($characters);
$randomString = ''; $randomString = '';
for ($i = 0; $i < $length; $i++) { for ($i = 0; $i < $length; $i++)
{
$randomString .= $characters[rand(0, $charactersLength - 1)]; $randomString .= $characters[rand(0, $charactersLength - 1)];
} }
return $randomString; return $randomString;
} catch (\Exception $e) { }
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -264,7 +298,8 @@ class TicketController extends Controller
*/ */
public function reply($thread, $request, $ta, $attach = '') public function reply($thread, $request, $ta, $attach = '')
{ {
try { try
{
$check_attachment = null; $check_attachment = null;
$eventthread = $thread->where('ticket_id', $request->input('ticket_ID'))->first(); $eventthread = $thread->where('ticket_id', $request->input('ticket_ID'))->first();
//dd($request->input('ticket_ID')); //dd($request->input('ticket_ID'));
@@ -289,24 +324,27 @@ class TicketController extends Controller
$ticket_user = User::where('id', '=', $tickets->user_id)->first(); $ticket_user = User::where('id', '=', $tickets->user_id)->first();
if ($tickets->assigned_to == 0) { if ($tickets->assigned_to == 0)
{
$tickets->assigned_to = Auth::user()->id; $tickets->assigned_to = Auth::user()->id;
$tickets->save(); $tickets->save();
$thread2 = new Ticket_Thread(); $thread2 = new Ticket_Thread();
$thread2->ticket_id = $thread->ticket_id; $thread2->ticket_id = $thread->ticket_id;
$thread2->user_id = Auth::user()->id; $thread2->user_id = Auth::user()->id;
$thread2->is_internal = 1; $thread2->is_internal = 1;
$thread2->body = 'This Ticket have been assigned to '.Auth::user()->first_name.' '.Auth::user()->last_name; $thread2->body = 'This Ticket have been assigned to ' . Auth::user()->first_name . ' ' . Auth::user()->last_name;
$thread2->save(); $thread2->save();
} }
if ($tickets->status > 1) { if ($tickets->status > 1)
{
$tickets->status = '1'; $tickets->status = '1';
$tickets->isanswered = '1'; $tickets->isanswered = '1';
$tickets->save(); $tickets->save();
} }
$thread->save(); $thread->save();
if (!empty($attach)) { if (!empty($attach))
{
$check_attachment = $this->attach($thread->id, $attach); $check_attachment = $this->attach($thread->id, $attach);
} }
@@ -319,9 +357,12 @@ class TicketController extends Controller
$ticket_number = $tickets->ticket_number; $ticket_number = $tickets->ticket_number;
$company = $this->company(); $company = $this->company();
$username = $ticket_user->user_name; $username = $ticket_user->user_name;
if (!empty(Auth::user()->agent_sign)) { if (!empty(Auth::user()->agent_sign))
{
$agentsign = Auth::user()->agent_sign; $agentsign = Auth::user()->agent_sign;
} else { }
else
{
$agentsign = null; $agentsign = null;
} }
\Event::fire(new \App\Events\FaveoAfterReply($reply_content, $user->phone_number, $request, $tickets)); \Event::fire(new \App\Events\FaveoAfterReply($reply_content, $user->phone_number, $request, $tickets));
@@ -341,23 +382,30 @@ class TicketController extends Controller
* Getting the subject of the thread * Getting the subject of the thread
*/ */
//dd($eventthread); //dd($eventthread);
try { try
{
$re = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $tickets->dept_id), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => $eventthread->title, 'scenario' => 'create-ticket-by-agent', 'body' => $thread->body], $template_variables = ['agent_sign' => Auth::user()->agent_sign, 'ticket_number' => $tickets->number]); $re = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $tickets->dept_id), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => $eventthread->title, 'scenario' => 'create-ticket-by-agent', 'body' => $thread->body], $template_variables = ['agent_sign' => Auth::user()->agent_sign, 'ticket_number' => $tickets->number]);
//dd($re); //dd($re);
} catch (\Exception $e) { }
throw new \Exception($e->getMessage()); catch (\Exception $e)
{
//throw new \Exception($e->getMessage());
} }
$collaborators = Ticket_Collaborator::where('ticket_id', '=', $ticket_id)->get(); $collaborators = Ticket_Collaborator::where('ticket_id', '=', $ticket_id)->get();
foreach ($collaborators as $collaborator) { foreach ($collaborators as $collaborator)
{
//mail to collaborators //mail to collaborators
$collab_user_id = $collaborator->user_id; $collab_user_id = $collaborator->user_id;
$user_id_collab = User::where('id', '=', $collab_user_id)->first(); $user_id_collab = User::where('id', '=', $collab_user_id)->first();
$collab_email = $user_id_collab->email; $collab_email = $user_id_collab->email;
if ($user_id_collab->role == 'user') { if ($user_id_collab->role == 'user')
{
$collab_user_name = $user_id_collab->user_name; $collab_user_name = $user_id_collab->user_name;
} else { }
$collab_user_name = $user_id_collab->first_name.' '.$user_id_collab->last_name; else
{
$collab_user_name = $user_id_collab->first_name . ' ' . $user_id_collab->last_name;
} }
// Mail::send('emails.ticket_re-reply', ['content' => $reply_content, 'ticket_number' => $ticket_number, 'From' => $company, 'name' => $collab_user_name, 'Agent_Signature' => $agentsign], function ($message) use ($collab_email, $collab_user_name, $ticket_number, $ticket_subject, $check_attachment) { // Mail::send('emails.ticket_re-reply', ['content' => $reply_content, 'ticket_number' => $ticket_number, 'From' => $company, 'name' => $collab_user_name, 'Agent_Signature' => $agentsign], function ($message) use ($collab_email, $collab_user_name, $ticket_number, $ticket_subject, $check_attachment) {
// $message->to($collab_email, $collab_user_name)->subject($ticket_subject . '[#' . $ticket_number . ']'); // $message->to($collab_email, $collab_user_name)->subject($ticket_subject . '[#' . $ticket_number . ']');
@@ -369,14 +417,20 @@ class TicketController extends Controller
// // } // // }
// }, true); // }, true);
try { try
{
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['user' => $admin_user, 'email' => $admin_email], $message = ['subject' => $updated_subject, 'body' => $body, 'scenario' => $mail], $template_variables = ['ticket_agent_name' => $admin_user, 'ticket_client_name' => $username, 'ticket_client_email' => $emailadd, 'user' => $admin_user, 'ticket_number' => $ticket_number2, 'email_address' => $emailadd, 'name' => $ticket_creator]); $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticketdata->dept_id), $to = ['user' => $admin_user, 'email' => $admin_email], $message = ['subject' => $updated_subject, 'body' => $body, 'scenario' => $mail], $template_variables = ['ticket_agent_name' => $admin_user, 'ticket_client_name' => $username, 'ticket_client_email' => $emailadd, 'user' => $admin_user, 'ticket_number' => $ticket_number2, 'email_address' => $emailadd, 'name' => $ticket_creator]);
} catch (\Exception $e) { }
catch (\Exception $e)
{
} }
} }
return $thread; return $thread;
} catch (\Exception $e) { }
catch (\Exception $e)
{
//dd($e); //dd($e);
return $e->getMessage(); return $e->getMessage();
} }
@@ -389,16 +443,22 @@ class TicketController extends Controller
*/ */
public function company() public function company()
{ {
try { try
{
$company = Company::Where('id', '=', '1')->first(); $company = Company::Where('id', '=', '1')->first();
if ($company->company_name == null) { if ($company->company_name == null)
{
$company = 'Support Center'; $company = 'Support Center';
} else { }
else
{
$company = $company->company_name; $company = $company->company_name;
} }
return $company; return $company;
} catch (\Exception $e) { }
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -413,7 +473,8 @@ class TicketController extends Controller
*/ */
public function ticketEditPost($ticket_id, $thread, $ticket) public function ticketEditPost($ticket_id, $thread, $ticket)
{ {
try { try
{
$ticket = $ticket->where('id', '=', $ticket_id)->first(); $ticket = $ticket->where('id', '=', $ticket_id)->first();
$ticket->sla = Input::get('sla_plan'); $ticket->sla = Input::get('sla_plan');
@@ -426,11 +487,14 @@ class TicketController extends Controller
$threads = $thread->where('ticket_id', '=', $ticket_id)->first(); $threads = $thread->where('ticket_id', '=', $ticket_id)->first();
$threads->title = Input::get('subject'); $threads->title = Input::get('subject');
$threads->save(); $threads->save();
return $threads;
} catch (\Exception $e) {
return $e->getMessage();
} }
catch (\Exception $ex)
{
$result = $ex->getMessage();
return response()->json(compact('result'), 500);
}
$result = ["success" => "Edited successfully"];
return response()->json(compact('result'));
} }
/** /**
@@ -442,24 +506,28 @@ class TicketController extends Controller
*/ */
public function assign($id) public function assign($id)
{ {
try { try
{
$UserEmail = Input::get('user'); $UserEmail = Input::get('user');
//dd($UserEmail); //dd($UserEmail);
// $UserEmail = 'sujitprasad12@yahoo.in'; // $UserEmail = 'sujitprasad12@yahoo.in';
$user = User::where('email', '=', $UserEmail)->first(); $user = User::where('email', '=', $UserEmail)->first();
if (!$user) { if (!$user)
{
return ['error' => 'No agent not found']; return ['error' => 'No agent not found'];
} }
$user_id = $user->id; $user_id = $user->id;
$ticket = Tickets::where('id', '=', $id)->first(); $ticket = Tickets::where('id', '=', $id)->first();
if (!$ticket) { if (!$ticket)
{
return ['error' => 'No ticket not found']; return ['error' => 'No ticket not found'];
} }
$ticket_number = $ticket->ticket_number; $ticket_number = $ticket->ticket_number;
$ticket->assigned_to = $user_id; $ticket->assigned_to = $user_id;
$ticket->save(); $ticket->save();
$ticket_thread = Ticket_Thread::where('ticket_id', '=', $id)->first(); $ticket_thread = Ticket_Thread::where('ticket_id', '=', $id)->first();
if (!$ticket_thread) { if (!$ticket_thread)
{
return ['error' => 'No thread not found']; return ['error' => 'No thread not found'];
} }
$ticket_subject = $ticket_thread->title; $ticket_subject = $ticket_thread->title;
@@ -467,7 +535,7 @@ class TicketController extends Controller
$thread->ticket_id = $ticket->id; $thread->ticket_id = $ticket->id;
$thread->user_id = Auth::user()->id; $thread->user_id = Auth::user()->id;
$thread->is_internal = 1; $thread->is_internal = 1;
$thread->body = 'This Ticket has been assigned to '.$user->first_name.' '.$user->last_name; $thread->body = 'This Ticket has been assigned to ' . $user->first_name . ' ' . $user->last_name;
$thread->save(); $thread->save();
$company = $this->company(); $company = $this->company();
@@ -476,22 +544,28 @@ class TicketController extends Controller
$agent = $user->first_name; $agent = $user->first_name;
$agent_email = $user->email; $agent_email = $user->email;
$master = Auth::user()->first_name.' '.Auth::user()->last_name; $master = Auth::user()->first_name . ' ' . Auth::user()->last_name;
if (Alert::first()->internal_status == 1 || Alert::first()->internal_assigned_agent == 1) { if (Alert::first()->internal_status == 1 || Alert::first()->internal_assigned_agent == 1)
{
// // ticket assigned send mail // // ticket assigned send mail
// Mail::send('emails.Ticket_assign', ['agent' => $agent, 'ticket_number' => $ticket_number, 'from' => $company, 'master' => $master, 'system' => $system], function ($message) use ($agent_email, $agent, $ticket_number, $ticket_subject) { // Mail::send('emails.Ticket_assign', ['agent' => $agent, 'ticket_number' => $ticket_number, 'from' => $company, 'master' => $master, 'system' => $system], function ($message) use ($agent_email, $agent, $ticket_number, $ticket_subject) {
// $message->to($agent_email, $agent)->subject($ticket_subject . '[#' . $ticket_number . ']'); // $message->to($agent_email, $agent)->subject($ticket_subject . '[#' . $ticket_number . ']');
// }); // });
try { try
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket->dept_id), $to = ['name' => $agent, 'email' => $agent_email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'assign-ticket'], $template_variables = ['ticket_agent_name' => $agent, 'ticket_number' => $ticket_number, 'ticket_assigner' => $master]); {
} catch (\Exception $e) { $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket->dept_id), $to = ['name' => $agent, 'email' => $agent_email], $message = ['subject' => $ticket_subject . '[#' . $ticket_number . ']', 'scenario' => 'assign-ticket'], $template_variables = ['ticket_agent_name' => $agent, 'ticket_number' => $ticket_number, 'ticket_assigner' => $master]);
}
catch (\Exception $e)
{
return 0; return 0;
} }
} }
return 1; return 1;
} catch (\Exception $e) { }
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -506,29 +580,41 @@ class TicketController extends Controller
*/ */
public function delete($ids, $ticket) public function delete($ids, $ticket)
{ {
try { try
foreach ($ids as $id) { {
foreach ($ids as $id)
{
$ticket_delete = $ticket->where('id', '=', $id)->first(); $ticket_delete = $ticket->where('id', '=', $id)->first();
if ($ticket_delete) { if ($ticket_delete)
if ($ticket_delete->status == 5) { {
if ($ticket_delete->status == 5)
{
$ticket_delete->delete(); $ticket_delete->delete();
$ticket_threads = Ticket_Thread::where('ticket_id', '=', $id)->get(); $ticket_threads = Ticket_Thread::where('ticket_id', '=', $id)->get();
if ($ticket_threads) { if ($ticket_threads)
foreach ($ticket_threads as $ticket_thread) { {
if ($ticket_thread) { foreach ($ticket_threads as $ticket_thread)
{
if ($ticket_thread)
{
$ticket_thread->delete(); $ticket_thread->delete();
} }
} }
} }
$ticket_attachments = Ticket_attachments::where('thread_id', '=', $id)->get(); $ticket_attachments = Ticket_attachments::where('thread_id', '=', $id)->get();
if ($ticket_attachments) { if ($ticket_attachments)
foreach ($ticket_attachments as $ticket_attachment) { {
if ($ticket_attachment) { foreach ($ticket_attachments as $ticket_attachment)
{
if ($ticket_attachment)
{
$ticket_attachment->delete(); $ticket_attachment->delete();
} }
} }
} }
} else { }
else
{
$ticket_delete->is_deleted = 0; $ticket_delete->is_deleted = 0;
$ticket_delete->status = 5; $ticket_delete->status = 5;
$ticket_delete->save(); $ticket_delete->save();
@@ -537,16 +623,20 @@ class TicketController extends Controller
$thread->ticket_id = $ticket_delete->id; $thread->ticket_id = $ticket_delete->id;
$thread->user_id = Auth::user()->id; $thread->user_id = Auth::user()->id;
$thread->is_internal = 1; $thread->is_internal = 1;
$thread->body = $ticket_status_message->message.' '.Auth::user()->first_name.' '.Auth::user()->last_name; $thread->body = $ticket_status_message->message . ' ' . Auth::user()->first_name . ' ' . Auth::user()->last_name;
$thread->save(); $thread->save();
} }
} else { }
else
{
return 'ticket not found'; return 'ticket not found';
} }
} }
return 'your tickets has been deleted'; return 'your tickets has been deleted';
} catch (\Exception $e) { }
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -560,14 +650,20 @@ class TicketController extends Controller
*/ */
public function checkEmail($email) public function checkEmail($email)
{ {
try { try
{
$check = User::where('email', '=', $email)->first(); $check = User::where('email', '=', $email)->first();
if ($check) { if ($check)
{
return $check; return $check;
} else { }
else
{
return false; return false;
} }
} catch (\Exception $e) { }
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -579,16 +675,22 @@ class TicketController extends Controller
*/ */
public function system() public function system()
{ {
try { try
{
$system = System::Where('id', '=', '1')->first(); $system = System::Where('id', '=', '1')->first();
if ($system->name == null) { if ($system->name == null)
{
$system = 'Support Center'; $system = 'Support Center';
} else { }
else
{
$system = $system->name; $system = $system->name;
} }
return $system; return $system;
} catch (\Exception $e) { }
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -603,15 +705,19 @@ class TicketController extends Controller
*/ */
public function attach($thread, $attach) public function attach($thread, $attach)
{ {
try { try
{
$ta = new Ticket_attachments(); $ta = new Ticket_attachments();
foreach ($attach as $file) { foreach ($attach as $file)
{
$ta->create(['thread_id' => $thread, 'name' => $file['name'], 'size' => $file['size'], 'type' => $file['type'], 'file' => $file['file'], 'poster' => 'ATTACHMENT']); $ta->create(['thread_id' => $thread, 'name' => $file['name'], 'size' => $file['size'], 'type' => $file['type'], 'file' => $file['file'], 'poster' => 'ATTACHMENT']);
} }
$ta->create(['thread_id' => $thread, 'name' => $name, 'size' => $size, 'type' => $type, 'file' => $file, 'poster' => 'ATTACHMENT']); $ta->create(['thread_id' => $thread, 'name' => $name, 'size' => $size, 'type' => $type, 'file' => $file, 'poster' => 'ATTACHMENT']);
return 1; return 1;
} catch (\Exception $e) { }
catch (\Exception $e)
{
return $e->getMessage(); return $e->getMessage();
} }
} }
@@ -624,7 +730,7 @@ class TicketController extends Controller
public function autosearch() public function autosearch()
{ {
$term = \Input::get('term'); $term = \Input::get('term');
$user = \App\User::where('email', 'LIKE', '%'.$term.'%')->orWhere('first_name', 'LIKE', '%'.$term.'%')->orWhere('last_name', 'LIKE', '%'.$term.'%')->orWhere('user_name', 'LIKE', '%'.$term.'%')->lists('email'); $user = \App\User::where('email', 'LIKE', '%' . $term . '%')->orWhere('first_name', 'LIKE', '%' . $term . '%')->orWhere('last_name', 'LIKE', '%' . $term . '%')->orWhere('user_name', 'LIKE', '%' . $term . '%')->lists('email');
return $user; return $user;
} }
@@ -648,7 +754,8 @@ class TicketController extends Controller
$user->password = \Hash::make($password); $user->password = \Hash::make($password);
$user->role = 'user'; $user->role = 'user';
$user->active = 1; $user->active = 1;
if ($user->save()) { if ($user->save())
{
$user_id = $user->id; $user_id = $user->id;
$php_mailer = new PhpMailController(); $php_mailer = new PhpMailController();
$php_mailer->sendmail($from = $php_mailer->mailfrom('1', '0'), $to = ['name' => $email, 'email' => $email], $message = ['subject' => 'Password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $email, 'email_address' => $email, 'user_password' => $password]); $php_mailer->sendmail($from = $php_mailer->mailfrom('1', '0'), $to = ['name' => $email, 'email' => $email], $message = ['subject' => 'Password', 'scenario' => 'registration-notification'], $template_variables = ['user' => $email, 'email_address' => $email, 'user_password' => $password]);
@@ -679,39 +786,50 @@ class TicketController extends Controller
$ticket_collaborator = Ticket_Collaborator::where('ticket_id', '=', $ticketid) $ticket_collaborator = Ticket_Collaborator::where('ticket_id', '=', $ticketid)
->where('user_id', $user->id) ->where('user_id', $user->id)
->first(); ->first();
if ($ticket_collaborator) { if ($ticket_collaborator)
{
$ticket_collaborator->delete(); $ticket_collaborator->delete();
return 'deleted successfully'; return 'deleted successfully';
} else { }
else
{
return 'not found'; return 'not found';
} }
} }
public function getCollaboratorForTicket() public function getCollaboratorForTicket()
{ {
try { try
{
$ticketid = Input::get('ticket_id'); $ticketid = Input::get('ticket_id');
$ticket_collaborator = \DB::table('users') $ticket_collaborator = \DB::table('users')
->join('ticket_collaborator', function ($join) use ($ticketid) { ->join('ticket_collaborator', function ($join) use ($ticketid)
{
$join->on('users.id', '=', 'ticket_collaborator.user_id') $join->on('users.id', '=', 'ticket_collaborator.user_id')
->where('ticket_collaborator.ticket_id', '=', $ticketid); ->where('ticket_collaborator.ticket_id', '=', $ticketid);
}) })
->select('users.email', 'users.user_name') ->select('users.email', 'users.user_name')
->get(); ->get();
if (count($ticket_collaborator) > 0) { if (count($ticket_collaborator) > 0)
foreach ($ticket_collaborator as $key => $collaborator) { {
foreach ($ticket_collaborator as $key => $collaborator)
{
$collab[$key]['email'] = $collaborator->email; $collab[$key]['email'] = $collaborator->email;
$collab[$key]['user_name'] = $collaborator->user_name; $collab[$key]['user_name'] = $collaborator->user_name;
$collab[$key]['avatar'] = $this->avatarUrl($collaborator->email); $collab[$key]['avatar'] = $this->avatarUrl($collaborator->email);
} }
} else { }
else
{
$collab = $ticket_collaborator; $collab = $ticket_collaborator;
} }
return $collab; return $collab;
} catch (\Exception $ex) { }
catch (\Exception $ex)
{
return $ex->getMessage(); return $ex->getMessage();
throw new \Exception('get collaborator for ticket fails'); throw new \Exception('get collaborator for ticket fails');
} }
@@ -719,19 +837,26 @@ class TicketController extends Controller
public function avatarUrl($email) public function avatarUrl($email)
{ {
try { try
{
$user = new User(); $user = new User();
$user = $user->where('email', $email)->first(); $user = $user->where('email', $email)->first();
if ($user->profile_pic) { if ($user->profile_pic)
$url = url('uploads/profilepic/'.$user->profile_pic); {
} else { $url = url('uploads/profilepic/' . $user->profile_pic);
}
else
{
$url = \Gravatar::src($email); $url = \Gravatar::src($email);
} }
return $url; return $url;
} catch (\Exception $ex) { }
catch (\Exception $ex)
{
//return $ex->getMessage(); //return $ex->getMessage();
throw new \Exception($ex->getMessage()); throw new \Exception($ex->getMessage());
} }
} }
} }

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

@@ -61,7 +61,7 @@ class TokenAuthController extends Controller
return response()->json(compact('error')); return response()->json(compact('error'));
} }
$user_id = \Auth::user()->id; $user_id = \Auth::user();
// if no errors are encountered we can return a JWT // if no errors are encountered we can return a JWT
return response()->json(compact('token', 'user_id')); return response()->json(compact('token', 'user_id'));
} }

392
app/Http/Controllers/Auth/AuthController.php
View File

@@ -36,7 +36,8 @@ use Socialite;
* *
* @author Ladybird <info@ladybirdweb.com> * @author Ladybird <info@ladybirdweb.com>
*/ */
class AuthController extends Controller { class AuthController extends Controller
{
use AuthenticatesAndRegistersUsers; use AuthenticatesAndRegistersUsers;
/* to redirect after login */ /* to redirect after login */
@@ -58,14 +59,18 @@ class AuthController extends Controller {
* *
* @return void * @return void
*/ */
public function __construct(PhpMailController $PhpMailController, SocialMediaController $social) { public function __construct()
$this->PhpMailController = $PhpMailController; {
$this->PhpMailController = new PhpMailController();
$social = new SocialMediaController();
$social->configService(); $social->configService();
$this->middleware('guest', ['except' => ['getLogout', 'verifyOTP', 'redirectToProvider']]); $this->middleware('guest', ['except' => ['getLogout', 'verifyOTP', 'redirectToProvider']]);
} }
public function redirectToProvider($provider, $redirect = '') { public function redirectToProvider($provider, $redirect = '')
if ($redirect !== '') { {
if ($redirect !== '')
{
$this->setSession($provider, $redirect); $this->setSession($provider, $redirect);
} }
//dd(\Config::get('services')); //dd(\Config::get('services'));
@@ -74,20 +79,25 @@ class AuthController extends Controller {
return $s; return $s;
} }
public function handleProviderCallback($provider) { public function handleProviderCallback($provider)
try { {
try
{
//notice we are not doing any validation, you should do it //notice we are not doing any validation, you should do it
$this->changeRedirect(); $this->changeRedirect();
$user = Socialite::driver($provider)->user(); $user = Socialite::driver($provider)->user();
if ($user) { if ($user)
{
// stroing data to our use table and logging them in // stroing data to our use table and logging them in
$username = $user->getEmail(); $username = $user->getEmail();
$first_name = $user->getName(); $first_name = $user->getName();
if ($user->nickname) { if ($user->nickname)
{
$username = $user->nickname; $username = $user->nickname;
} }
if (!$first_name) { if (!$first_name)
{
$first_name = $username; $first_name = $username;
} }
$data = [ $data = [
@@ -98,17 +108,21 @@ class AuthController extends Controller {
'active' => 1, 'active' => 1,
]; ];
$user = User::where('email', $data['email'])->first(); $user = User::where('email', $data['email'])->first();
if (!$user) { if (!$user)
{
$user = User::where('user_name', $data['user_name'])->first(); $user = User::where('user_name', $data['user_name'])->first();
} }
if (!$user) { if (!$user)
{
$user = User::firstOrCreate($data); $user = User::firstOrCreate($data);
} }
Auth::login($user); Auth::login($user);
} }
//after login redirecting to home page //after login redirecting to home page
return redirect('/'); return redirect('/');
} catch (\Exception $ex) { }
catch (\Exception $ex)
{
return redirect()->back()->with('fails', $ex->getMessage()); return redirect()->back()->with('fails', $ex->getMessage());
} }
} }
@@ -118,19 +132,26 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function getRegister(CommonSettings $settings) { public function getRegister(CommonSettings $settings)
{
// Event for login // Event for login
$settings = $settings->select('status')->where('option_name', '=', 'send_otp')->first(); $settings = $settings->select('status')->where('option_name', '=', 'send_otp')->first();
$email_mandatory = $settings->select('status')->where('option_name', '=', 'email_mandatory')->first(); $email_mandatory = $settings->select('status')->where('option_name', '=', 'email_mandatory')->first();
//dd($settings->status); //dd($settings->status);
\Event::fire(new \App\Events\FormRegisterEvent()); \Event::fire(new \App\Events\FormRegisterEvent());
if (Auth::user()) { if (Auth::user())
if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent') { {
if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent')
{
return \Redirect::route('dashboard'); return \Redirect::route('dashboard');
} elseif (Auth::user()->role == 'user') { }
elseif (Auth::user()->role == 'user')
{
// return view('auth.register'); // return view('auth.register');
} }
} else { }
else
{
return view('auth.register', compact('settings', 'email_mandatory')); return view('auth.register', compact('settings', 'email_mandatory'));
} }
} }
@@ -143,32 +164,47 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function postRegister(User $user, RegisterRequest $request) { public function postRegister(User $user, RegisterRequest $request, $api = false)
try { {
//dd($request->all());
try
{
$request_array = $request->input(); $request_array = $request->input();
$password = Hash::make($request->input('password')); $password = Hash::make($request->input('password'));
$user->password = $password; $user->password = $password;
$name = $request->input('full_name'); $name = $request->input('full_name');
$user->first_name = $name; $user->first_name = $name;
if ($request_array['email'] == '') { if ($request_array['email'] == '')
{
$user->email = null; $user->email = null;
} else { }
else
{
$user->email = $request->input('email'); $user->email = $request->input('email');
} }
if ($request_array['mobile'] == '') { if (!checkArray('mobile', $request_array))
{
$user->mobile = null; $user->mobile = null;
} else { }
else
{
$user->mobile = $request->input('mobile'); $user->mobile = $request->input('mobile');
} }
if ($request_array['code'] == '') { if (!checkArray('code', $request_array))
{
$user->country_code = 0; $user->country_code = 0;
} else { }
else
{
$user->country_code = $request->input('code'); $user->country_code = $request->input('code');
} }
if ($request_array['email'] != '') { if (checkArray('username', $request_array))
{
$user->user_name = checkArray('username', $request_array);
}
else
{
$user->user_name = $request->input('email'); $user->user_name = $request->input('email');
} else {
$user->user_name = $request->input('mobile');
} }
$user->role = 'user'; $user->role = 'user';
$code = str_random(60); $code = str_random(60);
@@ -179,29 +215,51 @@ class AuthController extends Controller {
$sms = Plugin::select('status')->where('name', '=', 'SMS')->first(); $sms = Plugin::select('status')->where('name', '=', 'SMS')->first();
// Event for login // Event for login
\Event::fire(new \App\Events\LoginEvent($request)); \Event::fire(new \App\Events\LoginEvent($request));
if ($request->input('email') !== '') { if ($request->input('email') !== '')
{
$var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => null, 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/' . $code)]); $var = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $name, 'email' => $request->input('email')], $message = ['subject' => null, 'scenario' => 'registration'], $template_variables = ['user' => $name, 'email_address' => $request->input('email'), 'password_reset_link' => url('account/activate/' . $code)]);
} }
if ($settings->status == 1 || $settings->status == '1') { if ($settings->status == 1 || $settings->status == '1')
if (count($sms) > 0) { {
if ($sms->status == 1 || $sms->status == '1') { if (count($sms) > 0)
{
if ($sms->status == 1 || $sms->status == '1')
{
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_and_moble'); $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_and_moble');
} else { }
else
{
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup'); $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail_sms_plugin_inactive_or_not_setup');
} }
} else { }
if ($request->input('email') !== '') { else
{
if ($request->input('email') !== '')
{
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail'); $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail');
} else { }
else
{
$message12 = Lang::get('lang.account-created-contact-admin-as-we-were-not-able-to-send-opt'); $message12 = Lang::get('lang.account-created-contact-admin-as-we-were-not-able-to-send-opt');
} }
} }
} else { }
else
{
$message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail'); $message12 = Lang::get('lang.activate_your_account_click_on_Link_that_send_to_your_mail');
} }
if ($api == true)
{
return ['message' => $message12, 'user' => $user->toArray()];
}
return redirect('home')->with('success', $message12); return redirect('home')->with('success', $message12);
} catch (\Exception $e) { }
catch (\Exception $e)
{
if ($api == true)
{
throw new \Exception($e->getMessage());
}
return redirect()->back()->with('fails', $e->getMessage()); return redirect()->back()->with('fails', $e->getMessage());
} }
} }
@@ -213,16 +271,20 @@ class AuthController extends Controller {
* *
* @return type redirect * @return type redirect
*/ */
public function accountActivate($token) { public function accountActivate($token)
{
$user = User::where('remember_token', '=', $token)->first(); $user = User::where('remember_token', '=', $token)->first();
if ($user) { if ($user)
{
$user->active = 1; $user->active = 1;
$user->remember_token = null; $user->remember_token = null;
$user->save(); $user->save();
$this->openTicketAfterVerification($user->id); $this->openTicketAfterVerification($user->id);
return redirect('/auth/login')->with('status', 'Acount activated. Login to start'); return redirect('/auth/login')->with('status', 'Acount activated. Login to start');
} else { }
else
{
return redirect('/auth/login')->with('fails', 'Invalid Token'); return redirect('/auth/login')->with('fails', 'Invalid Token');
} }
} }
@@ -235,14 +297,18 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function getMail($token, User $user) { public function getMail($token, User $user)
{
$user = $user->where('remember_token', $token)->where('active', 0)->first(); $user = $user->where('remember_token', $token)->where('active', 0)->first();
if ($user) { if ($user)
{
$user->active = 1; $user->active = 1;
$user->save(); $user->save();
return redirect('auth/login'); return redirect('auth/login');
} else { }
else
{
return redirect('auth/login'); return redirect('auth/login');
} }
} }
@@ -252,19 +318,29 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function getLogin() { public function getLogin()
{
$directory = base_path(); $directory = base_path();
if (file_exists($directory . DIRECTORY_SEPARATOR . '.env')) { if (file_exists($directory . DIRECTORY_SEPARATOR . '.env'))
if (Auth::user()) { {
if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent') { if (Auth::user())
{
if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent')
{
return \Redirect::route('dashboard'); return \Redirect::route('dashboard');
} elseif (Auth::user()->role == 'user') { }
elseif (Auth::user()->role == 'user')
{
return \Redirect::route('home'); return \Redirect::route('home');
} }
} else { }
else
{
return view('auth.login'); return view('auth.login');
} }
} else { }
else
{
return Redirect::route('licence'); return Redirect::route('licence');
} }
} }
@@ -276,17 +352,22 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function postLogin(LoginRequest $request) { public function postLogin(LoginRequest $request)
try { {
try
{
// dd($request->input()); // dd($request->input());
\Event::fire('auth.login.event', []); //added 5/5/2016 \Event::fire('auth.login.event', []); //added 5/5/2016
// Set login attempts and login time // Set login attempts and login time
$value = $_SERVER['REMOTE_ADDR']; $value = $_SERVER['REMOTE_ADDR'];
$usernameinput = $request->input('email'); $usernameinput = $request->input('email');
$password = $request->input('password'); $password = $request->input('password');
if ($request->input('referer')) { if ($request->input('referer'))
{
$referer = 'form'; $referer = 'form';
} else { }
else
{
$referer = '/'; $referer = '/';
} }
$field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name'; $field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name';
@@ -294,12 +375,14 @@ class AuthController extends Controller {
// If attempts > 3 and time < 30 minutes // If attempts > 3 and time < 30 minutes
$security = Security::whereId('1')->first(); $security = Security::whereId('1')->first();
if ($result == 1) { if ($result == 1)
{
return redirect()->back()->withErrors('email', 'Incorrect details')->with(['error' => $security->lockout_message, 'referer' => $referer]); return redirect()->back()->withErrors('email', 'Incorrect details')->with(['error' => $security->lockout_message, 'referer' => $referer]);
} }
$check_active = User::where('email', '=', $request->input('email'))->orwhere('user_name', '=', $request->input('email'))->first(); $check_active = User::where('email', '=', $request->input('email'))->orwhere('user_name', '=', $request->input('email'))->first();
if (!$check_active) { //check if user exists or not if (!$check_active)
{ //check if user exists or not
//if user deos not exist then return back with error that user is not registered //if user deos not exist then return back with error that user is not registered
return redirect()->back() return redirect()->back()
->withInput($request->only('email', 'remember')) ->withInput($request->only('email', 'remember'))
@@ -313,16 +396,21 @@ class AuthController extends Controller {
//if user exists //if user exists
$settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first(); $settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first();
if ($settings->status == '1' || $settings->status == 1) { // check for otp verification setting if ($settings->status == '1' || $settings->status == 1)
{ // check for otp verification setting
// setting is enabled // setting is enabled
$sms = Plugin::select('status')->where('name', '=', 'SMS')->first(); $sms = Plugin::select('status')->where('name', '=', 'SMS')->first();
if ($sms) { //check sms plugin installed or not if ($sms)
{ //check sms plugin installed or not
// plugin is installed // plugin is installed
if ($sms->status == 1 || $sms->status === '1') { //check plugin is active or not if ($sms->status == 1 || $sms->status === '1')
{ //check plugin is active or not
// plugin is active // plugin is active
if (!$check_active->active) { //check account is active or not if (!$check_active->active)
{ //check account is active or not
// account is not active show verify otp window // account is not active show verify otp window
if ($check_active->mobile) { //check user has mobile or not if ($check_active->mobile)
{ //check user has mobile or not
// user has mobile number return verify OTP screen // user has mobile number return verify OTP screen
return \Redirect::route('otp-verification') return \Redirect::route('otp-verification')
->withInput($request->input()) ->withInput($request->input())
@@ -331,21 +419,32 @@ class AuthController extends Controller {
'name' => $check_active->first_name, 'name' => $check_active->first_name,
'number' => $check_active->mobile, 'number' => $check_active->mobile,
'code' => $check_active->country_code,]); 'code' => $check_active->country_code,]);
} else { }
else
{
goto a; //attenmpt login (be careful while using goto statements) goto a; //attenmpt login (be careful while using goto statements)
} }
} else { }
else
{
goto a; //attenmpt login (be careful while using goto statements) goto a; //attenmpt login (be careful while using goto statements)
} }
} else { }
else
{
goto a; //attenmpt login (be careful while using goto statements) goto a; //attenmpt login (be careful while using goto statements)
} }
} else { }
else
{
goto a; //attenmpt login (be careful while using goto statements) goto a; //attenmpt login (be careful while using goto statements)
} }
} else { }
else
{
// setting is disabled // setting is disabled
a: if (!$check_active->active) { //check account is active or not a: if (!$check_active->active)
{ //check account is active or not
// if accoutn is not active return back with error message that account is inactive // if accoutn is not active return back with error message that account is inactive
return redirect()->back() return redirect()->back()
->withInput($request->only('email', 'remember')) ->withInput($request->only('email', 'remember'))
@@ -354,11 +453,14 @@ class AuthController extends Controller {
'password' => $this->getFailedLoginMessage(), 'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.this_account_is_currently_inactive'), ])->with(['error' => Lang::get('lang.this_account_is_currently_inactive'),
'referer' => $referer,]); 'referer' => $referer,]);
} else { }
else
{
// try login // try login
$loginAttempts = 1; $loginAttempts = 1;
// If session has login attempts, retrieve attempts counter and attempts time // If session has login attempts, retrieve attempts counter and attempts time
if (\Session::has('loginAttempts')) { if (\Session::has('loginAttempts'))
{
$loginAttempts = \Session::get('loginAttempts'); $loginAttempts = \Session::get('loginAttempts');
$loginAttemptTime = \Session::get('loginAttemptTime'); $loginAttemptTime = \Session::get('loginAttemptTime');
$this->addLoginAttempt($value, $usernameinput); $this->addLoginAttempt($value, $usernameinput);
@@ -367,29 +469,38 @@ class AuthController extends Controller {
$password = $request->input('password'); $password = $request->input('password');
$field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name'; $field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name';
// If attempts > 3 and time < 10 minutes // If attempts > 3 and time < 10 minutes
if ($loginAttempts > $security->backlist_threshold && (time() - $loginAttemptTime <= ($security->lockout_period * 60))) { if ($loginAttempts > $security->backlist_threshold && (time() - $loginAttemptTime <= ($security->lockout_period * 60)))
{
return redirect()->back()->withErrors('email', 'incorrect email')->with('error', $security->lockout_message); return redirect()->back()->withErrors('email', 'incorrect email')->with('error', $security->lockout_message);
} }
// If time > 10 minutes, reset attempts counter and time in session // If time > 10 minutes, reset attempts counter and time in session
if (time() - $loginAttemptTime > ($security->lockout_period * 60)) { if (time() - $loginAttemptTime > ($security->lockout_period * 60))
{
\Session::put('loginAttempts', 1); \Session::put('loginAttempts', 1);
\Session::put('loginAttemptTime', time()); \Session::put('loginAttemptTime', time());
} }
} else { // If no login attempts stored, init login attempts and time }
else
{ // If no login attempts stored, init login attempts and time
\Session::put('loginAttempts', $loginAttempts); \Session::put('loginAttempts', $loginAttempts);
\Session::put('loginAttemptTime', time()); \Session::put('loginAttemptTime', time());
$this->clearLoginAttempts($value, $usernameinput); $this->clearLoginAttempts($value, $usernameinput);
} }
// If auth ok, redirect to restricted area // If auth ok, redirect to restricted area
\Session::put('loginAttempts', $loginAttempts + 1); \Session::put('loginAttempts', $loginAttempts + 1);
if (Auth::Attempt([$field => $usernameinput, 'password' => $password], $request->has('remember'))) { if (Auth::Attempt([$field => $usernameinput, 'password' => $password], $request->has('remember')))
if (Auth::user()->role == 'user') { {
if ($request->input('referer')) { if (Auth::user()->role == 'user')
{
if ($request->input('referer'))
{
return \Redirect::route($request->input('referer')); return \Redirect::route($request->input('referer'));
} }
return \Redirect::route('/'); return \Redirect::route('/');
} else { }
else
{
return redirect()->intended($this->redirectPath()); return redirect()->intended($this->redirectPath());
} }
} }
@@ -404,7 +515,9 @@ class AuthController extends Controller {
])->with(['error' => Lang::get('lang.invalid'), ])->with(['error' => Lang::get('lang.invalid'),
'referer' => $referer,]); 'referer' => $referer,]);
// Increment login attempts // Increment login attempts
} catch (\Exception $e) { }
catch (\Exception $e)
{
return redirect()->back()->with('fails', $e->getMessage()); return redirect()->back()->with('fails', $e->getMessage());
} }
} }
@@ -416,21 +529,28 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function addLoginAttempt($value, $field) { public function addLoginAttempt($value, $field)
{
$result = DB::table('login_attempts')->where('IP', '=', $value)->first(); $result = DB::table('login_attempts')->where('IP', '=', $value)->first();
$data = $result; $data = $result;
$security = Security::whereId('1')->first(); $security = Security::whereId('1')->first();
$apt = $security->backlist_threshold; $apt = $security->backlist_threshold;
if ($data) { if ($data)
{
$attempts = $data->Attempts + 1; $attempts = $data->Attempts + 1;
if ($attempts == $apt) { if ($attempts == $apt)
{
// $result = DB::select('UPDATE login_attempts SET Attempts='.$attempts.", LastLogin=NOW() WHERE IP = '$value' OR User = '$field'"); // $result = DB::select('UPDATE login_attempts SET Attempts='.$attempts.", LastLogin=NOW() WHERE IP = '$value' OR User = '$field'");
$result = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['Attempts' => $attempts, 'LastLogin' => date('Y-m-d H:i:s')]); $result = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['Attempts' => $attempts, 'LastLogin' => date('Y-m-d H:i:s')]);
} else { }
else
{
$result = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['Attempts' => $attempts]); $result = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['Attempts' => $attempts]);
// $result = DB::select("UPDATE login_attempts SET Attempts=".$attempts." WHERE IP = '$value' OR User = '$field'"); // $result = DB::select("UPDATE login_attempts SET Attempts=".$attempts." WHERE IP = '$value' OR User = '$field'");
} }
} else { }
else
{
// $result = DB::select("INSERT INTO login_attempts (Attempts,User,IP,LastLogin) values (1,'$field','$value', NOW())"); // $result = DB::select("INSERT INTO login_attempts (Attempts,User,IP,LastLogin) values (1,'$field','$value', NOW())");
$result = DB::table('login_attempts')->update(['Attempts' => 1, 'User' => $field, 'IP' => $value, 'LastLogin' => date('Y-m-d H:i:s')]); $result = DB::table('login_attempts')->update(['Attempts' => 1, 'User' => $field, 'IP' => $value, 'LastLogin' => date('Y-m-d H:i:s')]);
} }
@@ -443,7 +563,8 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function clearLoginAttempts($value, $field) { public function clearLoginAttempts($value, $field)
{
$data = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['attempts' => '0']); $data = DB::table('login_attempts')->where('IP', '=', $value)->orWhere('User', '=', $field)->update(['attempts' => '0']);
return $data; return $data;
@@ -456,7 +577,8 @@ class AuthController extends Controller {
* *
* @return type Response * @return type Response
*/ */
public function confirmIPAddress($value, $field) { public function confirmIPAddress($value, $field)
{
$security = Security::whereId('1')->first(); $security = Security::whereId('1')->first();
$time = $security->lockout_period; $time = $security->lockout_period;
$max_attempts = $security->backlist_threshold; $max_attempts = $security->backlist_threshold;
@@ -465,13 +587,18 @@ class AuthController extends Controller {
' FROM ' . $table . " WHERE IP = '$value' OR User = '$field'"); ' FROM ' . $table . " WHERE IP = '$value' OR User = '$field'");
$data = $result; $data = $result;
//Verify that at least one login attempt is in database //Verify that at least one login attempt is in database
if (!$data) { if (!$data)
{
return 0; return 0;
} }
if ($data[0]->Attempts >= $max_attempts) { if ($data[0]->Attempts >= $max_attempts)
if ($data[0]->Denied == 1) { {
if ($data[0]->Denied == 1)
{
return 1; return 1;
} else { }
else
{
$this->clearLoginAttempts($value, $field); $this->clearLoginAttempts($value, $field);
return 0; return 0;
@@ -486,7 +613,8 @@ class AuthController extends Controller {
* *
* @return type string * @return type string
*/ */
protected function getFailedLoginMessage() { protected function getFailedLoginMessage()
{
return Lang::get('lang.this_field_do_not_match_our_records'); return Lang::get('lang.this_field_do_not_match_our_records');
} }
@@ -497,10 +625,14 @@ class AuthController extends Controller {
* *
* @return response|view * @return response|view
*/ */
public function getVerifyOTP() { public function getVerifyOTP()
if (\Session::has('values')) { {
if (\Session::has('values'))
{
return view('auth.otp-verify'); return view('auth.otp-verify');
} else { }
else
{
return redirect('auth/login'); return redirect('auth/login');
} }
} }
@@ -512,27 +644,37 @@ class AuthController extends Controller {
* *
* @return int|string * @return int|string
*/ */
public function verifyOTP(LoginRequest $request) { public function verifyOTP(LoginRequest $request)
{
$user = User::select('id', 'mobile', 'user_name')->where('email', '=', $request->input('email')) $user = User::select('id', 'mobile', 'user_name')->where('email', '=', $request->input('email'))
->orWhere('user_name', '=', $request->input('email'))->first(); ->orWhere('user_name', '=', $request->input('email'))->first();
$otp_length = strlen($request->input('otp')); $otp_length = strlen($request->input('otp'));
if (!\Schema::hasTable('user_verification')) { if (!\Schema::hasTable('user_verification'))
{
$message = Lang::get('lang.opt-can-not-be-verified'); $message = Lang::get('lang.opt-can-not-be-verified');
} else { }
else
{
$otp = Otp::select('otp', 'updated_at')->where('user_id', '=', $user->id) $otp = Otp::select('otp', 'updated_at')->where('user_id', '=', $user->id)
->first(); ->first();
if ($otp != null) { if ($otp != null)
if (($otp_length == 6 && !preg_match('/[a-z]/i', $request->input('otp')))) { {
if (($otp_length == 6 && !preg_match('/[a-z]/i', $request->input('otp'))))
{
$otp2 = Hash::make($request->input('otp')); $otp2 = Hash::make($request->input('otp'));
$date1 = date_format($otp->updated_at, 'Y-m-d h:i:sa'); $date1 = date_format($otp->updated_at, 'Y-m-d h:i:sa');
$date2 = date('Y-m-d h:i:sa'); $date2 = date('Y-m-d h:i:sa');
$time1 = new DateTime($date2); $time1 = new DateTime($date2);
$time2 = new DateTime($date1); $time2 = new DateTime($date1);
$interval = $time1->diff($time2); $interval = $time1->diff($time2);
if ($interval->i > 30 || $interval->h > 0) { if ($interval->i > 30 || $interval->h > 0)
{
$message = Lang::get('lang.otp-expired'); $message = Lang::get('lang.otp-expired');
} else { }
if (Hash::check($request->input('otp'), $otp->otp)) { else
{
if (Hash::check($request->input('otp'), $otp->otp))
{
Otp::where('user_id', '=', $user->id) Otp::where('user_id', '=', $user->id)
->update(['otp' => '']); ->update(['otp' => '']);
User::where('id', '=', $user->id) User::where('id', '=', $user->id)
@@ -540,14 +682,20 @@ class AuthController extends Controller {
$this->openTicketAfterVerification($user->id); $this->openTicketAfterVerification($user->id);
return $this->postLogin($request); return $this->postLogin($request);
} else { }
else
{
$message = Lang::get('lang.otp-not-matched'); $message = Lang::get('lang.otp-not-matched');
} }
} }
} else { }
else
{
$message = Lang::get('lang.otp-invalid'); $message = Lang::get('lang.otp-invalid');
} }
} else { }
else
{
$message = Lang::get('lang.otp-not-matched'); $message = Lang::get('lang.otp-not-matched');
} }
} }
@@ -560,18 +708,25 @@ class AuthController extends Controller {
'fails' => $message,]); 'fails' => $message,]);
} }
public function resendOTP(OtpVerifyRequest $request) { public function resendOTP(OtpVerifyRequest $request)
if (!\Schema::hasTable('user_verification') || !\Schema::hasTable('sms')) { {
if (!\Schema::hasTable('user_verification') || !\Schema::hasTable('sms'))
{
$message = Lang::get('lang.opt-can-not-be-verified'); $message = Lang::get('lang.opt-can-not-be-verified');
return $message; return $message;
} else { }
else
{
$sms = DB::table('sms')->get(); $sms = DB::table('sms')->get();
if (count($sms) > 0) { if (count($sms) > 0)
{
\Event::fire(new \App\Events\LoginEvent($request)); \Event::fire(new \App\Events\LoginEvent($request));
return 1; return 1;
} else { }
else
{
$message = Lang::get('lang.opt-can-not-be-verified'); $message = Lang::get('lang.opt-can-not-be-verified');
return $message; return $message;
@@ -588,15 +743,18 @@ class AuthController extends Controller {
* *
* @author manish.verma@ladybirdweb.com * @author manish.verma@ladybirdweb.com
*/ */
public function openTicketAfterVerification($id) { public function openTicketAfterVerification($id)
{
// dd($id); // dd($id);
$ticket = Tickets::select('id') $ticket = Tickets::select('id')
->where(['user_id' => $id, 'status' => 6]) ->where(['user_id' => $id, 'status' => 6])
->get(); ->get();
Tickets::where(['user_id' => $id, 'status' => 6]) Tickets::where(['user_id' => $id, 'status' => 6])
->update(['status' => 1]); ->update(['status' => 1]);
if ($ticket != null) { if ($ticket != null)
foreach ($ticket as $value) { {
foreach ($ticket as $value)
{
$ticket_id = $value->id; $ticket_id = $value->id;
Ticket_Thread::where('ticket_id', '=', $ticket_id) Ticket_Thread::where('ticket_id', '=', $ticket_id)
->update(['updated_at' => date('Y-m-d H:i:s')]); ->update(['updated_at' => date('Y-m-d H:i:s')]);
@@ -604,13 +762,15 @@ class AuthController extends Controller {
} }
} }
public function changeRedirect() { public function changeRedirect()
{
$provider = \Session::get('provider'); $provider = \Session::get('provider');
$url = \Session::get($provider . 'redirect'); $url = \Session::get($provider . 'redirect');
\Config::set("services.$provider.redirect", $url); \Config::set("services.$provider.redirect", $url);
} }
public function setSession($provider, $redirect) { public function setSession($provider, $redirect)
{
$url = url($redirect); $url = url($redirect);
\Session::set('provider', $provider); \Session::set('provider', $provider);
\Session::set($provider . 'redirect', $url); \Session::set($provider . 'redirect', $url);

2
app/Http/routes.php
View File

@@ -706,7 +706,6 @@ Route::group(['middleware' => ['web']], function () {
* @name Faveo * @name Faveo
*/ */
Route::group(['prefix' => 'api/v1'], function () { Route::group(['prefix' => 'api/v1'], function () {
Route::post('register', 'Api\v1\ApiController@register');
Route::post('authenticate', 'Api\v1\TokenAuthController@authenticate'); Route::post('authenticate', 'Api\v1\TokenAuthController@authenticate');
Route::get('authenticate/user', 'Api\v1\TokenAuthController@getAuthenticatedUser'); Route::get('authenticate/user', 'Api\v1\TokenAuthController@getAuthenticatedUser');
Route::get('/database-config', ['as' => 'database-config', 'uses' => 'Api\v1\InstallerApiController@config_database']); Route::get('/database-config', ['as' => 'database-config', 'uses' => 'Api\v1\InstallerApiController@config_database']);
@@ -752,6 +751,7 @@ Route::group(['middleware' => ['web']], function () {
Route::post('collaborator/get-ticket', 'Api\v1\ApiController@getCollaboratorForTicket'); Route::post('collaborator/get-ticket', 'Api\v1\ApiController@getCollaboratorForTicket');
Route::get('my-tickets-user', 'Api\v1\ApiController@getMyTicketsUser'); Route::get('my-tickets-user', 'Api\v1\ApiController@getMyTicketsUser');
Route::get('dependency', 'Api\v1\ApiController@dependency'); Route::get('dependency', 'Api\v1\ApiController@dependency');
Route::post('register', 'Api\v1\ApiController@createUser');
}); });
/* /*

2
app/Model/helpdesk/Utility/Priority.php
View File

@@ -7,7 +7,7 @@ use App\BaseModel;
class Priority extends BaseModel class Priority extends BaseModel
{ {
public $timestamps = false; public $timestamps = false;
protected $table = 'priority'; protected $table = 'ticket_priority';
protected $fillable = [ protected $fillable = [
'id', 'name', 'id', 'name',
]; ];