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

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Manish Verma
2017-09-04 09:52:33 +00:00
committed by StyleCI Bot
parent 837c99db39
commit 7a78368037
39 changed files with 1023 additions and 1498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/helpdesk/AgentController.php
View File

@@ -271,10 +271,12 @@ class AgentController extends Controller
$team_assign_agent = $team_assign_agent->where('agent_id', $id);
$team_assign_agent->delete();
$user = $user->whereId($id)->first();
try {
$error = Lang::get('lang.this_staff_is_related_to_some_tickets');
$user->id;
$user->delete();
throw new \Exception($error);
return redirect('agents')->with('success', Lang::get('lang.agent_deleted_sucessfully'));
} catch (\Exception $e) {

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

@@ -428,6 +428,7 @@ class EmailsController extends Controller
return redirect('emails')->with('fails', Lang::get('lang.you_cannot_delete_system_default_email'));
}
}
try {
// fetching the database instance of the current email
$emails = $email->whereId($id)->first();

6
app/Http/Controllers/Admin/helpdesk/FormController.php
View File

@@ -106,6 +106,7 @@ class FormController extends Controller
return view('themes.default1.admin.helpdesk.manage.form.preview', compact('form', 'fields'));
}
throw new Exception("Sorry we can't find your request");
} catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage());
@@ -125,6 +126,7 @@ class FormController extends Controller
'name.*' => 'required',
'type.*' => 'required',
]);
try {
$forms = new Forms();
$require = Input::get('required');
@@ -195,6 +197,7 @@ class FormController extends Controller
//dd($fields);
return view('themes.default1.admin.helpdesk.manage.form.edit', compact('form', 'fields', 'select_forms'));
}
throw new Exception("Sorry we can't find your request");
} catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage());
@@ -213,6 +216,7 @@ class FormController extends Controller
//dd($fields);
return view('themes.default1.admin.helpdesk.manage.form.add-child', compact('form', 'fields', 'select_forms'));
}
throw new Exception("Sorry we can't find your request");
} catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage());
@@ -227,6 +231,7 @@ class FormController extends Controller
'name.*' => 'required',
'type.*' => 'required',
]);
try {
if (!$request->input('formname')) {
throw new Exception(Lang::get('lang.please_fill_form_name'));
@@ -391,6 +396,7 @@ class FormController extends Controller
public function addChild($fieldid, Request $request)
{
$ids = $request->except('_token');
try {
foreach ($ids as $valueid => $formid) {
$field_value = new \App\Model\helpdesk\Form\FieldValue();

2
app/Http/Controllers/Admin/helpdesk/PriorityController.php
View File

@@ -172,7 +172,7 @@ class PriorityController extends Controller
public function destroy($priority_id)
{
$default_priority = Ticket_Priority::where('is_default', '>', '0')->first();
// dd($default_priority->is_default);
// dd($default_priority->is_default);
$topic = DB::table('help_topic')->where('priority', '=', $priority_id)->update(['priority' => $default_priority->is_default]);
// if ($topic > 0) {
// if ($topic > 1) {

2
app/Http/Controllers/Admin/helpdesk/SettingsController2.php
View File

@@ -503,7 +503,7 @@ class SettingsController2 extends Controller
// try {
// /* fetch the values of access from access table */
// $accesses = $access->whereId('1')->first();
// // Direct to Access Settings Page
// // Direct to Access Settings Page
// return view('themes.default1.admin.helpdesk.settings.access', compact('accesses'));
// } catch (Exception $e) {
// return view('404');

1
app/Http/Controllers/Admin/helpdesk/SocialMedia/SocialMediaController.php
View File

@@ -32,6 +32,7 @@ class SocialMediaController extends Controller
'client_secret' => 'required',
'redirect' => 'required|url',
]);
try {
$requests = $request->except('_token');
$this->insertProvider($provider, $requests);

8
app/Http/Controllers/Admin/helpdesk/TeamController.php
View File

@@ -143,15 +143,15 @@ class TeamController extends Controller
{
// dd($request);
// $id = $request->input('show_id');
// $id = $request->input('show_id');
// dd($id);
// dd($id);
$users = DB::table('team_assign_agent')->select('team_assign_agent.id', 'team_assign_agent.team_id', 'users.user_name', 'users.first_name', 'users.last_name', 'users.active', 'users.assign_group', 'users.primary_dpt', 'users.role')
$users = DB::table('team_assign_agent')->select('team_assign_agent.id', 'team_assign_agent.team_id', 'users.user_name', 'users.first_name', 'users.last_name', 'users.active', 'users.assign_group', 'users.primary_dpt', 'users.role')
->join('users', 'users.id', '=', 'team_assign_agent.agent_id')
->where('team_assign_agent.team_id', '=', $id);
// ->get();
// dd($users);
// dd($users);
return \Datatable::query($users)
->showColumns('user_name')

10
app/Http/Controllers/Admin/helpdesk/TemplateController.php
View File

@@ -157,11 +157,11 @@ class TemplateController extends Controller
$fname = Input::get('folder_name');
$filename = $directory.$fname;
// images folder creation using php
// $mydir = dirname( __FILE__ )."/html/images";
// if(!is_dir($mydir)){
// mkdir("html/images");
// }
// images folder creation using php
// $mydir = dirname( __FILE__ )."/html/images";
// if(!is_dir($mydir)){
// mkdir("html/images");
// }
// Move all images files
if (!file_exists($filename)) {

2
app/Http/Controllers/Admin/helpdesk/UrlSettingController.php
View File

@@ -91,7 +91,7 @@ RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]\n";
public function changeHttp()
{
//$string = "RewriteCond %{HTTPS} off
//RewriteRule ^(.*)$ http://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]\n";
//RewriteRule ^(.*)$ http://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]\n";
$string = '';
return $string;

1
app/Http/Controllers/Admin/helpdesk/WorkflowController.php
View File

@@ -149,6 +149,7 @@ class WorkflowController extends Controller
$email_data["E-$key"] = $email;
}
$emails = $email_data;
try {
return view('themes.default1.admin.helpdesk.manage.workflow.create', compact('emails'));
} catch (Exception $e) {

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

@@ -284,24 +284,22 @@ class TicketController extends Controller
if ($result[1]) {
$status = $this->checkUserVerificationStatus();
if ($status == 1) {
if ($api != false)
{
if ($api != false) {
$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'));
} else {
if ($api != false)
{
if ($api != false) {
return response()->json(['success' => Lang::get('lang.Ticket-created-successfully')]);
}
return Redirect('newticket')->with('success', Lang::get('lang.Ticket-created-successfully2'));
}
} else {
if ($api != false)
{
if ($api != false) {
return response()->json(['error' => Lang::get('lang.failed-to-create-user-tcket-as-mobile-has-been-taken')], 500);
}
@@ -309,8 +307,7 @@ class TicketController extends Controller
}
} catch (Exception $e) {
dd($e);
if ($api != false)
{
if ($api != false) {
return response()->json(['error' => $e->getMessage()], 500);
}
@@ -403,6 +400,7 @@ class TicketController extends Controller
public function reply(Ticket_Thread $thread, Request $request, Ticket_attachments $ta, $mail = true, $system_reply = true, $user_id = '')
{
\Event::fire('reply.request', [$request]);
try {
if (is_array($request->file('attachment'))) {
} else {
@@ -815,6 +813,7 @@ class TicketController extends Controller
}
// Event fire
\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' => $user->first_name, 'email' => $emailadd], $message = ['subject' => null, 'scenario' => 'registration-notification'], $template_variables = ['user' => $user->first_name, 'email_address' => $emailadd, 'user_password' => $password]);
@@ -867,6 +866,7 @@ class TicketController extends Controller
}
} else {
$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'],
@@ -1265,6 +1265,7 @@ class TicketController extends Controller
} else {
$from_email = $sending_emails->id;
}
try {
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $ticket_status->dept_id), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'close-ticket'], $template_variables = ['ticket_number' => $ticket_number]);
} catch (\Exception $e) {
@@ -1501,6 +1502,7 @@ class TicketController extends Controller
$agent_email = $user_detail->email;
$ticket_link = route('ticket.thread', $id);
$master = Auth::user()->first_name.' '.Auth::user()->last_name;
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, 'ticket_link' => $ticket_link]);
} catch (\Exception $e) {
@@ -1634,6 +1636,7 @@ class TicketController extends Controller
$create_user->password = Hash::make($password);
$create_user->save();
$user_id = $create_user->id;
try {
$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]);
} catch (\Exception $e) {
@@ -2321,6 +2324,7 @@ class TicketController extends Controller
$user->role = 'user';
if ($user->save()) {
$user_id = $user->id;
try {
$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]);
} catch (\Exception $e) {

4
app/Http/Controllers/Agent/helpdesk/UserController.php
View File

@@ -298,6 +298,7 @@ class UserController extends Controller
$password = $this->generateRandomString();
$user->password = Hash::make($password);
$user->role = 'user';
try {
if ($request->get('country_code') == '' && ($request->get('phone_number') != '' || $request->get('mobile') != '')) {
return redirect()->back()->with(['fails' => Lang::get('lang.country-code-required-error'), 'country_code_error' => 1])->withInput();
@@ -708,6 +709,7 @@ class UserController extends Controller
public function getProfile()
{
$user = Auth::user();
try {
return view('themes.default1.agent.helpdesk.user.profile', compact('user'));
} catch (Exception $e) {
@@ -727,6 +729,7 @@ class UserController extends Controller
$phonecode = $code->where('iso', '=', $location->iso_code)->first();
$settings = CommonSettings::select('status')->where('option_name', '=', 'send_otp')->first();
$status = $settings->status;
try {
return view('themes.default1.agent.helpdesk.user.profile-edit', compact('user'))
->with(['phonecode' => $phonecode->phonecode,
@@ -805,6 +808,7 @@ class UserController extends Controller
// checking if the old password matches the new password
if (Hash::check($request->input('old_password'), $user->getAuthPassword())) {
$user->password = Hash::make($request->input('new_password'));
try {
$user->save();

3
app/Http/Controllers/Agent/kb/PageController.php
View File

@@ -51,6 +51,7 @@ class PageController extends Controller
{
$pages = $this->page->paginate(3);
$pages->setPath('page');
try {
return view('themes.default1.agent.kb.pages.index', compact('pages'));
} catch (Exception $e) {
@@ -128,6 +129,7 @@ class PageController extends Controller
$sl = $request->input('name');
$slug = str_slug($sl, '-');
$this->page->slug = $slug;
try {
$this->page->fill($request->input())->save();
@@ -169,6 +171,7 @@ class PageController extends Controller
$pages = $this->page->where('slug', $slug)->first();
$sl = $request->input('name');
$slug = str_slug($sl, '-');
try {
$pages->fill($request->all())->save();
$pages->slug = $slug;

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

File diff suppressed because it is too large Load Diff

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

@@ -32,7 +32,6 @@ use Mail;
*/
class TicketController extends Controller
{
/**
* Create a new controller instance.
*
@@ -58,19 +57,14 @@ class TicketController extends Controller
*/
public function createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $attach = '')
{
try
{
try {
//return $headers;
$max_number = Tickets::whereRaw('id = (select max(`id`) from tickets)')->first();
//dd($max_number);
if ($max_number == null)
{
if ($max_number == null) {
$ticket_number = 'AAAA-9999-9999999';
}
else
{
foreach ($max_number as $number)
{
} else {
foreach ($max_number as $number) {
$ticket_number = $max_number->ticket_number;
}
}
@@ -89,16 +83,12 @@ class TicketController extends Controller
//dd($ticket);
$ticket_number = $ticket->ticket_number;
$id = $ticket->id;
if ($form_data != null)
{
if ($form_data != null) {
$help_topic = Help_topic::where('id', '=', $helptopic)->first();
$forms = Fields::where('forms_id', '=', $help_topic->custom_form)->get();
foreach ($form_data as $key => $form_details)
{
foreach ($forms as $from)
{
if ($from->name == $key)
{
foreach ($form_data as $key => $form_details) {
foreach ($forms as $from) {
if ($from->name == $key) {
$form_value = new Ticket_Form_Data();
$form_value->ticket_id = $id;
$form_value->title = $from->label;
@@ -112,15 +102,12 @@ class TicketController extends Controller
$this->storeCollaborators($headers, $id);
$thread = $this->ticketThread($subject, $body, $id, $user_id);
if (!empty($attach))
{
if (!empty($attach)) {
$this->attach($thread, $attach);
}
return $thread;
}
catch (\Exception $e)
{
} catch (\Exception $e) {
return $e->getMessage();
}
}
@@ -134,18 +121,14 @@ class TicketController extends Controller
*/
public function storeCollaborators($headers, $id)
{
try
{
try {
//return $headers;
$company = $this->company();
if (isset($headers))
{
foreach ($headers as $email)
{
if (isset($headers)) {
foreach ($headers as $email) {
$name = $email;
$email = $email;
if ($this->checkEmail($email) == false)
{
if ($this->checkEmail($email) == false) {
$create_user = new User();
$create_user->user_name = $name;
$create_user->email = $email;
@@ -160,9 +143,7 @@ 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]);
}
else
{
} else {
$user = $this->checkEmail($email);
$user_id = $user->id;
}
@@ -177,9 +158,7 @@ class TicketController extends Controller
}
return true;
}
catch (\Exception $e)
{
} catch (\Exception $e) {
return $e->getMessage();
}
}
@@ -196,8 +175,7 @@ class TicketController extends Controller
*/
public function ticketThread($subject, $body, $id, $user_id)
{
try
{
try {
$thread = new Ticket_Thread();
$thread->user_id = $user_id;
$thread->ticket_id = $id;
@@ -207,9 +185,7 @@ class TicketController extends Controller
$thread->save();
return $thread->id;
}
catch (\Exception $e)
{
} catch (\Exception $e) {
return $e->getMessage();
}
}
@@ -223,24 +199,20 @@ class TicketController extends Controller
*/
public function ticketNumber($ticket_number)
{
try
{
try {
//dd($ticket_number);
$number = $ticket_number;
$number = explode('-', $number);
$number1 = $number[0];
if ($number1 == 'ZZZZ')
{
if ($number1 == 'ZZZZ') {
$number1 = 'AAAA';
}
$number2 = $number[1];
if ($number2 == '9999')
{
if ($number2 == '9999') {
$number2 = '0000';
}
$number3 = $number[2];
if ($number3 == '9999999')
{
if ($number3 == '9999999') {
$number3 = '0000000';
}
$number1++;
@@ -252,9 +224,7 @@ class TicketController extends Controller
$number = implode('-', $array);
return $number;
}
catch (\Exception $e)
{
} catch (\Exception $e) {
dd($e);
return $e->getMessage();
@@ -270,20 +240,16 @@ class TicketController extends Controller
*/
public function generateRandomString($length = 10)
{
try
{
try {
$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
$charactersLength = strlen($characters);
$randomString = '';
for ($i = 0; $i < $length; $i++)
{
for ($i = 0; $i < $length; $i++) {
$randomString .= $characters[rand(0, $charactersLength - 1)];
}
return $randomString;
}
catch (\Exception $e)
{
} catch (\Exception $e) {
return $e->getMessage();
}
}
@@ -298,8 +264,7 @@ class TicketController extends Controller
*/
public function reply($thread, $request, $ta, $attach = '')
{
try
{
try {
$check_attachment = null;
$eventthread = $thread->where('ticket_id', $request->input('ticket_ID'))->first();
//dd($request->input('ticket_ID'));
@@ -324,27 +289,24 @@ class TicketController extends Controller
$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->save();
$thread2 = new Ticket_Thread();
$thread2->ticket_id = $thread->ticket_id;
$thread2->user_id = Auth::user()->id;
$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();
}
if ($tickets->status > 1)
{
if ($tickets->status > 1) {
$tickets->status = '1';
$tickets->isanswered = '1';
$tickets->save();
}
$thread->save();
if (!empty($attach))
{
if (!empty($attach)) {
$check_attachment = $this->attach($thread->id, $attach);
}
@@ -357,12 +319,9 @@ class TicketController extends Controller
$ticket_number = $tickets->ticket_number;
$company = $this->company();
$username = $ticket_user->user_name;
if (!empty(Auth::user()->agent_sign))
{
if (!empty(Auth::user()->agent_sign)) {
$agentsign = Auth::user()->agent_sign;
}
else
{
} else {
$agentsign = null;
}
\Event::fire(new \App\Events\FaveoAfterReply($reply_content, $user->phone_number, $request, $tickets));
@@ -370,67 +329,54 @@ class TicketController extends Controller
// Mail::send(array('html' => 'emails.ticket_re-reply'), ['content' => $reply_content, 'ticket_number' => $ticket_number, 'From' => $company, 'name' => $username, 'Agent_Signature' => $agentsign], function ($message) use ($email, $user_name, $ticket_number, $ticket_subject, $check_attachment) {
// $message->to($email, $user_name)->subject($ticket_subject . '[#' . $ticket_number . ']');
// // if(isset($attachments)){
// // if ($check_attachment == 1) {
// // $size = count($attach);
// // for ($i = 0; $i < $size; $i++) {
// // $message->attach($attachments[$i]->getRealPath(), ['as' => $attachments[$i]->getClientOriginalName(), 'mime' => $attachments[$i]->getClientOriginalExtension()]);
// // }
// // }
// // if ($check_attachment == 1) {
// // $size = count($attach);
// // for ($i = 0; $i < $size; $i++) {
// // $message->attach($attachments[$i]->getRealPath(), ['as' => $attachments[$i]->getClientOriginalName(), 'mime' => $attachments[$i]->getClientOriginalExtension()]);
// // }
// // }
// }, true);
//dd('reply');
/*
* Getting the subject of the thread
*/
//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]);
//dd($re);
}
catch (\Exception $e)
{
} catch (\Exception $e) {
//throw new \Exception($e->getMessage());
}
$collaborators = Ticket_Collaborator::where('ticket_id', '=', $ticket_id)->get();
foreach ($collaborators as $collaborator)
{
foreach ($collaborators as $collaborator) {
//mail to collaborators
$collab_user_id = $collaborator->user_id;
$user_id_collab = User::where('id', '=', $collab_user_id)->first();
$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;
}
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) {
// $message->to($collab_email, $collab_user_name)->subject($ticket_subject . '[#' . $ticket_number . ']');
// // if ($check_attachment == 1) {
// // $size = sizeOf($attachments);
// // for ($i = 0; $i < $size; $i++) {
// // $message->attach($attachments[$i]->getRealPath(), ['as' => $attachments[$i]->getClientOriginalName(), 'mime' => $attachments[$i]->getClientOriginalExtension()]);
// // }
// // }
// // if ($check_attachment == 1) {
// // $size = sizeOf($attachments);
// // for ($i = 0; $i < $size; $i++) {
// // $message->attach($attachments[$i]->getRealPath(), ['as' => $attachments[$i]->getClientOriginalName(), 'mime' => $attachments[$i]->getClientOriginalExtension()]);
// // }
// // }
// }, 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]);
}
catch (\Exception $e)
{
} catch (\Exception $e) {
}
}
return $thread;
}
catch (\Exception $e)
{
} catch (\Exception $e) {
//dd($e);
return $e->getMessage();
}
@@ -443,22 +389,16 @@ class TicketController extends Controller
*/
public function company()
{
try
{
try {
$company = Company::Where('id', '=', '1')->first();
if ($company->company_name == null)
{
if ($company->company_name == null) {
$company = 'Support Center';
}
else
{
} else {
$company = $company->company_name;
}
return $company;
}
catch (\Exception $e)
{
} catch (\Exception $e) {
return $e->getMessage();
}
}
@@ -473,8 +413,7 @@ class TicketController extends Controller
*/
public function ticketEditPost($ticket_id, $thread, $ticket)
{
try
{
try {
$ticket = $ticket->where('id', '=', $ticket_id)->first();
$ticket->sla = Input::get('sla_plan');
@@ -487,13 +426,13 @@ class TicketController extends Controller
$threads = $thread->where('ticket_id', '=', $ticket_id)->first();
$threads->title = Input::get('subject');
$threads->save();
}
catch (\Exception $ex)
{
} catch (\Exception $ex) {
$result = $ex->getMessage();
return response()->json(compact('result'), 500);
}
$result = ["success" => "Edited successfully"];
$result = ['success' => 'Edited successfully'];
return response()->json(compact('result'));
}
@@ -506,28 +445,24 @@ class TicketController extends Controller
*/
public function assign($id)
{
try
{
try {
$UserEmail = Input::get('user');
//dd($UserEmail);
// $UserEmail = 'sujitprasad12@yahoo.in';
$user = User::where('email', '=', $UserEmail)->first();
if (!$user)
{
if (!$user) {
return ['error' => 'No agent not found'];
}
$user_id = $user->id;
$ticket = Tickets::where('id', '=', $id)->first();
if (!$ticket)
{
if (!$ticket) {
return ['error' => 'No ticket not found'];
}
$ticket_number = $ticket->ticket_number;
$ticket->assigned_to = $user_id;
$ticket->save();
$ticket_thread = Ticket_Thread::where('ticket_id', '=', $id)->first();
if (!$ticket_thread)
{
if (!$ticket_thread) {
return ['error' => 'No thread not found'];
}
$ticket_subject = $ticket_thread->title;
@@ -535,7 +470,7 @@ class TicketController extends Controller
$thread->ticket_id = $ticket->id;
$thread->user_id = Auth::user()->id;
$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();
$company = $this->company();
@@ -544,28 +479,22 @@ class TicketController extends Controller
$agent = $user->first_name;
$agent_email = $user->email;
$master = Auth::user()->first_name . ' ' . Auth::user()->last_name;
if (Alert::first()->internal_status == 1 || Alert::first()->internal_assigned_agent == 1)
{
$master = Auth::user()->first_name.' '.Auth::user()->last_name;
if (Alert::first()->internal_status == 1 || Alert::first()->internal_assigned_agent == 1) {
// // 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) {
// $message->to($agent_email, $agent)->subject($ticket_subject . '[#' . $ticket_number . ']');
// });
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)
{
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) {
return 0;
}
}
return 1;
}
catch (\Exception $e)
{
} catch (\Exception $e) {
return $e->getMessage();
}
}
@@ -580,41 +509,29 @@ class TicketController extends Controller
*/
public function delete($ids, $ticket)
{
try
{
foreach ($ids as $id)
{
try {
foreach ($ids as $id) {
$ticket_delete = $ticket->where('id', '=', $id)->first();
if ($ticket_delete)
{
if ($ticket_delete->status == 5)
{
if ($ticket_delete) {
if ($ticket_delete->status == 5) {
$ticket_delete->delete();
$ticket_threads = Ticket_Thread::where('ticket_id', '=', $id)->get();
if ($ticket_threads)
{
foreach ($ticket_threads as $ticket_thread)
{
if ($ticket_thread)
{
if ($ticket_threads) {
foreach ($ticket_threads as $ticket_thread) {
if ($ticket_thread) {
$ticket_thread->delete();
}
}
}
$ticket_attachments = Ticket_attachments::where('thread_id', '=', $id)->get();
if ($ticket_attachments)
{
foreach ($ticket_attachments as $ticket_attachment)
{
if ($ticket_attachment)
{
if ($ticket_attachments) {
foreach ($ticket_attachments as $ticket_attachment) {
if ($ticket_attachment) {
$ticket_attachment->delete();
}
}
}
}
else
{
} else {
$ticket_delete->is_deleted = 0;
$ticket_delete->status = 5;
$ticket_delete->save();
@@ -623,20 +540,16 @@ class TicketController extends Controller
$thread->ticket_id = $ticket_delete->id;
$thread->user_id = Auth::user()->id;
$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();
}
}
else
{
} else {
return 'ticket not found';
}
}
return 'your tickets has been deleted';
}
catch (\Exception $e)
{
} catch (\Exception $e) {
return $e->getMessage();
}
}
@@ -650,20 +563,14 @@ class TicketController extends Controller
*/
public function checkEmail($email)
{
try
{
try {
$check = User::where('email', '=', $email)->first();
if ($check)
{
if ($check) {
return $check;
}
else
{
} else {
return false;
}
}
catch (\Exception $e)
{
} catch (\Exception $e) {
return $e->getMessage();
}
}
@@ -675,22 +582,16 @@ class TicketController extends Controller
*/
public function system()
{
try
{
try {
$system = System::Where('id', '=', '1')->first();
if ($system->name == null)
{
if ($system->name == null) {
$system = 'Support Center';
}
else
{
} else {
$system = $system->name;
}
return $system;
}
catch (\Exception $e)
{
} catch (\Exception $e) {
return $e->getMessage();
}
}
@@ -705,19 +606,15 @@ class TicketController extends Controller
*/
public function attach($thread, $attach)
{
try
{
try {
$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' => $name, 'size' => $size, 'type' => $type, 'file' => $file, 'poster' => 'ATTACHMENT']);
return 1;
}
catch (\Exception $e)
{
} catch (\Exception $e) {
return $e->getMessage();
}
}
@@ -730,7 +627,7 @@ class TicketController extends Controller
public function autosearch()
{
$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;
}
@@ -754,8 +651,7 @@ class TicketController extends Controller
$user->password = \Hash::make($password);
$user->role = 'user';
$user->active = 1;
if ($user->save())
{
if ($user->save()) {
$user_id = $user->id;
$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]);
@@ -786,77 +682,60 @@ class TicketController extends Controller
$ticket_collaborator = Ticket_Collaborator::where('ticket_id', '=', $ticketid)
->where('user_id', $user->id)
->first();
if ($ticket_collaborator)
{
if ($ticket_collaborator) {
$ticket_collaborator->delete();
return 'deleted successfully';
}
else
{
} else {
return 'not found';
}
}
public function getCollaboratorForTicket()
{
try
{
try {
$ticketid = Input::get('ticket_id');
$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')
->where('ticket_collaborator.ticket_id', '=', $ticketid);
})
->select('users.email', 'users.user_name')
->get();
if (count($ticket_collaborator) > 0)
{
foreach ($ticket_collaborator as $key => $collaborator)
{
if (count($ticket_collaborator) > 0) {
foreach ($ticket_collaborator as $key => $collaborator) {
$collab[$key]['email'] = $collaborator->email;
$collab[$key]['user_name'] = $collaborator->user_name;
$collab[$key]['avatar'] = $this->avatarUrl($collaborator->email);
}
}
else
{
} else {
$collab = $ticket_collaborator;
}
return $collab;
}
catch (\Exception $ex)
{
} catch (\Exception $ex) {
return $ex->getMessage();
throw new \Exception('get collaborator for ticket fails');
}
}
public function avatarUrl($email)
{
try
{
try {
$user = new User();
$user = $user->where('email', $email)->first();
if ($user->profile_pic)
{
$url = url('uploads/profilepic/' . $user->profile_pic);
}
else
{
if ($user->profile_pic) {
$url = url('uploads/profilepic/'.$user->profile_pic);
} else {
$url = \Gravatar::src($email);
}
return $url;
}
catch (\Exception $ex)
{
} catch (\Exception $ex) {
//return $ex->getMessage();
throw new \Exception($ex->getMessage());
}
}
}

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

@@ -47,7 +47,7 @@ class TokenAuthController extends Controller
$password = $request->input('password');
$field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name';
//$credentials = $request->only('email', 'password');
//$credentials = $request->only('email', 'password');
try {
if (!$token = JWTAuth::attempt([$field => $usernameinput, 'password' => $password, 'active'=>1])) {
@@ -62,7 +62,7 @@ class TokenAuthController extends Controller
}
$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'));
}
@@ -89,7 +89,7 @@ class TokenAuthController extends Controller
return response()->json(compact('error'));
}
//dd($user);
//dd($user);
return response()->json(compact('user'));
}

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

@@ -38,7 +38,6 @@ use Socialite;
*/
class AuthController extends Controller
{
use AuthenticatesAndRegistersUsers;
/* to redirect after login */
@@ -69,8 +68,7 @@ class AuthController extends Controller
public function redirectToProvider($provider, $redirect = '')
{
if ($redirect !== '')
{
if ($redirect !== '') {
$this->setSession($provider, $redirect);
}
//dd(\Config::get('services'));
@@ -81,23 +79,19 @@ class AuthController extends Controller
public function handleProviderCallback($provider)
{
try
{
try {
//notice we are not doing any validation, you should do it
$this->changeRedirect();
$user = Socialite::driver($provider)->user();
if ($user)
{
if ($user) {
// stroing data to our use table and logging them in
$username = $user->getEmail();
$first_name = $user->getName();
if ($user->nickname)
{
if ($user->nickname) {
$username = $user->nickname;
}
if (!$first_name)
{
if (!$first_name) {
$first_name = $username;
}
$data = [
@@ -108,21 +102,17 @@ class AuthController extends Controller
'active' => 1,
];
$user = User::where('email', $data['email'])->first();
if (!$user)
{
if (!$user) {
$user = User::where('user_name', $data['user_name'])->first();
}
if (!$user)
{
if (!$user) {
$user = User::firstOrCreate($data);
}
Auth::login($user);
}
//after login redirecting to home page
return redirect('/');
}
catch (\Exception $ex)
{
} catch (\Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage());
}
}
@@ -139,19 +129,13 @@ class AuthController extends Controller
$email_mandatory = $settings->select('status')->where('option_name', '=', 'email_mandatory')->first();
//dd($settings->status);
\Event::fire(new \App\Events\FormRegisterEvent());
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');
}
elseif (Auth::user()->role == 'user')
{
} elseif (Auth::user()->role == 'user') {
// return view('auth.register');
}
}
else
{
} else {
return view('auth.register', compact('settings', 'email_mandatory'));
}
}
@@ -167,43 +151,30 @@ class AuthController extends Controller
public function postRegister(User $user, RegisterRequest $request, $api = false)
{
//dd($request->all());
try
{
try {
$request_array = $request->input();
$password = Hash::make($request->input('password'));
$user->password = $password;
$name = $request->input('full_name');
$user->first_name = $name;
if ($request_array['email'] == '')
{
if ($request_array['email'] == '') {
$user->email = null;
}
else
{
} else {
$user->email = $request->input('email');
}
if (!checkArray('mobile', $request_array))
{
if (!checkArray('mobile', $request_array)) {
$user->mobile = null;
}
else
{
} else {
$user->mobile = $request->input('mobile');
}
if (!checkArray('code', $request_array))
{
if (!checkArray('code', $request_array)) {
$user->country_code = 0;
}
else
{
} else {
$user->country_code = $request->input('code');
}
if (checkArray('username', $request_array))
{
if (checkArray('username', $request_array)) {
$user->user_name = checkArray('username', $request_array);
}
else
{
} else {
$user->user_name = $request->input('email');
}
$user->role = 'user';
@@ -215,51 +186,36 @@ class AuthController extends Controller
$sms = Plugin::select('status')->where('name', '=', 'SMS')->first();
// Event for login
\Event::fire(new \App\Events\LoginEvent($request));
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)]);
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)]);
}
if ($settings->status == 1 || $settings->status == '1')
{
if (count($sms) > 0)
{
if ($sms->status == 1 || $sms->status == '1')
{
if ($settings->status == 1 || $settings->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');
}
else
{
} else {
$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');
}
else
{
} else {
$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');
}
if ($api == true)
{
if ($api == true) {
return ['message' => $message12, 'user' => $user->toArray()];
}
return redirect('home')->with('success', $message12);
}
catch (\Exception $e)
{
if ($api == true)
{
} catch (\Exception $e) {
if ($api == true) {
throw new \Exception($e->getMessage());
}
return redirect()->back()->with('fails', $e->getMessage());
}
}
@@ -274,17 +230,14 @@ class AuthController extends Controller
public function accountActivate($token)
{
$user = User::where('remember_token', '=', $token)->first();
if ($user)
{
if ($user) {
$user->active = 1;
$user->remember_token = null;
$user->save();
$this->openTicketAfterVerification($user->id);
return redirect('/auth/login')->with('status', 'Acount activated. Login to start');
}
else
{
} else {
return redirect('/auth/login')->with('fails', 'Invalid Token');
}
}
@@ -300,15 +253,12 @@ class AuthController extends Controller
public function getMail($token, User $user)
{
$user = $user->where('remember_token', $token)->where('active', 0)->first();
if ($user)
{
if ($user) {
$user->active = 1;
$user->save();
return redirect('auth/login');
}
else
{
} else {
return redirect('auth/login');
}
}
@@ -321,26 +271,17 @@ class AuthController extends Controller
public function getLogin()
{
$directory = base_path();
if (file_exists($directory . DIRECTORY_SEPARATOR . '.env'))
{
if (Auth::user())
{
if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent')
{
if (file_exists($directory.DIRECTORY_SEPARATOR.'.env')) {
if (Auth::user()) {
if (Auth::user()->role == 'admin' || Auth::user()->role == 'agent') {
return \Redirect::route('dashboard');
}
elseif (Auth::user()->role == 'user')
{
} elseif (Auth::user()->role == 'user') {
return \Redirect::route('home');
}
}
else
{
} else {
return view('auth.login');
}
}
else
{
} else {
return Redirect::route('licence');
}
}
@@ -354,20 +295,16 @@ class AuthController extends Controller
*/
public function postLogin(LoginRequest $request)
{
try
{
try {
// dd($request->input());
\Event::fire('auth.login.event', []); //added 5/5/2016
// Set login attempts and login time
$value = $_SERVER['REMOTE_ADDR'];
$usernameinput = $request->input('email');
$password = $request->input('password');
if ($request->input('referer'))
{
if ($request->input('referer')) {
$referer = 'form';
}
else
{
} else {
$referer = '/';
}
$field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name';
@@ -375,14 +312,12 @@ class AuthController extends Controller
// If attempts > 3 and time < 30 minutes
$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]);
}
$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
return redirect()->back()
->withInput($request->only('email', 'remember'))
@@ -390,27 +325,22 @@ class AuthController extends Controller
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.not-registered'),
'referer' => $referer,]);
'referer' => $referer, ]);
}
//if user exists
$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
$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
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
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
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
return \Redirect::route('otp-verification')
->withInput($request->input())
@@ -418,33 +348,22 @@ class AuthController extends Controller
'referer' => $referer,
'name' => $check_active->first_name,
'number' => $check_active->mobile,
'code' => $check_active->country_code,]);
}
else
{
'code' => $check_active->country_code, ]);
} else {
goto a; //attenmpt login (be careful while using goto statements)
}
}
else
{
} else {
goto a; //attenmpt login (be careful while using goto statements)
}
}
else
{
} else {
goto a; //attenmpt login (be careful while using goto statements)
}
}
else
{
} else {
goto a; //attenmpt login (be careful while using goto statements)
}
}
else
{
} else {
// 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
return redirect()->back()
->withInput($request->only('email', 'remember'))
@@ -452,15 +371,12 @@ class AuthController extends Controller
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.this_account_is_currently_inactive'),
'referer' => $referer,]);
}
else
{
'referer' => $referer, ]);
} else {
// try login
$loginAttempts = 1;
// If session has login attempts, retrieve attempts counter and attempts time
if (\Session::has('loginAttempts'))
{
if (\Session::has('loginAttempts')) {
$loginAttempts = \Session::get('loginAttempts');
$loginAttemptTime = \Session::get('loginAttemptTime');
$this->addLoginAttempt($value, $usernameinput);
@@ -469,38 +385,29 @@ class AuthController extends Controller
$password = $request->input('password');
$field = filter_var($usernameinput, FILTER_VALIDATE_EMAIL) ? 'email' : 'user_name';
// 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);
}
// 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('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('loginAttemptTime', time());
$this->clearLoginAttempts($value, $usernameinput);
}
// If auth ok, redirect to restricted area
\Session::put('loginAttempts', $loginAttempts + 1);
if (Auth::Attempt([$field => $usernameinput, 'password' => $password], $request->has('remember')))
{
if (Auth::user()->role == 'user')
{
if ($request->input('referer'))
{
if (Auth::Attempt([$field => $usernameinput, 'password' => $password], $request->has('remember'))) {
if (Auth::user()->role == 'user') {
if ($request->input('referer')) {
return \Redirect::route($request->input('referer'));
}
return \Redirect::route('/');
}
else
{
} else {
return redirect()->intended($this->redirectPath());
}
}
@@ -513,11 +420,9 @@ class AuthController extends Controller
'email' => $this->getFailedLoginMessage(),
'password' => $this->getFailedLoginMessage(),
])->with(['error' => Lang::get('lang.invalid'),
'referer' => $referer,]);
'referer' => $referer, ]);
// Increment login attempts
}
catch (\Exception $e)
{
} catch (\Exception $e) {
return redirect()->back()->with('fails', $e->getMessage());
}
}
@@ -535,22 +440,16 @@ class AuthController extends Controller
$data = $result;
$security = Security::whereId('1')->first();
$apt = $security->backlist_threshold;
if ($data)
{
if ($data) {
$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::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::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::table('login_attempts')->update(['Attempts' => 1, 'User' => $field, 'IP' => $value, 'LastLogin' => date('Y-m-d H:i:s')]);
}
@@ -583,22 +482,17 @@ class AuthController extends Controller
$time = $security->lockout_period;
$max_attempts = $security->backlist_threshold;
$table = 'login_attempts';
$result = DB::select('SELECT Attempts, (CASE when LastLogin is not NULL and DATE_ADD(LastLogin, INTERVAL ' . $time . ' MINUTE)>NOW() then 1 else 0 end) as Denied ' .
' FROM ' . $table . " WHERE IP = '$value' OR User = '$field'");
$result = DB::select('SELECT Attempts, (CASE when LastLogin is not NULL and DATE_ADD(LastLogin, INTERVAL '.$time.' MINUTE)>NOW() then 1 else 0 end) as Denied '.
' FROM '.$table." WHERE IP = '$value' OR User = '$field'");
$data = $result;
//Verify that at least one login attempt is in database
if (!$data)
{
if (!$data) {
return 0;
}
if ($data[0]->Attempts >= $max_attempts)
{
if ($data[0]->Denied == 1)
{
if ($data[0]->Attempts >= $max_attempts) {
if ($data[0]->Denied == 1) {
return 1;
}
else
{
} else {
$this->clearLoginAttempts($value, $field);
return 0;
@@ -627,12 +521,9 @@ class AuthController extends Controller
*/
public function getVerifyOTP()
{
if (\Session::has('values'))
{
if (\Session::has('values')) {
return view('auth.otp-verify');
}
else
{
} else {
return redirect('auth/login');
}
}
@@ -649,32 +540,23 @@ class AuthController extends Controller
$user = User::select('id', 'mobile', 'user_name')->where('email', '=', $request->input('email'))
->orWhere('user_name', '=', $request->input('email'))->first();
$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');
}
else
{
} else {
$otp = Otp::select('otp', 'updated_at')->where('user_id', '=', $user->id)
->first();
if ($otp != null)
{
if (($otp_length == 6 && !preg_match('/[a-z]/i', $request->input('otp'))))
{
if ($otp != null) {
if (($otp_length == 6 && !preg_match('/[a-z]/i', $request->input('otp')))) {
$otp2 = Hash::make($request->input('otp'));
$date1 = date_format($otp->updated_at, 'Y-m-d h:i:sa');
$date2 = date('Y-m-d h:i:sa');
$time1 = new DateTime($date2);
$time2 = new DateTime($date1);
$interval = $time1->diff($time2);
if ($interval->i > 30 || $interval->h > 0)
{
if ($interval->i > 30 || $interval->h > 0) {
$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)
->update(['otp' => '']);
User::where('id', '=', $user->id)
@@ -682,20 +564,14 @@ class AuthController extends Controller
$this->openTicketAfterVerification($user->id);
return $this->postLogin($request);
}
else
{
} else {
$message = Lang::get('lang.otp-not-matched');
}
}
}
else
{
} else {
$message = Lang::get('lang.otp-invalid');
}
}
else
{
} else {
$message = Lang::get('lang.otp-not-matched');
}
}
@@ -705,28 +581,22 @@ class AuthController extends Controller
->with(['values' => $request->input(),
'number' => $user->mobile,
'name' => $user->user_name,
'fails' => $message,]);
'fails' => $message, ]);
}
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');
return $message;
}
else
{
} else {
$sms = DB::table('sms')->get();
if (count($sms) > 0)
{
if (count($sms) > 0) {
\Event::fire(new \App\Events\LoginEvent($request));
return 1;
}
else
{
} else {
$message = Lang::get('lang.opt-can-not-be-verified');
return $message;
@@ -751,10 +621,8 @@ class AuthController extends Controller
->get();
Tickets::where(['user_id' => $id, 'status' => 6])
->update(['status' => 1]);
if ($ticket != null)
{
foreach ($ticket as $value)
{
if ($ticket != null) {
foreach ($ticket as $value) {
$ticket_id = $value->id;
Ticket_Thread::where('ticket_id', '=', $ticket_id)
->update(['updated_at' => date('Y-m-d H:i:s')]);
@@ -765,7 +633,7 @@ class AuthController extends Controller
public function changeRedirect()
{
$provider = \Session::get('provider');
$url = \Session::get($provider . 'redirect');
$url = \Session::get($provider.'redirect');
\Config::set("services.$provider.redirect", $url);
}
@@ -773,8 +641,7 @@ class AuthController extends Controller
{
$url = url($redirect);
\Session::set('provider', $provider);
\Session::set($provider . 'redirect', $url);
\Session::set($provider.'redirect', $url);
$this->changeRedirect();
}
}

1
app/Http/Controllers/Client/helpdesk/GuestController.php
View File

@@ -237,6 +237,7 @@ class GuestController extends Controller
//echo $user->password;
if (Hash::check($request->input('old_password'), $user->getAuthPassword())) {
$user->password = Hash::make($request->input('new_password'));
try {
$user->save();

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

@@ -94,6 +94,7 @@ class UnAuthController extends Controller
$ticket_token->token = $hashed_token;
$ticket_token->save();
}
try {
$this->PhpMailController->sendmail(
$from = $this->PhpMailController->mailfrom('1', '0'), $to = ['name' => $username, 'email' => $user_details->email], $message = ['subject' => 'Ticket link Request ['.$ticket_number.']', 'scenario' => 'check-ticket'], $template_variables = ['user' => $username, 'ticket_link_with_number' => url('show-ticket/'.$ticket->id.'/'.$token)]
@@ -270,6 +271,7 @@ class UnAuthController extends Controller
} else {
$from_email = $sending_emails->id;
}
try {
$this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('0', $tickets->dept_id), $to = ['name' => $user_name, 'email' => $email], $message = ['subject' => $ticket_subject.'[#'.$ticket_number.']', 'scenario' => 'close-ticket'], $template_variables = ['ticket_number' => $ticket_number]);
} catch (\Exception $e) {

3
app/Http/Controllers/Common/ApiSettings.php
View File

@@ -51,6 +51,7 @@ class ApiSettings extends Controller
$this->validate($request, [
'ticket_detail' => 'url',
]);
try {
// dd($request->input());
DB::table('settings_system')
@@ -91,6 +92,7 @@ class ApiSettings extends Controller
$this->postHook($data);
} catch (Exception $ex) {
dd($ex);
throw new Exception($ex->getMessage());
}
}
@@ -106,6 +108,7 @@ class ApiSettings extends Controller
}
} catch (Exception $ex) {
dd($ex);
throw new Exception($ex->getMessage());
}
}

6
app/Http/Controllers/Common/SettingsController.php
View File

@@ -120,6 +120,7 @@ class SettingsController extends Controller
$widget = $widgets->where('id', '=', $id)->first();
$widget->title = $request->title;
$widget->value = $request->content;
try {
$widget->save();
@@ -198,6 +199,7 @@ class SettingsController extends Controller
$widget = $widgets->where('id', '=', $id)->first();
$widget->title = $request->title;
$widget->value = $request->content;
try {
$widget->save();
@@ -234,6 +236,7 @@ class SettingsController extends Controller
$data->name = $request->input('name');
$data->email = $request->input('email');
$data->password = Crypt::encrypt($request->input('password'));
try {
$data->save();
@@ -257,6 +260,7 @@ class SettingsController extends Controller
$pass = $request->input('password');
$password = Crypt::encrypt($pass);
$settings->password = $password;
try {
$settings->save();
} catch (Exception $e) {
@@ -270,6 +274,7 @@ class SettingsController extends Controller
$settings->logo = $fileName;
$settings->save();
}
try {
$settings->fill($request->except('logo', 'password'))->save();
@@ -364,6 +369,7 @@ class SettingsController extends Controller
public function PostPlugins(Request $request)
{
$this->validate($request, ['plugin' => 'required|mimes:application/zip,zip,Zip']);
try {
if (!extension_loaded('zip')) {
throw new Exception('Please enable zip extension in your php');

3
app/Http/Controllers/Installer/helpdesk/InstallController.php
View File

@@ -364,7 +364,7 @@ class InstallController extends Controller
$datacontent = File::get($install);
$datacontent = str_replace('%0%', $value, $datacontent);
File::put($install, $datacontent);
// setting email settings in route
// setting email settings in route
$smtpfilepath = "\App\Http\Controllers\Common\SettingsController::smtp()";
$link = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
@@ -375,6 +375,7 @@ class InstallController extends Controller
$datacontent2 = str_replace('http://localhost', $link, $datacontent2);
File::put($app_url, $datacontent2);
$language = Cache::get('language');
try {
Cache::flush();

1
app/Http/Controllers/Job/MailController.php
View File

@@ -43,6 +43,7 @@ class MailController extends Controller
public function getServiceForm($short_name)
{
$form = '';
try {
switch ($short_name) {
case 'smtp':

1
app/Http/Requests/helpdesk/TicketRequest.php
View File

@@ -29,6 +29,7 @@ class TicketRequest extends Request
public function rules()
{
$error = '';
try {
$size = $this->size();
if ($size > 800 || $size == 0) {

6
app/Http/routes.php
View File

@@ -494,11 +494,11 @@ Route::group(['middleware' => ['web']], function () {
Route::get('check_ticket/{id}', ['as' => 'check_ticket', 'uses' => 'Client\helpdesk\GuestController@get_ticket_email']); //detail ticket information
// show ticket via have a ticket
// show ticket via have a ticket
Route::get('show-ticket/{id}/{code}', ['as' => 'show.ticket', 'uses' => 'Client\helpdesk\UnAuthController@showTicketCode']); //detail ticket information
//testing ckeditor
//===================================================================================
//===================================================================================
Route::group(['middleware' => 'role.user', 'middleware' => 'auth'], function () {
Route::get('client-profile', ['as' => 'client.profile', 'uses' => 'Client\helpdesk\GuestController@getProfile']); /* User profile get */
@@ -511,7 +511,7 @@ Route::group(['middleware' => ['web']], function () {
Route::post('verify-client-number2', ['as' => 'post-client-verify-number', 'uses' => 'Client\helpdesk\GuestController@verifyOTP']);
});
//====================================================================================
//====================================================================================
Route::get('checkticket', 'Client\helpdesk\ClientTicketController@getCheckTicket'); /* Check your Ticket */
Route::get('myticket', ['as' => 'ticket', 'uses' => 'Client\helpdesk\GuestController@getMyticket']); /* Get my tickets */
Route::get('myticket/{id}', ['as' => 'ticket', 'uses' => 'Client\helpdesk\GuestController@thread']); /* Get my tickets */

2
config/app.php
View File

@@ -188,8 +188,6 @@ return [
App\FaveoStorage\StorageServiceProvider::class,
Yajra\Datatables\DatatablesServiceProvider::class,
],
/*
|--------------------------------------------------------------------------

1
public/ckeditor/samples/old/assets/posteddata.php
View File

@@ -41,7 +41,6 @@ if (!empty($_POST)) {
<td><pre class="samples"><?php echo $value; ?></pre></td>
</tr>
<?php
}
}
?>