" - . "" . $lastThread->user->user_name . "(" . $lastThread->poster . ")" - . $lastThread->purify() . "
"; + + return ''.$firstThread->user->user_name.' ('.$firstThread->poster.')' + .$firstThread->purify().'
' + .''.$lastThread->user->user_name.'('.$lastThread->poster.')' + .$lastThread->purify().'
'; } //Auto-close tickets - public function autoCloseTickets() { + public function autoCloseTickets() + { $workflow = \App\Model\helpdesk\Workflow\WorkflowClose::whereId(1)->first(); if ($workflow->condition == 1) { @@ -2499,7 +2606,7 @@ class TicketController extends Controller { // $sla_plan = Sla_plan::where('id', '=', $overdue->sla)->first(); $ovadate = $overdue->created_at; - $new_date = date_add($ovadate, date_interval_create_from_date_string($workflow->days . ' days')) . '
'; + $new_date = date_add($ovadate, date_interval_create_from_date_string($workflow->days.' days')).'
'; if (date('Y-m-d H:i:s') > $new_date) { $i++; $overdue->status = 3; @@ -2519,20 +2626,22 @@ class TicketController extends Controller { // } } } else { - } } /** * @category function to chech if user verifcaition required for creating tickets or not + * * @param null + * * @return int 0/1 */ - public function checkUserVerificationStatus() { + public function checkUserVerificationStatus() + { $status = CommonSettings::select('status') ->where('option_name', '=', 'send_otp') ->first(); - if ($status->status == 0 || $status->status == "0") { + if ($status->status == 0 || $status->status == '0') { return 1; } else { return 0; @@ -2540,14 +2649,17 @@ class TicketController extends Controller { } /** - * This function is used for auto filling in new ticket + * This function is used for auto filling in new ticket. + * * @return type view */ - public function autofill() { + public function autofill() + { return view('themes.default1.agent.helpdesk.ticket.getautocomplete'); } - public function pdfThread($threadid) { + public function pdfThread($threadid) + { try { $threads = new Ticket_Thread(); $thread = $threads->leftJoin('tickets', 'ticket_thread.ticket_id', '=', 'tickets.id') @@ -2563,64 +2675,80 @@ class TicketController extends Controller { $ticket = Tickets::where('id', $thread->ticket_id)->first(); $html = view('themes.default1.agent.helpdesk.ticket.thread-pdf', compact('thread', 'system', 'company', 'ticket'))->render(); $html1 = mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'); + return PDF::load($html1)->show(); } catch (Exception $ex) { return redirect()->back()->with('fails', $ex->getMessage()); } } - public static function getSourceByname($name) { + public static function getSourceByname($name) + { $sources = new Ticket_source(); $source = $sources->where('name', $name)->first(); + return $source; } - public static function getSourceById($sourceid) { + public static function getSourceById($sourceid) + { $sources = new Ticket_source(); $source = $sources->where('id', $sourceid)->first(); + return $source; } - public static function getSourceCssClass($sourceid) { - $css = "fa fa-comment"; + public static function getSourceCssClass($sourceid) + { + $css = 'fa fa-comment'; $source = self::getSourceById($sourceid); if ($source) { $css = $source->css_class; } + return $css; } - public function getSystemDefaultHelpTopic() { + public function getSystemDefaultHelpTopic() + { $ticket_settings = new \App\Model\helpdesk\Settings\Ticket(); $ticket_setting = $ticket_settings->find(1); $help_topicid = $ticket_setting->help_topic; + return $help_topicid; } - public function getSystemDefaultSla() { + public function getSystemDefaultSla() + { $ticket_settings = new \App\Model\helpdesk\Settings\Ticket(); $ticket_setting = $ticket_settings->find(1); $sla = $ticket_setting->sla; + return $sla; } - public function getSystemDefaultPriority() { + public function getSystemDefaultPriority() + { $ticket_settings = new \App\Model\helpdesk\Settings\Ticket(); $ticket_setting = $ticket_settings->find(1); $priority = $ticket_setting->priority; + return $priority; } - public function getSystemDefaultDepartment() { + public function getSystemDefaultDepartment() + { $systems = new \App\Model\helpdesk\Settings\System(); $system = $systems->find(1); $department = $system->department; + return $department; } - public function findTicketFromTicketCreateUser($result = []) { + public function findTicketFromTicketCreateUser($result = []) + { $ticket_number = $this->checkArray('0', $result); - if ($ticket_number !== "") { + if ($ticket_number !== '') { $tickets = new \App\Model\helpdesk\Ticket\Tickets(); $ticket = $tickets->where('ticket_number', $ticket_number)->first(); if ($ticket) { @@ -2629,29 +2757,36 @@ class TicketController extends Controller { } } - public function findUserFromTicketCreateUserId($result = []) { + public function findUserFromTicketCreateUserId($result = []) + { $ticket = $this->findTicketFromTicketCreateUser($result); if ($ticket) { $userid = $ticket->user_id; + return $userid; } } - public function checkArray($key, $array) { - $value = ""; + public function checkArray($key, $array) + { + $value = ''; if (array_key_exists($key, $array)) { $value = $array[$key]; } + return $value; } - public function getAdmin() { + public function getAdmin() + { $users = new \App\User(); $admin = $users->where('role', 'admin')->first(); + return $admin; } - public function attachmentSeperateOld($attach) { + public function attachmentSeperateOld($attach) + { $attacment = []; if ($attach != null) { $size = count($attach); @@ -2664,10 +2799,12 @@ class TicketController extends Controller { $attacment[$i]['mime'] = $mime; } } + return $attacment; } - public function attachmentSeperate($thread_id) { + public function attachmentSeperate($thread_id) + { if ($thread_id) { $array = []; $attachment = new Ticket_attachments(); @@ -2679,77 +2816,84 @@ class TicketController extends Controller { $array[$key]['mime'] = $attach->type; $array[$key]['mode'] = 'data'; } + return $array; } } } /** - * * @return type */ - public function followupTicketList() { + public function followupTicketList() + { try { $table = \Datatable::table() ->addColumn( - "", Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at')) + '', Lang::get('lang.subject'), Lang::get('lang.ticket_id'), Lang::get('lang.priority'), Lang::get('lang.from'), Lang::get('lang.assigned_to'), Lang::get('lang.last_activity'), Lang::get('lang.created-at')) ->noScript(); + return view('themes.default1.agent.helpdesk.followup.followup', compact('table')); } catch (Exception $e) { return Redirect()->back()->with('fails', $e->getMessage()); } } - public static function getSubject($subject) { + public static function getSubject($subject) + { //$subject = $this->attributes['title']; $array = imap_mime_header_decode($subject); - $title = ""; + $title = ''; if (is_array($array) && count($array) > 0) { foreach ($array as $text) { $title .= $text->text; } + return wordwrap($title, 70, "
\n"); } + return wordwrap($subject, 70, "
\n"); } - public function replyContent($content) { + public function replyContent($content) + { preg_match_all('/
$model->name
"; $email = "
$model->email
"; $website = "
$model->website
"; + return $name.$email.$website; }) - + ->addColumn('comment', function ($model) { - $created = TicketController::usertimezone(date($model->created_at)); + $created = TicketController::usertimezone(date($model->created_at)); + return $model->comment."
$created
"; }) ->addColumn('status', function ($model) { @@ -159,7 +161,7 @@ class SettingsController extends Controller return ''.\Lang::get('lang.not_published'); } }) - + ->addColumn('Actions', function ($model) { return '
';
})
diff --git a/app/Http/Controllers/Api/v1/ApiController.php b/app/Http/Controllers/Api/v1/ApiController.php
index 949693d2d..6878c510c 100644
--- a/app/Http/Controllers/Api/v1/ApiController.php
+++ b/app/Http/Controllers/Api/v1/ApiController.php
@@ -2,9 +2,10 @@
namespace App\Http\Controllers\Api\v1;
+use App\Http\Controllers\Agent\helpdesk\TicketController as CoreTicketController;
use App\Http\Controllers\Controller;
-use App\Http\Requests\helpdesk\TicketRequest;
//use Illuminate\Support\Facades\Request as Value;
+use App\Http\Requests\helpdesk\TicketRequest;
use App\Model\helpdesk\Agent\Department;
use App\Model\helpdesk\Agent\Teams;
use App\Model\helpdesk\Manage\Help_topic;
@@ -20,7 +21,6 @@ use Exception;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
-use App\Http\Controllers\Agent\helpdesk\TicketController as CoreTicketController;
/**
* -----------------------------------------------------------------------------
@@ -34,8 +34,8 @@ use App\Http\Controllers\Agent\helpdesk\TicketController as CoreTicketController
*
* @version v1
*/
-class ApiController extends Controller {
-
+class ApiController extends Controller
+{
public $user;
public $request;
public $ticket;
@@ -55,7 +55,8 @@ class ApiController extends Controller {
/**
* @param Request $request
*/
- public function __construct(Request $request) {
+ public function __construct(Request $request)
+ {
$this->request = $request;
$this->middleware('jwt.auth');
@@ -64,9 +65,7 @@ class ApiController extends Controller {
$user = \JWTAuth::parseToken()->authenticate();
$this->user = $user;
} catch (\Tymon\JWTAuth\Exceptions\TokenExpiredException $e) {
-
} catch (\Tymon\JWTAuth\Exceptions\JWTException $e) {
-
}
$ticket = new TicketController();
@@ -121,7 +120,8 @@ class ApiController extends Controller {
*
* @return json
*/
- public function createTicket(\App\Http\Requests\helpdesk\CreateTicketRequest $request, \App\Model\helpdesk\Utility\CountryCode $code) {
+ public function createTicket(\App\Http\Requests\helpdesk\CreateTicketRequest $request, \App\Model\helpdesk\Utility\CountryCode $code)
+ {
try {
$user_id = $this->request->input('user_id');
@@ -148,7 +148,7 @@ class ApiController extends Controller {
$PhpMailController = new \App\Http\Controllers\Common\PhpMailController();
$NotificationController = new \App\Http\Controllers\Common\NotificationController();
$core = new CoreTicketController($PhpMailController, $NotificationController);
- $response = $core->post_newticket($request, $code,true);
+ $response = $core->post_newticket($request, $code, true);
//$response = $this->ticket->createTicket($user_id, $subject, $body, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $form_data, $attach);
//return $response;
/*
@@ -179,11 +179,12 @@ class ApiController extends Controller {
*
* @return json
*/
- public function ticketReply() {
+ public function ticketReply()
+ {
//dd($this->request->all());
try {
$v = \Validator::make($this->request->all(), [
- 'ticket_ID' => 'required|exists:tickets,id',
+ 'ticket_ID' => 'required|exists:tickets,id',
'reply_content' => 'required',
]);
if ($v->fails()) {
@@ -193,9 +194,10 @@ class ApiController extends Controller {
}
$attach = $this->request->input('attachments');
$result = $this->ticket->reply($this->thread, $this->request, $this->attach, $attach);
- $result = $result->join('users','ticket_thread.user_id','=','users.id')
- ->select('ticket_thread.*','users.first_name as first_name')
+ $result = $result->join('users', 'ticket_thread.user_id', '=', 'users.id')
+ ->select('ticket_thread.*', 'users.first_name as first_name')
->first();
+
return response()->json(compact('result'));
} catch (\Exception $e) {
$error = $e->getMessage();
@@ -215,14 +217,15 @@ class ApiController extends Controller {
*
* @return json
*/
- public function editTicket() {
+ public function editTicket()
+ {
try {
$v = \Validator::make($this->request->all(), [
- 'ticket_id' => 'required|exists:tickets,id',
- 'subject' => 'required',
- 'sla_plan' => 'required|exists:sla_plan,id',
- 'help_topic' => 'required|exists:help_topic,id',
- 'ticket_source' => 'required|exists:ticket_source,id',
+ 'ticket_id' => 'required|exists:tickets,id',
+ 'subject' => 'required',
+ 'sla_plan' => 'required|exists:sla_plan,id',
+ 'help_topic' => 'required|exists:help_topic,id',
+ 'ticket_source' => 'required|exists:ticket_source,id',
'ticket_priority' => 'required|exists:ticket_priority,priority_id',
]);
if ($v->fails()) {
@@ -252,7 +255,8 @@ class ApiController extends Controller {
*
* @return json
*/
- public function deleteTicket() {
+ public function deleteTicket()
+ {
try {
$v = \Validator::make($this->request->all(), [
'ticket_id' => 'required|exists:tickets,id',
@@ -285,15 +289,16 @@ class ApiController extends Controller {
*
* @return json
*/
- public function openedTickets() {
+ public function openedTickets()
+ {
try {
// $result = $this->model->where('status', '=', 1)->where('isanswered', '=', 0)->where('assigned_to', '=', null)->orderBy('id', 'DESC')->get();
// return response()->json(compact('result'));
$result = $this->user->join('tickets', function ($join) {
- $join->on('users.id', '=', 'tickets.user_id')
+ $join->on('users.id', '=', 'tickets.user_id')
->where('isanswered', '=', 0)->where('status', '=', 1)->whereNull('assigned_to');
- })
+ })
->join('department', 'department.id', '=', 'tickets.dept_id')
->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -329,16 +334,17 @@ class ApiController extends Controller {
*
* @return json
*/
- public function unassignedTickets() {
+ public function unassignedTickets()
+ {
try {
//dd('sdhjbc');
// $result = $this->model->where('assigned_to', '=', null)->where('status', '1')->orderBy('id', 'DESC')->get();
// return response()->json(compact('result'));
$user = \JWTAuth::parseToken()->authenticate();
$unassigned = $this->user->join('tickets', function ($join) {
- $join->on('users.id', '=', 'tickets.user_id')
+ $join->on('users.id', '=', 'tickets.user_id')
->whereNull('assigned_to')->where('status', '=', 1);
- })
+ })
->join('department', 'department.id', '=', 'tickets.dept_id')
->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -349,7 +355,7 @@ class ApiController extends Controller {
->whereNotNull('title');
})
->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
- ->where(function($query) use($user) {
+ ->where(function ($query) use ($user) {
if ($user->role != 'admin') {
$query->where('tickets.dept_id', '=', $user->primary_dpt);
}
@@ -379,15 +385,16 @@ class ApiController extends Controller {
*
* @return json
*/
- public function closeTickets() {
+ public function closeTickets()
+ {
try {
// $result = $this->model->where('status', '>', 1)->where('status', '<', 4)->orderBy('id', 'DESC')->get();
// return response()->json(compact('result'));
$user = \JWTAuth::parseToken()->authenticate();
$result = $this->user->join('tickets', function ($join) {
- $join->on('users.id', '=', 'tickets.user_id')
+ $join->on('users.id', '=', 'tickets.user_id')
->where('status', '=', 3)->orWhere('status', '=', 2);
- })
+ })
->join('department', 'department.id', '=', 'tickets.dept_id')
->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -398,7 +405,7 @@ class ApiController extends Controller {
->whereNotNull('title');
})
->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
- ->where(function($query) use($user) {
+ ->where(function ($query) use ($user) {
if ($user->role != 'admin') {
$query->where('tickets.dept_id', '=', $user->primary_dpt);
}
@@ -428,7 +435,8 @@ class ApiController extends Controller {
*
* @return json
*/
- public function getAgents() {
+ public function getAgents()
+ {
try {
$result = $this->faveoUser->where('role', 'agent')->orWhere('role', 'admin')->where('active', 1)->get();
@@ -451,7 +459,8 @@ class ApiController extends Controller {
*
* @return json
*/
- public function getTeams() {
+ public function getTeams()
+ {
try {
$result = $this->team->get();
@@ -474,11 +483,12 @@ class ApiController extends Controller {
*
* @return json
*/
- public function assignTicket() {
+ public function assignTicket()
+ {
try {
$v = \Validator::make($this->request->all(), [
'ticket_id' => 'required',
- 'user' => 'required',
+ 'user' => 'required',
]);
if ($v->fails()) {
$error = $v->errors();
@@ -512,7 +522,8 @@ class ApiController extends Controller {
*
* @return json
*/
- public function getCustomers() {
+ public function getCustomers()
+ {
try {
$v = \Validator::make($this->request->all(), [
'search' => 'required',
@@ -523,7 +534,7 @@ class ApiController extends Controller {
return response()->json(compact('error'));
}
$search = $this->request->input('search');
- $result = $this->faveoUser->where('first_name', 'like', '%' . $search . '%')->orWhere('last_name', 'like', '%' . $search . '%')->orWhere('user_name', 'like', '%' . $search . '%')->orWhere('email', 'like', '%' . $search . '%')->get();
+ $result = $this->faveoUser->where('first_name', 'like', '%'.$search.'%')->orWhere('last_name', 'like', '%'.$search.'%')->orWhere('user_name', 'like', '%'.$search.'%')->orWhere('email', 'like', '%'.$search.'%')->get();
return response()->json(compact('result'))
->header('X-Header-One', 'Header Value');
@@ -546,7 +557,8 @@ class ApiController extends Controller {
*
* @return json
*/
- public function getCustomersWith() {
+ public function getCustomersWith()
+ {
try {
$users = $this->user
->leftJoin('user_assign_organization', 'user_assign_organization.user_id', '=', 'users.id')
@@ -577,7 +589,8 @@ class ApiController extends Controller {
*
* @return json
*/
- public function getCustomer() {
+ public function getCustomer()
+ {
try {
$v = \Validator::make($this->request->all(), [
'user_id' => 'required',
@@ -609,7 +622,8 @@ class ApiController extends Controller {
*
* @return json
*/
- public function searchTicket() {
+ public function searchTicket()
+ {
try {
$v = \Validator::make($this->request->all(), [
'search' => 'required',
@@ -620,7 +634,7 @@ class ApiController extends Controller {
return response()->json(compact('error'));
}
$search = $this->request->input('search');
- $result = $this->thread->select('ticket_id')->where('title', 'like', '%' . $search . '%')->orWhere('body', 'like', '%' . $search . '%')->get();
+ $result = $this->thread->select('ticket_id')->where('title', 'like', '%'.$search.'%')->orWhere('body', 'like', '%'.$search.'%')->get();
return response()->json(compact('result'));
} catch (Exception $e) {
@@ -641,7 +655,8 @@ class ApiController extends Controller {
*
* @return json
*/
- public function ticketThreads() {
+ public function ticketThreads()
+ {
try {
$v = \Validator::make($this->request->all(), [
'id' => 'required',
@@ -678,7 +693,8 @@ class ApiController extends Controller {
*
* @return json
*/
- public function checkUrl() {
+ public function checkUrl()
+ {
//dd($this->request);
try {
$v = \Validator::make($this->request->all(), [
@@ -695,7 +711,7 @@ class ApiController extends Controller {
$url = str_finish($url, '/');
}
- $url = $url . '/api/v1/helpdesk/check-url?api_key=' . $this->request->input('api_key') . '&token=' . \Config::get('app.token');
+ $url = $url.'/api/v1/helpdesk/check-url?api_key='.$this->request->input('api_key').'&token='.\Config::get('app.token');
$result = $this->CallGetApi($url);
//dd($result);
return response()->json(compact('result'));
@@ -715,7 +731,8 @@ class ApiController extends Controller {
*
* @return string
*/
- public function urlResult() {
+ public function urlResult()
+ {
return 'success';
}
@@ -726,7 +743,8 @@ class ApiController extends Controller {
*
* @return type int|string|json
*/
- public function callGetApi($url) {
+ public function callGetApi($url)
+ {
$curl = curl_init($url);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curl, CURLOPT_URL, $url);
@@ -735,7 +753,7 @@ class ApiController extends Controller {
$response = curl_exec($curl);
if (curl_errno($curl)) {
- echo 'error:' . curl_error($curl);
+ echo 'error:'.curl_error($curl);
}
return $response;
@@ -750,7 +768,8 @@ class ApiController extends Controller {
*
* @return type int|string|json
*/
- public function callPostApi($url, $data) {
+ public function callPostApi($url, $data)
+ {
$curl = curl_init($url);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curl, CURLOPT_URL, $url);
@@ -760,7 +779,7 @@ class ApiController extends Controller {
$response = curl_exec($curl);
if (curl_errno($curl)) {
- echo 'error:' . curl_error($curl);
+ echo 'error:'.curl_error($curl);
}
return $response;
@@ -772,7 +791,8 @@ class ApiController extends Controller {
*
* @return type | json
*/
- public function generateApiKey() {
+ public function generateApiKey()
+ {
try {
$set = $this->setting->where('id', '1')->first();
//dd($set);
@@ -806,7 +826,8 @@ class ApiController extends Controller {
*
* @return json
*/
- public function getHelpTopic() {
+ public function getHelpTopic()
+ {
try {
$result = $this->helptopic->get();
@@ -829,7 +850,8 @@ class ApiController extends Controller {
*
* @return json
*/
- public function getSlaPlan() {
+ public function getSlaPlan()
+ {
try {
$result = $this->slaPlan->get();
@@ -852,7 +874,8 @@ class ApiController extends Controller {
*
* @return json
*/
- public function getPriority() {
+ public function getPriority()
+ {
try {
$result = $this->priority->get();
@@ -875,7 +898,8 @@ class ApiController extends Controller {
*
* @return json
*/
- public function getDepartment() {
+ public function getDepartment()
+ {
try {
$result = $this->department->get();
@@ -898,7 +922,8 @@ class ApiController extends Controller {
*
* @return type json
*/
- public function getTickets() {
+ public function getTickets()
+ {
try {
$tickets = $this->model->orderBy('created_at', 'desc')->paginate(10);
$tickets->toJson();
@@ -922,13 +947,14 @@ class ApiController extends Controller {
*
* @return type json
*/
- public function inbox() {
+ public function inbox()
+ {
try {
$user = \JWTAuth::parseToken()->authenticate();
$inbox = $this->user->join('tickets', function ($join) {
- $join->on('users.id', '=', 'tickets.user_id')
+ $join->on('users.id', '=', 'tickets.user_id')
->where('status', '=', 1);
- })
+ })
->join('department', 'department.id', '=', 'tickets.dept_id')
->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -939,7 +965,7 @@ class ApiController extends Controller {
->whereNotNull('ticket_thread.title');
})
->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'ticket_thread.title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name', 'department.id as department_id', 'users.primary_dpt as user_dpt')
- ->where(function($query) use($user) {
+ ->where(function ($query) use ($user) {
if ($user->role != 'admin') {
$query->where('tickets.dept_id', '=', $user->primary_dpt);
}
@@ -949,6 +975,7 @@ class ApiController extends Controller {
->distinct()
->paginate(10)
->toJson();
+
return $inbox;
} catch (\Exception $ex) {
$error = $ex->getMessage();
@@ -968,12 +995,13 @@ class ApiController extends Controller {
*
* @return type json
*/
- public function internalNote() {
+ public function internalNote()
+ {
try {
$v = \Validator::make($this->request->all(), [
- 'userid' => 'required|exists:users,id',
+ 'userid' => 'required|exists:users,id',
'ticketid' => 'required|exists:tickets,id',
- 'body' => 'required',
+ 'body' => 'required',
]);
if ($v->fails()) {
$error = $v->errors();
@@ -1000,13 +1028,14 @@ class ApiController extends Controller {
}
}
- public function getTrash() {
+ public function getTrash()
+ {
try {
$user = \JWTAuth::parseToken()->authenticate();
$trash = $this->user->join('tickets', function ($join) {
- $join->on('users.id', '=', 'tickets.user_id')
+ $join->on('users.id', '=', 'tickets.user_id')
->where('status', '=', 5);
- })
+ })
->join('department', 'department.id', '=', 'tickets.dept_id')
->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -1017,7 +1046,7 @@ class ApiController extends Controller {
->whereNotNull('title');
})
->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'), 'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
- ->where(function($query) use($user) {
+ ->where(function ($query) use ($user) {
if ($user->role != 'admin') {
$query->where('tickets.dept_id', '=', $user->primary_dpt);
}
@@ -1042,7 +1071,8 @@ class ApiController extends Controller {
}
}
- public function getMyTicketsAgent() {
+ public function getMyTicketsAgent()
+ {
try {
$v = \Validator::make($this->request->all(), [
'user_id' => 'required|exists:users,id',
@@ -1060,10 +1090,10 @@ class ApiController extends Controller {
}
//$user = \JWTAuth::parseToken()->authenticate();
$result = $this->user->join('tickets', function ($join) use ($id) {
- $join->on('users.id', '=', 'tickets.assigned_to')
+ $join->on('users.id', '=', 'tickets.assigned_to')
->where('status', '=', 1);
//->where('user_id', '=', $id);
- })
+ })
->join('department', 'department.id', '=', 'tickets.dept_id')
->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -1100,7 +1130,8 @@ class ApiController extends Controller {
}
}
- public function getMyTicketsUser() {
+ public function getMyTicketsUser()
+ {
try {
$v = \Validator::make($this->request->all(), [
'user_id' => 'required|exists:users,id',
@@ -1117,9 +1148,9 @@ class ApiController extends Controller {
return response()->json(compact('error'));
}
$result = $this->user->join('tickets', function ($join) use ($id) {
- $join->on('users.id', '=', 'tickets.user_id')
+ $join->on('users.id', '=', 'tickets.user_id')
->where('user_id', '=', $id);
- })
+ })
->join('department', 'department.id', '=', 'tickets.dept_id')
->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -1151,7 +1182,8 @@ class ApiController extends Controller {
}
}
- public function getTicketById() {
+ public function getTicketById()
+ {
try {
$v = \Validator::make($this->request->all(), [
'id' => 'required|exists:tickets,id',
@@ -1163,7 +1195,7 @@ class ApiController extends Controller {
}
$id = $this->request->input('id');
if (!$this->model->where('id', $id)->first()) {
- $error = 'There is no Ticket as ticket id: ' . $id;
+ $error = 'There is no Ticket as ticket id: '.$id;
return response()->json(compact('error'));
}
@@ -1171,44 +1203,43 @@ class ApiController extends Controller {
$join->on('users.id', '=', 'tickets.user_id')
->where('tickets.id', '=', $id);
});
-
-
+
$response = $this->differenciateHelpTopic($query)
- ->leftJoin('department','tickets.dept_id','=',"department.id")
- ->leftJoin('ticket_priority','tickets.priority_id','=','ticket_priority.priority_id')
- ->leftJoin('ticket_status','tickets.status','=','ticket_status.id')
- ->leftJoin('sla_plan','tickets.sla','=','sla_plan.id')
- ->leftJoin('ticket_source','tickets.source','=','ticket_source.id');
+ ->leftJoin('department', 'tickets.dept_id', '=', 'department.id')
+ ->leftJoin('ticket_priority', 'tickets.priority_id', '=', 'ticket_priority.priority_id')
+ ->leftJoin('ticket_status', 'tickets.status', '=', 'ticket_status.id')
+ ->leftJoin('sla_plan', 'tickets.sla', '=', 'sla_plan.id')
+ ->leftJoin('ticket_source', 'tickets.source', '=', 'ticket_source.id');
//$select = 'users.email','users.user_name','users.first_name','users.last_name','tickets.id','ticket_number','num_sequence','user_id','priority_id','sla','max_open_ticket','captcha','status','lock_by','lock_at','source','isoverdue','reopened','isanswered','is_deleted', 'closed','is_transfer','transfer_at','reopened_at','duedate','closed_at','last_message_at';
$result = $response->addSelect(
- 'users.email',
- 'users.user_name',
- 'users.first_name',
- 'users.last_name',
- 'tickets.id',
- 'ticket_number',
- 'user_id',
+ 'users.email',
+ 'users.user_name',
+ 'users.first_name',
+ 'users.last_name',
+ 'tickets.id',
+ 'ticket_number',
+ 'user_id',
'ticket_priority.priority_id',
'ticket_priority.priority as priority_name',
'department.name as dept_name',
'ticket_status.name as status_name',
'sla_plan.name as sla_name',
'ticket_source.name as source_name',
- 'sla_plan.id as sla',
- 'ticket_status.id as status',
- 'lock_by',
- 'lock_at',
- 'ticket_source.id as source',
- 'isoverdue',
- 'reopened',
- 'isanswered',
- 'is_deleted',
- 'closed',
- 'reopened_at',
- 'duedate',
- 'closed_at',
- 'tickets.created_at',
+ 'sla_plan.id as sla',
+ 'ticket_status.id as status',
+ 'lock_by',
+ 'lock_at',
+ 'ticket_source.id as source',
+ 'isoverdue',
+ 'reopened',
+ 'isanswered',
+ 'is_deleted',
+ 'closed',
+ 'reopened_at',
+ 'duedate',
+ 'closed_at',
+ 'tickets.created_at',
'tickets.updated_at')->first();
return response()->json(compact('result'));
@@ -1225,7 +1256,8 @@ class ApiController extends Controller {
}
}
- public function createPagination($array, $perPage) {
+ public function createPagination($array, $perPage)
+ {
try {
//Get current page form url e.g. &page=6
$currentPage = LengthAwarePaginator::resolveCurrentPage();
@@ -1253,7 +1285,8 @@ class ApiController extends Controller {
}
}
- public function collaboratorSearch() {
+ public function collaboratorSearch()
+ {
$this->validate($this->request, ['term' => 'required']);
try {
$emails = $this->ticket->autosearch();
@@ -1263,7 +1296,7 @@ class ApiController extends Controller {
foreach ($emails as $key => $email) {
$user_model = $user->where('email', $email)->first();
//return $user_model;
- $users[$key]['name'] = $user_model->first_name . ' ' . $user_model->last_name;
+ $users[$key]['name'] = $user_model->first_name.' '.$user_model->last_name;
$users[$key]['email'] = $email;
$users[$key]['avatar'] = $this->avatarUrl($email);
}
@@ -1280,12 +1313,13 @@ class ApiController extends Controller {
}
}
- public function avatarUrl($email) {
+ public function avatarUrl($email)
+ {
try {
$user = new User();
$user = $user->where('email', $email)->first();
if ($user->profile_pic) {
- $url = url('uploads/profilepic/' . $user->profile_pic);
+ $url = url('uploads/profilepic/'.$user->profile_pic);
} else {
$url = \Gravatar::src($email);
}
@@ -1297,10 +1331,11 @@ class ApiController extends Controller {
}
}
- public function addCollaboratorForTicket() {
+ public function addCollaboratorForTicket()
+ {
try {
$v = \Validator::make(\Input::get(), [
- 'email' => 'required|email|unique:users',
+ 'email' => 'required|email|unique:users',
'ticket_id' => 'required',
]
);
@@ -1327,7 +1362,8 @@ class ApiController extends Controller {
}
}
- public function getCollaboratorForTicket() {
+ public function getCollaboratorForTicket()
+ {
try {
$v = \Validator::make(\Input::get(), [
'ticket_id' => 'required',
@@ -1356,11 +1392,12 @@ class ApiController extends Controller {
}
}
- public function deleteCollaborator() {
+ public function deleteCollaborator()
+ {
try {
$v = \Validator::make(\Input::get(), [
'ticketid' => 'required',
- 'email' => 'required',
+ 'email' => 'required',
]
);
if ($v->fails()) {
@@ -1380,7 +1417,8 @@ class ApiController extends Controller {
}
}
- public function dependency() {
+ public function dependency()
+ {
try {
$department = $this->department->select('name', 'id')->get()->toArray();
$sla = $this->slaPlan->select('name', 'id')->get()->toArray();
@@ -1391,7 +1429,7 @@ class ApiController extends Controller {
$status = \DB::table('ticket_status')->select('name', 'id')->get();
$source = \DB::table('ticket_source')->select('name', 'id')->get();
$result = ['departments' => $department, 'sla' => $sla, 'staffs' => $staff, 'teams' => $team,
- 'priorities' => $priority, 'helptopics' => $helptopic, 'status' => $status, 'sources' => $source,];
+ 'priorities' => $priority, 'helptopics' => $helptopic, 'status' => $status, 'sources' => $source, ];
return response()->json(compact('result'));
} catch (\Exception $e) {
@@ -1403,7 +1441,8 @@ class ApiController extends Controller {
}
}
- public function differenciateHelpTopic($query) {
+ public function differenciateHelpTopic($query)
+ {
$ticket = $query->first();
$check = 'department';
if ($ticket) {
@@ -1417,16 +1456,18 @@ class ApiController extends Controller {
return $query->select('tickets.dept_id');
}
}
+
return $query;
}
- public function getSystem($check, $query) {
+ public function getSystem($check, $query)
+ {
switch ($check) {
case 'department':
return $query->select('tickets.dept_id');
case 'helpTopic':
return $query->select('tickets.help_topic_id');
- default :
+ default:
return $query->select('tickets.dept_id');
}
}
@@ -1438,10 +1479,11 @@ class ApiController extends Controller {
*
* @return type json
*/
- public function register(Request $request) {
+ public function register(Request $request)
+ {
try {
$v = \Validator::make($request->all(), [
- 'email' => 'required|email|unique:users',
+ 'email' => 'required|email|unique:users',
'password' => 'required|min:6',
]);
if ($v->fails()) {
@@ -1455,7 +1497,7 @@ class ApiController extends Controller {
$password = \Hash::make($request->input('password'));
$role = $request->input('role');
if ($auth->role == 'agent') {
- $role = "user";
+ $role = 'user';
}
$user = new User();
$user->password = $password;
@@ -1463,6 +1505,7 @@ class ApiController extends Controller {
$user->email = $email;
$user->role = $role;
$user->save();
+
return response()->json(compact('user'));
} catch (\Exception $e) {
$error = $e->getMessage();
@@ -1470,5 +1513,4 @@ class ApiController extends Controller {
return response()->json(compact('error'));
}
}
-
}
diff --git a/app/Http/Controllers/Api/v1/InstallerApiController.php b/app/Http/Controllers/Api/v1/InstallerApiController.php
index 60855d60b..a4d82c4b2 100644
--- a/app/Http/Controllers/Api/v1/InstallerApiController.php
+++ b/app/Http/Controllers/Api/v1/InstallerApiController.php
@@ -98,7 +98,7 @@ class InstallerApiController extends Controller
$ENV['QUEUE_DRIVER'] = 'sync';
$config = '';
-
+
foreach ($ENV as $key => $val) {
$config .= "{$key}={$val}\n";
}
diff --git a/app/Http/Controllers/Api/v1/TokenAuthController.php b/app/Http/Controllers/Api/v1/TokenAuthController.php
index c1974518e..f08d0346d 100644
--- a/app/Http/Controllers/Api/v1/TokenAuthController.php
+++ b/app/Http/Controllers/Api/v1/TokenAuthController.php
@@ -50,7 +50,7 @@ class TokenAuthController extends Controller
//$credentials = $request->only('email', 'password');
try {
- if (!$token = JWTAuth::attempt([$field => $usernameinput, 'password' => $password,'active'=>1])) {
+ if (!$token = JWTAuth::attempt([$field => $usernameinput, 'password' => $password, 'active'=>1])) {
return response()->json(['error' => 'invalid_credentials', 'status_code' => 401]);
}
} catch (JWTException $e) {
diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php
index 7d8093bba..971ebc449 100644
--- a/app/Http/Controllers/Auth/AuthController.php
+++ b/app/Http/Controllers/Auth/AuthController.php
@@ -3,31 +3,29 @@
namespace App\Http\Controllers\Auth;
// controllers
+use App\Http\Controllers\Admin\helpdesk\SocialMedia\SocialMediaController;
use App\Http\Controllers\Common\PhpMailController;
-use App\Http\Controllers\Common\SettingsController;
-use App\Http\Controllers\Controller;
// requests
+use App\Http\Controllers\Controller;
use App\Http\Requests\helpdesk\LoginRequest;
-use App\Http\Requests\helpdesk\RegisterRequest;
use App\Http\Requests\helpdesk\OtpVerifyRequest;
-use App\Model\helpdesk\Settings\Security;
+use App\Http\Requests\helpdesk\RegisterRequest;
use App\Model\helpdesk\Settings\CommonSettings;
-use App\Model\helpdesk\Ticket\Ticket_Thread;
-use App\Model\helpdesk\Ticket\Tickets;
use App\Model\helpdesk\Settings\Plugin;
-
+use App\Model\helpdesk\Settings\Security;
+use App\Model\helpdesk\Ticket\Ticket_Thread;
// classes
-use App\User;
+use App\Model\helpdesk\Ticket\Tickets;
use App\Model\helpdesk\Utility\Otp;
+use App\User;
use Auth;
+use DateTime;
use DB;
use Hash;
use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
-use Lang;
-use DateTime;
use Input;
+use Lang;
use Socialite;
-use App\Http\Controllers\Admin\helpdesk\SocialMedia\SocialMediaController;
/**
* ---------------------------------------------------
@@ -39,8 +37,8 @@ use App\Http\Controllers\Admin\helpdesk\SocialMedia\SocialMediaController;
*
* @author Ladybird
'; - } elseif ($form_data->type == "radio") { + echo '
'; + } elseif ($form_data->type == 'radio') { $type2 = $form_data->value; $vals = explode(',', $type2); - echo '
'; + echo '
'; foreach ($vals as $val) { - echo ' ' . $form_data->value . ' '; + echo ' '.$form_data->value.' '; } - echo "
"; - } elseif ($form_data->type == "textarea") { + echo '
'; + } elseif ($form_data->type == 'textarea') { $type3 = $form_data->value; - echo '
'; - } elseif ($form_data->type == "checkbox") { + echo '
'; + } elseif ($form_data->type == 'checkbox') { $type4 = $form_data->value; $checks = explode(',', $type4); - echo '
'; + echo '
'; foreach ($checks as $check) { - echo ' ' . $check; + echo ' '.$check; } } else { - echo '
'; + echo '
'; } } echo '
'; @@ -142,15 +144,16 @@ class FormController extends Controller { * @param type Request $request * @param type User $user */ - public function postedForm(User $user, ClientRequest $request, Ticket $ticket_settings, Ticket_source $ticket_source, Ticket_attachments $ta, CountryCode $code) { - $form_extras = $request->except('Name', 'Phone', 'Email', 'Subject', 'Details', 'helptopic', '_wysihtml5_mode', '_token','mobile','Code', 'priority'); + public function postedForm(User $user, ClientRequest $request, Ticket $ticket_settings, Ticket_source $ticket_source, Ticket_attachments $ta, CountryCode $code) + { + $form_extras = $request->except('Name', 'Phone', 'Email', 'Subject', 'Details', 'helptopic', '_wysihtml5_mode', '_token', 'mobile', 'Code', 'priority'); $name = $request->input('Name'); $phone = $request->input('Phone'); if ($request->input('Email')) { - if($request->input('Email')) { + if ($request->input('Email')) { $email = $request->input('Email'); } else { - $email = null; + $email = null; } } else { $email = null; @@ -165,18 +168,18 @@ class FormController extends Controller { } $status = $ticket_settings->first()->status; $helptopic = $request->input('helptopic'); - $helpTopicObj = Help_topic::where('id','=', $helptopic); - if($helpTopicObj->exists() && ($helpTopicObj->value('status')==1)){ + $helpTopicObj = Help_topic::where('id', '=', $helptopic); + if ($helpTopicObj->exists() && ($helpTopicObj->value('status') == 1)) { $department = $helpTopicObj->value('department'); - }else{ - $defaultHelpTopicID = Ticket::where('id', '=', '1')->first()->help_topic; - $department = Help_topic::where('id','=', $defaultHelpTopicID)->value('department'); + } else { + $defaultHelpTopicID = Ticket::where('id', '=', '1')->first()->help_topic; + $department = Help_topic::where('id', '=', $defaultHelpTopicID)->value('department'); } $sla = $ticket_settings->first()->sla; - + // $priority = $ticket_settings->first()->priority; - $default_priority = Ticket_Priority::where('is_default','=',1)->first(); - $user_priority = CommonSettings::where('option_name','=','user_priority')->first(); + $default_priority = Ticket_Priority::where('is_default', '=', 1)->first(); + $user_priority = CommonSettings::where('option_name', '=', 'user_priority')->first(); if (!($request->input('priority'))) { $priority = $default_priority->priority_id; } else { @@ -193,8 +196,8 @@ class FormController extends Controller { $geoipcode = $code->where('iso', '=', $location->iso_code)->first(); if ($phonecode == null) { $data = [ - 'fails' => Lang::get('lang.country-code-required-error'), - 'phonecode' => $geoipcode->phonecode, + 'fails' => Lang::get('lang.country-code-required-error'), + 'phonecode' => $geoipcode->phonecode, 'country_code_error' => 1, ]; @@ -203,8 +206,8 @@ class FormController extends Controller { $code = CountryCode::select('phonecode')->where('phonecode', '=', $phonecode)->get(); if (!count($code)) { $data = [ - 'fails' => Lang::get('lang.incorrect-country-code-error'), - 'phonecode' => $geoipcode->phonecode, + 'fails' => Lang::get('lang.incorrect-country-code-error'), + 'phonecode' => $geoipcode->phonecode, 'country_code_error' => 1, ]; @@ -230,7 +233,7 @@ class FormController extends Controller { } } // dd($result); - return Redirect::back()->with('success', Lang::get('lang.Ticket-has-been-created-successfully-your-ticket-number-is') . ' ' . $result[0] . '. ' . Lang::get('lang.Please-save-this-for-future-reference')); + return Redirect::back()->with('success', Lang::get('lang.Ticket-has-been-created-successfully-your-ticket-number-is').' '.$result[0].'. '.Lang::get('lang.Please-save-this-for-future-reference')); } else { return Redirect::back()->withInput($request->except('password'))->with('fails', Lang::get('lang.failed-to-create-user-tcket-as-mobile-has-been-taken')); } @@ -244,14 +247,14 @@ class FormController extends Controller { * * @return type view */ - public function post_ticket_reply($id, Request $request) { - + public function post_ticket_reply($id, Request $request) + { try { if ($comment != null) { $tickets = Tickets::where('id', '=', $id)->first(); $thread = Ticket_Thread::where('ticket_id', '=', $tickets->id)->first(); - $subject = $thread->title . '[#' . $tickets->ticket_number . ']'; + $subject = $thread->title.'[#'.$tickets->ticket_number.']'; $body = $request->input('comment'); $user_cred = User::where('id', '=', $tickets->user_id)->first(); @@ -285,13 +288,14 @@ class FormController extends Controller { } } - public function getCustomForm(Request $request) { - $html = ""; + public function getCustomForm(Request $request) + { + $html = ''; $helptopic_id = $request->input('helptopic'); $helptopics = new Help_topic(); $helptopic = $helptopics->find($helptopic_id); if (!$helptopic) { - throw new Exception("We can not find your request"); + throw new Exception('We can not find your request'); } $custom_form = $helptopic->custom_form; if ($custom_form) { @@ -300,7 +304,7 @@ class FormController extends Controller { $form_controller = new \App\Http\Controllers\Admin\helpdesk\FormController($fields, $forms); $html = $form_controller->renderForm($custom_form); } + return $html; } - } diff --git a/app/Http/Controllers/Client/helpdesk/GuestController.php b/app/Http/Controllers/Client/helpdesk/GuestController.php index 37229d43c..0b1281d8d 100644 --- a/app/Http/Controllers/Client/helpdesk/GuestController.php +++ b/app/Http/Controllers/Client/helpdesk/GuestController.php @@ -6,30 +6,30 @@ namespace App\Http\Controllers\Client\helpdesk; use App\Http\Controllers\Common\PhpMailController; use App\Http\Controllers\Controller; // requests +use App\Http\Requests\helpdesk\OtpVerifyRequest; use App\Http\Requests\helpdesk\ProfilePassword; use App\Http\Requests\helpdesk\ProfileRequest; use App\Http\Requests\helpdesk\TicketRequest; -use App\Model\helpdesk\Manage\Help_topic; // models +use App\Model\helpdesk\Manage\Help_topic; +use App\Model\helpdesk\Settings\CommonSettings; use App\Model\helpdesk\Settings\Company; use App\Model\helpdesk\Settings\System; use App\Model\helpdesk\Ticket\Ticket_Thread; use App\Model\helpdesk\Ticket\Tickets; use App\Model\helpdesk\Utility\CountryCode; -use App\Model\helpdesk\Settings\CommonSettings; -use App\Http\Requests\helpdesk\OtpVerifyRequest; use App\Model\helpdesk\Utility\Otp; use App\User; use Auth; // classes +use DateTime; +use DB; use Exception; use GeoIP; use Hash; use Illuminate\Http\Request; use Input; use Lang; -use DateTime; -use DB; use Socialite; /** @@ -37,14 +37,15 @@ use Socialite; * * @author Ladybird
'; - $content = $line . $messagebody; + $content = $line.$messagebody; } else { $content = $messagebody; } } $send = $this->laravelMail($recipants, $recipantname, $subject, $content, $cc, $attachment); + return $send; } - public function setMailConfig($from_address) { - + public function setMailConfig($from_address) + { $username = $from_address->email_address; $fromname = $from_address->email_name; $password = $from_address->password; @@ -180,88 +184,94 @@ class PhpMailController extends Controller { $port = ''; } $configs = [ - 'username' => $username, - 'from' => ['address' => $username, 'name' => $fromname,], - 'password' => $password, + 'username' => $username, + 'from' => ['address' => $username, 'name' => $fromname], + 'password' => $password, 'encryption' => $smtpsecure, - 'host' => $host, - 'port' => $port, - 'driver' => $protocol, + 'host' => $host, + 'port' => $port, + 'driver' => $protocol, ]; foreach ($configs as $key => $config) { if (is_array($config)) { foreach ($config as $from) { - \Config::set('mail.' . $key, $config); + \Config::set('mail.'.$key, $config); } } else { - \Config::set('mail.' . $key, $config); + \Config::set('mail.'.$key, $config); } } } - public function setServices($emailid, $protocol) { + public function setServices($emailid, $protocol) + { $service = new \App\Model\MailJob\FaveoMail(); $services = $service->where('email_id', $emailid)->lists('value', 'key')->toArray(); $controller = new \App\Http\Controllers\Admin\helpdesk\EmailsController(); $controller->setServiceConfig($protocol, $services); } - public function checkElement($element, $array) { - $value = ""; + public function checkElement($element, $array) + { + $value = ''; if (is_array($array)) { - if (key_exists($element, $array)) { + if (array_key_exists($element, $array)) { $value = $array[$element]; } } + return $value; } - public function laravelMail($to, $toname, $subject, $data, $cc, $attach) { + public function laravelMail($to, $toname, $subject, $data, $cc, $attach) + { //dd($to, $toname, $subject, $data, $cc, $attach); //dd(\Config::get('mail')); //dd($attach); $mail = Mail::send('emails.mail', ['data' => $data], function ($m) use ($to, $subject, $toname, $cc, $attach) { - $m->to($to, $toname)->subject($subject); + $m->to($to, $toname)->subject($subject); - if ($cc != null) { - foreach ($cc as $collaborator) { - //mail to collaborators + if ($cc != null) { + foreach ($cc 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; - $m->cc($collab_email); - } - } + $user_id_collab = User::where('id', '=', $collab_user_id)->first(); + $collab_email = $user_id_collab->email; + $m->cc($collab_email); + } + } // $mail->addBCC($bc); $size = count($attach); - if ($size > 0) { - for ($i = 0; $i < $size; $i++) { - if (is_array($attach) && array_key_exists($i, $attach)) { - $mode = 'normal'; - if (is_array($attach[$i]) && array_key_exists('mode', $attach[$i])) { - $mode = $attach[$i]['mode']; - } - $file = $attach[$i]['file_path']; - $name = $attach[$i]['file_name']; - $mime = $attach[$i]['mime']; - $this->attachmentMode($m, $file, $name, $mime, $mode); - } + if ($size > 0) { + for ($i = 0; $i < $size; $i++) { + if (is_array($attach) && array_key_exists($i, $attach)) { + $mode = 'normal'; + if (is_array($attach[$i]) && array_key_exists('mode', $attach[$i])) { + $mode = $attach[$i]['mode']; } + $file = $attach[$i]['file_path']; + $name = $attach[$i]['file_name']; + $mime = $attach[$i]['mime']; + $this->attachmentMode($m, $file, $name, $mime, $mode); } - }); + } + } + }); if (is_object($mail) || (is_object($mail) && $mail->getStatusCode() == 200)) { $mail = 1; } + return $mail; } - public function setQueue() { + public function setQueue() + { $short = 'database'; $field = [ 'driver' => 'database', - 'table' => 'jobs', - 'queue' => 'default', + 'table' => 'jobs', + 'queue' => 'default', 'expire' => 60, ]; $queue = new \App\Model\MailJob\QueueService(); @@ -274,18 +284,20 @@ class PhpMailController extends Controller { $this->setQueueConfig($short, $field); } - public function setQueueConfig($short, $field) { + public function setQueueConfig($short, $field) + { \Config::set('queue.default', $short); foreach ($field as $key => $value) { \Config::set("queue.connections.$short.$key", $value); } } - public function attachmentMode($message, $file, $name, $mime, $mode) { + public function attachmentMode($message, $file, $name, $mime, $mode) + { if ($mode == 'data') { return $message->attachData(base64_decode($file, true), $name, ['mime' => $mime]); } + return $message->attach($file, ['as' => $name, 'mime' => $mime]); } - } diff --git a/app/Http/Controllers/Common/SettingsController.php b/app/Http/Controllers/Common/SettingsController.php index efe29229a..c60896ba7 100644 --- a/app/Http/Controllers/Common/SettingsController.php +++ b/app/Http/Controllers/Common/SettingsController.php @@ -11,7 +11,6 @@ use App\Model\helpdesk\Email\Smtp; // models use App\Model\helpdesk\Settings\Plugin; use App\Model\helpdesk\Theme\Widgets; -use App\Model\helpdesk\Utility\Version_Check; use Config; // classes use Crypt; @@ -27,14 +26,15 @@ use Lang; * *************************** * Controller to keep smtp details and fetch where ever needed. */ -class SettingsController extends Controller { - +class SettingsController extends Controller +{ /** * Create a new controller instance. * * @return type void */ - public function __construct() { + public function __construct() + { $this->middleware('auth'); $this->middleware('roles'); } @@ -44,7 +44,8 @@ class SettingsController extends Controller { * * @return response */ - public function widgets() { + public function widgets() + { return view('themes.default1.admin.helpdesk.theme.widgets'); } @@ -53,7 +54,8 @@ class SettingsController extends Controller { * * @return response */ - public function list_widget() { + public function list_widget() + { return \Datatable::collection(Widgets::where('id', '<', '7')->get()) ->searchColumns('name') ->orderColumns('name', 'title', 'value') @@ -67,33 +69,33 @@ class SettingsController extends Controller { return $model->value; }) ->addColumn('Actions', function ($model) { - return '' . \Lang::get('lang.edit') . ' -
+ return ''.\Lang::get('lang.edit').'
+
-
@@ -112,13 +114,15 @@ class SettingsController extends Controller {
*
* @return type response
*/
- public function edit_widget($id, Widgets $widgets, Request $request) {
+ public function edit_widget($id, Widgets $widgets, Request $request)
+ {
$widget = $widgets->where('id', '=', $id)->first();
$widget->title = $request->title;
$widget->value = $request->content;
try {
$widget->save();
- return redirect()->back()->with('success', $widget->name . Lang::get('lang.saved_successfully'));
+
+ return redirect()->back()->with('success', $widget->name.Lang::get('lang.saved_successfully'));
} catch (Exception $e) {
return redirect()->back()->with('fails', $e->getMessage());
}
@@ -129,7 +133,8 @@ class SettingsController extends Controller {
*
* @return response
*/
- public function social_buttons() {
+ public function social_buttons()
+ {
return view('themes.default1.admin.helpdesk.theme.social');
}
@@ -138,7 +143,8 @@ class SettingsController extends Controller {
*
* @return response
*/
- public function list_social_buttons() {
+ public function list_social_buttons()
+ {
return \Datatable::collection(Widgets::where('id', '>', '6')->get())
->searchColumns('name')
->orderColumns('name', 'value')
@@ -149,25 +155,25 @@ class SettingsController extends Controller {
return $model->value;
})
->addColumn('Actions', function ($model) {
- return '' . \Lang::get('lang.edit') . '
-
+ return ''.\Lang::get('lang.edit').'
+
@@ -185,14 +191,15 @@ class SettingsController extends Controller {
*
* @return type response
*/
- public function edit_social_buttons($id, Widgets $widgets, Request $request) {
+ public function edit_social_buttons($id, Widgets $widgets, Request $request)
+ {
$widget = $widgets->where('id', '=', $id)->first();
$widget->title = $request->title;
$widget->value = $request->content;
try {
$widget->save();
- return redirect()->back()->with('success', $widget->name . ' Saved Successfully');
+ return redirect()->back()->with('success', $widget->name.' Saved Successfully');
} catch (Exception $e) {
return redirect()->back()->with('fails', $e->errorInfo[2]);
}
@@ -203,8 +210,10 @@ class SettingsController extends Controller {
*
* @return type view
*/
- public function getsmtp() {
+ public function getsmtp()
+ {
$settings = Smtp::where('id', '=', '1')->first();
+
return view('themes.default1.admin.helpdesk.emails.smtp', compact('settings'));
}
@@ -213,7 +222,8 @@ class SettingsController extends Controller {
*
* @return type view
*/
- public function postsmtp(SmtpRequest $request) {
+ public function postsmtp(SmtpRequest $request)
+ {
$data = Smtp::where('id', '=', 1)->first();
$data->driver = $request->input('driver');
$data->host = $request->input('host');
@@ -224,6 +234,7 @@ class SettingsController extends Controller {
$data->password = Crypt::encrypt($request->input('password'));
try {
$data->save();
+
return \Redirect::route('getsmtp')->with('success', 'success');
} catch (Exception $e) {
return \Redirect::route('getsmtp')->with('fails', $e->errorInfo[2]);
@@ -238,7 +249,8 @@ class SettingsController extends Controller {
*
* @return type view
*/
- public function PostSettings(Settings $set, Request $request) {
+ public function PostSettings(Settings $set, Request $request)
+ {
$settings = $set->where('id', '1')->first();
$pass = $request->input('password');
$password = Crypt::encrypt($pass);
@@ -251,7 +263,7 @@ class SettingsController extends Controller {
if (Input::file('logo')) {
$name = Input::file('logo')->getClientOriginalName();
$destinationPath = 'dist/logo';
- $fileName = rand(0000, 9999) . '.' . $name;
+ $fileName = rand(0000, 9999).'.'.$name;
Input::file('logo')->move($destinationPath, $fileName);
$settings->logo = $fileName;
$settings->save();
@@ -265,11 +277,13 @@ class SettingsController extends Controller {
}
}
- public function Plugins() {
+ public function Plugins()
+ {
return view('themes.default1.admin.helpdesk.settings.plugins');
}
- public function GetPlugin() {
+ public function GetPlugin()
+ {
$plugins = $this->fetchConfig();
return \Datatable::collection(new Collection($plugins))
@@ -277,15 +291,15 @@ class SettingsController extends Controller {
->addColumn('name', function ($model) {
if (array_has($model, 'path')) {
if ($model['status'] == 0) {
- $activate = 'Activate';
+ $activate = 'Activate';
$settings = ' ';
} else {
- $settings = 'Settings | ';
- $activate = 'Deactivate';
+ $settings = 'Settings | ';
+ $activate = 'Deactivate';
}
- $delete = 'Delete"
- . "
';
+
return $form;
- default :
+ default:
return $form;
}
}
- public function form($short, $label, $name, $class, $placeholder = '') {
+ public function form($short, $label, $name, $class, $placeholder = '')
+ {
$queueid = $this->getIdByShortName($short);
$queues = new QueueService();
$queue = $queues->find($queueid);
if ($queue) {
- $form = "
+ $delete = 'Delete"
+ ."
';
+
return $form;
- case "iron":
+ case 'iron':
$form .= "
';
+
return $form;
- case "redis":
+ case 'redis':
$form .= "
";
- $action = '
' . $delete . ' | ' . $settings . $activate; + $action = '
'.$delete.' | '.$settings.$activate; } else { $action = ''; } - return ucfirst($model['name']) . $action; + return ucfirst($model['name']).$action; }) ->addColumn('description', function ($model) { return ucfirst($model['description']); @@ -317,7 +331,7 @@ class SettingsController extends Controller { return ucfirst($model['author']); }) ->addColumn('website', function ($model) { - return '' . $model['website'] . ''; + return ''.$model['website'].''; }) ->addColumn('version', function ($model) { return $model['version']; @@ -330,8 +344,9 @@ class SettingsController extends Controller { * * @return type */ - public function ReadPlugins() { - $dir = app_path() . DIRECTORY_SEPARATOR . 'Plugins'; + public function ReadPlugins() + { + $dir = app_path().DIRECTORY_SEPARATOR.'Plugins'; $plugins = array_diff(scandir($dir), ['.', '..']); return $plugins; @@ -344,15 +359,16 @@ class SettingsController extends Controller { * * @return type */ - public function PostPlugins(Request $request) { + public function PostPlugins(Request $request) + { $this->validate($request, ['plugin' => 'required|mimes:application/zip,zip,Zip']); try { - if (!extension_loaded('zip')){ + if (!extension_loaded('zip')) { throw new Exception('Please enable zip extension in your php'); } $plug = new Plugin(); $file = $request->file('plugin'); - $destination = app_path() . DIRECTORY_SEPARATOR . 'Plugins'; + $destination = app_path().DIRECTORY_SEPARATOR.'Plugins'; $zipfile = $file->getRealPath(); /* * get the file name and remove .zip @@ -365,31 +381,31 @@ class SettingsController extends Controller { if (in_array($filename, $dir_check)) { return redirect()->back()->with('fails', Lang::get('lang.plugin-exists')); } - mkdir($destination . DIRECTORY_SEPARATOR . $filename); + mkdir($destination.DIRECTORY_SEPARATOR.$filename); /* * extract the zip file using zipper */ - \Zipper::make($zipfile)->folder($filename2)->extractTo($destination . DIRECTORY_SEPARATOR . $filename); + \Zipper::make($zipfile)->folder($filename2)->extractTo($destination.DIRECTORY_SEPARATOR.$filename); - $file = app_path() . DIRECTORY_SEPARATOR . 'Plugins' . DIRECTORY_SEPARATOR . $filename; // Plugin file path + $file = app_path().DIRECTORY_SEPARATOR.'Plugins'.DIRECTORY_SEPARATOR.$filename; // Plugin file path if (file_exists($file)) { - $seviceporvider = $file . DIRECTORY_SEPARATOR . 'ServiceProvider.php'; - $config = $file . DIRECTORY_SEPARATOR . 'config.php'; + $seviceporvider = $file.DIRECTORY_SEPARATOR.'ServiceProvider.php'; + $config = $file.DIRECTORY_SEPARATOR.'config.php'; if (file_exists($seviceporvider) && file_exists($config)) { /* * move to faveo config */ - $faveoconfig = config_path() . DIRECTORY_SEPARATOR . 'plugins' . DIRECTORY_SEPARATOR . $filename . '.php'; + $faveoconfig = config_path().DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$filename.'.php'; if ($faveoconfig) { //copy($config, $faveoconfig); /* * write provider list in app.php line 128 */ - $app = base_path() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'app.php'; + $app = base_path().DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'app.php'; chmod($app, 0644); - $str = "\n\n\t\t\t'App\\Plugins\\$filename" . "\\ServiceProvider',"; + $str = "\n\n\t\t\t'App\\Plugins\\$filename"."\\ServiceProvider',"; $line_i_am_looking_for = 194; $lines = file($app, FILE_IGNORE_NEW_LINES); $lines[$line_i_am_looking_for] = $str; @@ -403,7 +419,7 @@ class SettingsController extends Controller { */ $this->deleteDirectory($file); - return redirect()->back()->with('fails', Lang::get('no-plugin-file') . $file); + return redirect()->back()->with('fails', Lang::get('no-plugin-file').$file); } } else { /* @@ -411,7 +427,7 @@ class SettingsController extends Controller { */ $this->deleteDirectory($file); - return redirect()->back()->with('fails', Lang::get('plugin-config-missing') . $file); + return redirect()->back()->with('fails', Lang::get('plugin-config-missing').$file); } } else { /* @@ -419,7 +435,7 @@ class SettingsController extends Controller { */ $this->deleteDirectory($file); - return redirect()->back()->with('fails', '' . Lang::get('lang.plugin-path-missing') . ' ' . $file); + return redirect()->back()->with('fails', ''.Lang::get('lang.plugin-path-missing').' '.$file); } } catch (Exception $ex) { return redirect()->back()->with('fails', $ex->getMessage()); @@ -433,7 +449,8 @@ class SettingsController extends Controller { * * @return bool */ - public function deleteDirectory($dir) { + public function deleteDirectory($dir) + { if (!file_exists($dir)) { return true; } @@ -444,8 +461,8 @@ class SettingsController extends Controller { if ($item == '.' || $item == '..') { continue; } - chmod($dir . DIRECTORY_SEPARATOR . $item, 0777); - if (!$this->deleteDirectory($dir . DIRECTORY_SEPARATOR . $item)) { + chmod($dir.DIRECTORY_SEPARATOR.$item, 0777); + if (!$this->deleteDirectory($dir.DIRECTORY_SEPARATOR.$item)) { return false; } } @@ -454,8 +471,9 @@ class SettingsController extends Controller { return rmdir($dir); } - public function ReadConfigs() { - $dir = app_path() . DIRECTORY_SEPARATOR . 'Plugins' . DIRECTORY_SEPARATOR; + public function ReadConfigs() + { + $dir = app_path().DIRECTORY_SEPARATOR.'Plugins'.DIRECTORY_SEPARATOR; $directories = scandir($dir); $files = []; foreach ($directories as $key => $file) { @@ -463,7 +481,7 @@ class SettingsController extends Controller { continue; } - if (is_dir($dir . DIRECTORY_SEPARATOR . $file)) { + if (is_dir($dir.DIRECTORY_SEPARATOR.$file)) { $files[$key] = $file; } } @@ -472,7 +490,7 @@ class SettingsController extends Controller { $plugins = []; if (count($files) > 0) { foreach ($files as $key => $file) { - $plugin = $dir . $file; + $plugin = $dir.$file; $plugins[$key] = array_diff(scandir($plugin), ['.', '..', 'ServiceProvider.php']); $plugins[$key]['file'] = $plugin; } @@ -482,7 +500,7 @@ class SettingsController extends Controller { if ($dh = opendir($dir)) { while (($file = readdir($dh)) !== false) { if ($file == 'config.php') { - $config[] = $dir . DIRECTORY_SEPARATOR . $file; + $config[] = $dir.DIRECTORY_SEPARATOR.$file; } } closedir($dh); @@ -495,7 +513,8 @@ class SettingsController extends Controller { } } - public function fetchConfig() { + public function fetchConfig() + { $configs = $this->ReadConfigs(); //dd($configs); $plugs = new Plugin(); @@ -531,14 +550,15 @@ class SettingsController extends Controller { return $attributes; } - public function DeletePlugin($slug) { - $dir = app_path() . DIRECTORY_SEPARATOR . 'Plugins' . DIRECTORY_SEPARATOR . $slug; + public function DeletePlugin($slug) + { + $dir = app_path().DIRECTORY_SEPARATOR.'Plugins'.DIRECTORY_SEPARATOR.$slug; $this->deleteDirectory($dir); /* * remove service provider from app.php */ - $str = "'App\\Plugins\\$slug" . "\\ServiceProvider',"; - $path_to_file = base_path() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'app.php'; + $str = "'App\\Plugins\\$slug"."\\ServiceProvider',"; + $path_to_file = base_path().DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'app.php'; $file_contents = file_get_contents($path_to_file); $file_contents = str_replace($str, '//', $file_contents); file_put_contents($path_to_file, $file_contents); @@ -551,12 +571,13 @@ class SettingsController extends Controller { return redirect()->back()->with('success', 'Deleted Successfully'); } - public function StatusPlugin($slug) { + public function StatusPlugin($slug) + { $plugs = new Plugin(); $plug = $plugs->where('name', $slug)->first(); if (!$plug) { - $app = base_path() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'app.php'; - $str = "\n'App\\Plugins\\$slug" . "\\ServiceProvider',"; + $app = base_path().DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'app.php'; + $str = "\n'App\\Plugins\\$slug"."\\ServiceProvider',"; $line_i_am_looking_for = 194; $lines = file($app, FILE_IGNORE_NEW_LINES); $lines[$line_i_am_looking_for] = $str; @@ -569,8 +590,8 @@ class SettingsController extends Controller { if ($status == 0) { $plug->status = 1; - $app = base_path() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'app.php'; - $str = "\n'App\\Plugins\\$slug" . "\\ServiceProvider',"; + $app = base_path().DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'app.php'; + $str = "\n'App\\Plugins\\$slug"."\\ServiceProvider',"; $line_i_am_looking_for = 194; $lines = file($app, FILE_IGNORE_NEW_LINES); $lines[$line_i_am_looking_for] = $str; @@ -581,8 +602,8 @@ class SettingsController extends Controller { /* * remove service provider from app.php */ - $str = "\n'App\\Plugins\\$slug" . "\\ServiceProvider',"; - $path_to_file = base_path() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'app.php'; + $str = "\n'App\\Plugins\\$slug"."\\ServiceProvider',"; + $path_to_file = base_path().DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'app.php'; $file_contents = file_get_contents($path_to_file); $file_contents = str_replace($str, '//', $file_contents); diff --git a/app/Http/Controllers/Common/Socialite.php b/app/Http/Controllers/Common/Socialite.php index 7b4eb1ec6..90ca7a0ba 100644 --- a/app/Http/Controllers/Common/Socialite.php +++ b/app/Http/Controllers/Common/Socialite.php @@ -1,9 +1,9 @@ input('service'); - - $short_name = ""; - $mail_services = new \App\Model\MailJob\MailService(); + + $short_name = ''; + $mail_services = new \App\Model\MailJob\MailService(); $mail_service = $mail_services->find($serviceid); - if($mail_service){ + if ($mail_service) { $short_name = $mail_service->short_name; } $form = $this->getServiceForm($short_name); + return $form; } - - public function form($label,$name,$class){ + + public function form($label, $name, $class) + { $mailid = \Input::get('emailid'); - if($mailid){ - $emails = new \App\Model\helpdesk\Email\Emails(); - $email = $emails->find($mailid); - $form = "
';
+
return $form;
- case "sqs":
+ case 'sqs':
$form .= "' . $delete . ' | ' . $settings . $activate; + $action = '
'.$delete.' | '.$settings.$activate; } else { $action = ''; } - return ucfirst($model['name']) . $action; + return ucfirst($model['name']).$action; }) ->addColumn('description', function ($model) { return ucfirst($model['description']); @@ -317,7 +331,7 @@ class SettingsController extends Controller { return ucfirst($model['author']); }) ->addColumn('website', function ($model) { - return '' . $model['website'] . ''; + return ''.$model['website'].''; }) ->addColumn('version', function ($model) { return $model['version']; @@ -330,8 +344,9 @@ class SettingsController extends Controller { * * @return type */ - public function ReadPlugins() { - $dir = app_path() . DIRECTORY_SEPARATOR . 'Plugins'; + public function ReadPlugins() + { + $dir = app_path().DIRECTORY_SEPARATOR.'Plugins'; $plugins = array_diff(scandir($dir), ['.', '..']); return $plugins; @@ -344,15 +359,16 @@ class SettingsController extends Controller { * * @return type */ - public function PostPlugins(Request $request) { + public function PostPlugins(Request $request) + { $this->validate($request, ['plugin' => 'required|mimes:application/zip,zip,Zip']); try { - if (!extension_loaded('zip')){ + if (!extension_loaded('zip')) { throw new Exception('Please enable zip extension in your php'); } $plug = new Plugin(); $file = $request->file('plugin'); - $destination = app_path() . DIRECTORY_SEPARATOR . 'Plugins'; + $destination = app_path().DIRECTORY_SEPARATOR.'Plugins'; $zipfile = $file->getRealPath(); /* * get the file name and remove .zip @@ -365,31 +381,31 @@ class SettingsController extends Controller { if (in_array($filename, $dir_check)) { return redirect()->back()->with('fails', Lang::get('lang.plugin-exists')); } - mkdir($destination . DIRECTORY_SEPARATOR . $filename); + mkdir($destination.DIRECTORY_SEPARATOR.$filename); /* * extract the zip file using zipper */ - \Zipper::make($zipfile)->folder($filename2)->extractTo($destination . DIRECTORY_SEPARATOR . $filename); + \Zipper::make($zipfile)->folder($filename2)->extractTo($destination.DIRECTORY_SEPARATOR.$filename); - $file = app_path() . DIRECTORY_SEPARATOR . 'Plugins' . DIRECTORY_SEPARATOR . $filename; // Plugin file path + $file = app_path().DIRECTORY_SEPARATOR.'Plugins'.DIRECTORY_SEPARATOR.$filename; // Plugin file path if (file_exists($file)) { - $seviceporvider = $file . DIRECTORY_SEPARATOR . 'ServiceProvider.php'; - $config = $file . DIRECTORY_SEPARATOR . 'config.php'; + $seviceporvider = $file.DIRECTORY_SEPARATOR.'ServiceProvider.php'; + $config = $file.DIRECTORY_SEPARATOR.'config.php'; if (file_exists($seviceporvider) && file_exists($config)) { /* * move to faveo config */ - $faveoconfig = config_path() . DIRECTORY_SEPARATOR . 'plugins' . DIRECTORY_SEPARATOR . $filename . '.php'; + $faveoconfig = config_path().DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.$filename.'.php'; if ($faveoconfig) { //copy($config, $faveoconfig); /* * write provider list in app.php line 128 */ - $app = base_path() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'app.php'; + $app = base_path().DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'app.php'; chmod($app, 0644); - $str = "\n\n\t\t\t'App\\Plugins\\$filename" . "\\ServiceProvider',"; + $str = "\n\n\t\t\t'App\\Plugins\\$filename"."\\ServiceProvider',"; $line_i_am_looking_for = 194; $lines = file($app, FILE_IGNORE_NEW_LINES); $lines[$line_i_am_looking_for] = $str; @@ -403,7 +419,7 @@ class SettingsController extends Controller { */ $this->deleteDirectory($file); - return redirect()->back()->with('fails', Lang::get('no-plugin-file') . $file); + return redirect()->back()->with('fails', Lang::get('no-plugin-file').$file); } } else { /* @@ -411,7 +427,7 @@ class SettingsController extends Controller { */ $this->deleteDirectory($file); - return redirect()->back()->with('fails', Lang::get('plugin-config-missing') . $file); + return redirect()->back()->with('fails', Lang::get('plugin-config-missing').$file); } } else { /* @@ -419,7 +435,7 @@ class SettingsController extends Controller { */ $this->deleteDirectory($file); - return redirect()->back()->with('fails', '' . Lang::get('lang.plugin-path-missing') . ' ' . $file); + return redirect()->back()->with('fails', ''.Lang::get('lang.plugin-path-missing').' '.$file); } } catch (Exception $ex) { return redirect()->back()->with('fails', $ex->getMessage()); @@ -433,7 +449,8 @@ class SettingsController extends Controller { * * @return bool */ - public function deleteDirectory($dir) { + public function deleteDirectory($dir) + { if (!file_exists($dir)) { return true; } @@ -444,8 +461,8 @@ class SettingsController extends Controller { if ($item == '.' || $item == '..') { continue; } - chmod($dir . DIRECTORY_SEPARATOR . $item, 0777); - if (!$this->deleteDirectory($dir . DIRECTORY_SEPARATOR . $item)) { + chmod($dir.DIRECTORY_SEPARATOR.$item, 0777); + if (!$this->deleteDirectory($dir.DIRECTORY_SEPARATOR.$item)) { return false; } } @@ -454,8 +471,9 @@ class SettingsController extends Controller { return rmdir($dir); } - public function ReadConfigs() { - $dir = app_path() . DIRECTORY_SEPARATOR . 'Plugins' . DIRECTORY_SEPARATOR; + public function ReadConfigs() + { + $dir = app_path().DIRECTORY_SEPARATOR.'Plugins'.DIRECTORY_SEPARATOR; $directories = scandir($dir); $files = []; foreach ($directories as $key => $file) { @@ -463,7 +481,7 @@ class SettingsController extends Controller { continue; } - if (is_dir($dir . DIRECTORY_SEPARATOR . $file)) { + if (is_dir($dir.DIRECTORY_SEPARATOR.$file)) { $files[$key] = $file; } } @@ -472,7 +490,7 @@ class SettingsController extends Controller { $plugins = []; if (count($files) > 0) { foreach ($files as $key => $file) { - $plugin = $dir . $file; + $plugin = $dir.$file; $plugins[$key] = array_diff(scandir($plugin), ['.', '..', 'ServiceProvider.php']); $plugins[$key]['file'] = $plugin; } @@ -482,7 +500,7 @@ class SettingsController extends Controller { if ($dh = opendir($dir)) { while (($file = readdir($dh)) !== false) { if ($file == 'config.php') { - $config[] = $dir . DIRECTORY_SEPARATOR . $file; + $config[] = $dir.DIRECTORY_SEPARATOR.$file; } } closedir($dh); @@ -495,7 +513,8 @@ class SettingsController extends Controller { } } - public function fetchConfig() { + public function fetchConfig() + { $configs = $this->ReadConfigs(); //dd($configs); $plugs = new Plugin(); @@ -531,14 +550,15 @@ class SettingsController extends Controller { return $attributes; } - public function DeletePlugin($slug) { - $dir = app_path() . DIRECTORY_SEPARATOR . 'Plugins' . DIRECTORY_SEPARATOR . $slug; + public function DeletePlugin($slug) + { + $dir = app_path().DIRECTORY_SEPARATOR.'Plugins'.DIRECTORY_SEPARATOR.$slug; $this->deleteDirectory($dir); /* * remove service provider from app.php */ - $str = "'App\\Plugins\\$slug" . "\\ServiceProvider',"; - $path_to_file = base_path() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'app.php'; + $str = "'App\\Plugins\\$slug"."\\ServiceProvider',"; + $path_to_file = base_path().DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'app.php'; $file_contents = file_get_contents($path_to_file); $file_contents = str_replace($str, '//', $file_contents); file_put_contents($path_to_file, $file_contents); @@ -551,12 +571,13 @@ class SettingsController extends Controller { return redirect()->back()->with('success', 'Deleted Successfully'); } - public function StatusPlugin($slug) { + public function StatusPlugin($slug) + { $plugs = new Plugin(); $plug = $plugs->where('name', $slug)->first(); if (!$plug) { - $app = base_path() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'app.php'; - $str = "\n'App\\Plugins\\$slug" . "\\ServiceProvider',"; + $app = base_path().DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'app.php'; + $str = "\n'App\\Plugins\\$slug"."\\ServiceProvider',"; $line_i_am_looking_for = 194; $lines = file($app, FILE_IGNORE_NEW_LINES); $lines[$line_i_am_looking_for] = $str; @@ -569,8 +590,8 @@ class SettingsController extends Controller { if ($status == 0) { $plug->status = 1; - $app = base_path() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'app.php'; - $str = "\n'App\\Plugins\\$slug" . "\\ServiceProvider',"; + $app = base_path().DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'app.php'; + $str = "\n'App\\Plugins\\$slug"."\\ServiceProvider',"; $line_i_am_looking_for = 194; $lines = file($app, FILE_IGNORE_NEW_LINES); $lines[$line_i_am_looking_for] = $str; @@ -581,8 +602,8 @@ class SettingsController extends Controller { /* * remove service provider from app.php */ - $str = "\n'App\\Plugins\\$slug" . "\\ServiceProvider',"; - $path_to_file = base_path() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'app.php'; + $str = "\n'App\\Plugins\\$slug"."\\ServiceProvider',"; + $path_to_file = base_path().DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'app.php'; $file_contents = file_get_contents($path_to_file); $file_contents = str_replace($str, '//', $file_contents); diff --git a/app/Http/Controllers/Common/Socialite.php b/app/Http/Controllers/Common/Socialite.php index 7b4eb1ec6..90ca7a0ba 100644 --- a/app/Http/Controllers/Common/Socialite.php +++ b/app/Http/Controllers/Common/Socialite.php @@ -1,9 +1,9 @@ input('service'); - - $short_name = ""; - $mail_services = new \App\Model\MailJob\MailService(); + + $short_name = ''; + $mail_services = new \App\Model\MailJob\MailService(); $mail_service = $mail_services->find($serviceid); - if($mail_service){ + if ($mail_service) { $short_name = $mail_service->short_name; } $form = $this->getServiceForm($short_name); + return $form; } - - public function form($label,$name,$class){ + + public function form($label, $name, $class) + { $mailid = \Input::get('emailid'); - if($mailid){ - $emails = new \App\Model\helpdesk\Email\Emails(); - $email = $emails->find($mailid); - $form = "
".Form::label($name, $label) ." *".
- Form::text($name, $email->getExtraField($name), ['class' => "form-control"])."
";
- }else{
- $form = "".Form::label($name, $label) ." *".
- Form::text($name, NULL, ['class' => "form-control"])."
";
+ if ($mailid) {
+ $emails = new \App\Model\helpdesk\Email\Emails();
+ $email = $emails->find($mailid);
+ $form = "".Form::label($name, $label)." *".
+ Form::text($name, $email->getExtraField($name), ['class' => 'form-control']).'
';
+ } else {
+ $form = "".Form::label($name, $label)." *".
+ Form::text($name, null, ['class' => 'form-control']).'
';
}
+
return $form;
}
-
- public function getServiceForm($short_name){
- $form = "";
- try{
- switch ($short_name){
- case "smtp":
+
+ public function getServiceForm($short_name)
+ {
+ $form = '';
+ try {
+ switch ($short_name) {
+ case 'smtp':
return $form;
- case "mail":
+ case 'mail':
return $form;
- case "sendmail":
+ case 'sendmail':
return $form;
- case "mailgun":
- $form .= "".$this->form('Domain', 'domain','col-md-6 form-group');
- $form .= $this->form('Secret Key', 'secret','col-md-6 form-group')."
";
+ case 'mailgun':
+ $form .= "".$this->form('Domain', 'domain', 'col-md-6 form-group');
+ $form .= $this->form('Secret Key', 'secret', 'col-md-6 form-group').'
';
+
return $form;
- case "mandrill":
- $form .= "".$this->form('Secret Key', 'secret','col-md-6 form-group')."
";
+ case 'mandrill':
+ $form .= "".$this->form('Secret Key', 'secret', 'col-md-6 form-group').'
';
+
return $form;
- case "log":
+ case 'log':
return $form;
- case "ses":
- $form .= "".$this->form('Key', 'key','col-md-6 form-group');
- $form .= $this->form('Secret Key', 'secret','col-md-6 form-group').$this->form('Region', 'region','col-md-6 form-group')."
";
+ case 'ses':
+ $form .= "".$this->form('Key', 'key', 'col-md-6 form-group');
+ $form .= $this->form('Secret Key', 'secret', 'col-md-6 form-group').$this->form('Region', 'region', 'col-md-6 form-group').'
';
+
return $form;
- default :
+ default:
return $form;
}
} catch (Exception $ex) {
diff --git a/app/Http/Controllers/Job/QueueController.php b/app/Http/Controllers/Job/QueueController.php
index efb878c9a..9a994201d 100644
--- a/app/Http/Controllers/Job/QueueController.php
+++ b/app/Http/Controllers/Job/QueueController.php
@@ -2,47 +2,51 @@
namespace App\Http\Controllers\Job;
-use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
-use App\Model\MailJob\QueueService;
+use App\Http\Requests\helpdesk\Queue\QueueRequest;
use App\Model\MailJob\FaveoQueue;
+use App\Model\MailJob\QueueService;
use Exception;
use Form;
-use App\Http\Requests\helpdesk\Queue\QueueRequest;
+use Illuminate\Http\Request;
-class QueueController extends Controller {
-
- public function index() {
+class QueueController extends Controller
+{
+ public function index()
+ {
try {
$queue = new QueueService();
$queues = $queue->select('id', 'name', 'status')->get();
+
return view('themes.default1.admin.helpdesk.queue.index', compact('queues'));
} catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage());
}
}
- public function edit($id) {
+ public function edit($id)
+ {
try {
$queues = new QueueService();
$queue = $queues->find($id);
if (!$queue) {
- throw new Exception("Sorry we can not find your request");
+ throw new Exception('Sorry we can not find your request');
}
+
return view('themes.default1.admin.helpdesk.queue.edit', compact('queue'));
} catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage());
}
}
- public function update($id, QueueRequest $request) {
-
+ public function update($id, QueueRequest $request)
+ {
try {
$values = $request->except('_token');
$queues = new QueueService();
$queue = $queues->find($id);
if (!$queue) {
- throw new Exception("Sorry we can not find your request");
+ throw new Exception('Sorry we can not find your request');
}
$setting = new FaveoQueue();
$settings = $setting->where('service_id', $id)->get();
@@ -55,26 +59,28 @@ class QueueController extends Controller {
foreach ($values as $key => $value) {
$setting->create([
'service_id' => $id,
- 'key' => $key,
- 'value' => $value,
+ 'key' => $key,
+ 'value' => $value,
]);
}
}
+
return redirect()->back()->with('success', 'Updated');
} catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage());
}
}
- public function activate($id) {
+ public function activate($id)
+ {
try {
$queues = new QueueService();
$queue = $queues->find($id);
$active_queue = $queues->where('status', 1)->first();
if (!$queue) {
- throw new Exception("Sorry we can not find your request");
+ throw new Exception('Sorry we can not find your request');
}
- if ($queue->isActivate()==false&&$id!=1&&$id!=2) {
+ if ($queue->isActivate() == false && $id != 1 && $id != 2) {
throw new Exception("To activate $queue->name , Please configure it first");
}
if ($active_queue) {
@@ -83,89 +89,102 @@ class QueueController extends Controller {
}
$queue->status = 1;
$queue->save();
+
return redirect()->back()->with('success', 'Activated');
} catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage());
}
}
-
- public function getForm(Request $request){
+
+ public function getForm(Request $request)
+ {
$queueid = $request->input('queueid');
$form = $this->getFormById($queueid);
+
return $form;
}
- public function getShortNameById($queueid) {
- $short = "";
+ public function getShortNameById($queueid)
+ {
+ $short = '';
$queues = new QueueService();
$queue = $queues->find($queueid);
if ($queue) {
$short = $queue->short_name;
}
+
return $short;
}
- public function getIdByShortName($short) {
- $id = "";
+ public function getIdByShortName($short)
+ {
+ $id = '';
$queues = new QueueService();
$queue = $queues->where('short_name', $short)->first();
if ($queue) {
$id = $queue->id;
}
+
return $id;
}
- public function getFormById($id) {
+ public function getFormById($id)
+ {
$short = $this->getShortNameById($id);
- $form = "";
+ $form = '';
switch ($short) {
- case "beanstalkd":
+ case 'beanstalkd':
$form .= "";
- $form .= $this->form($short, 'Driver', 'driver', 'col-md-6 form-group','beanstalkd');
- $form .= $this->form($short, 'Host', 'host', 'col-md-6 form-group','localhost');
+ $form .= $this->form($short, 'Driver', 'driver', 'col-md-6 form-group', 'beanstalkd');
+ $form .= $this->form($short, 'Host', 'host', 'col-md-6 form-group', 'localhost');
$form .= $this->form($short, 'Queue', 'queue', 'col-md-6 form-group', 'default');
- $form .= "
";
+ $form .= '";
- $form .= $this->form($short, 'Driver', 'driver', 'col-md-6 form-group','sqs');
- $form .= $this->form($short, 'Key', 'key', 'col-md-6 form-group','your-public-key');
+ $form .= $this->form($short, 'Driver', 'driver', 'col-md-6 form-group', 'sqs');
+ $form .= $this->form($short, 'Key', 'key', 'col-md-6 form-group', 'your-public-key');
$form .= $this->form($short, 'Secret', 'secret', 'col-md-6 form-group', 'your-queue-url');
$form .= $this->form($short, 'Region', 'region', 'col-md-6 form-group', 'us-east-1');
- $form .= "
";
+ $form .= '";
- $form .= $this->form($short, 'Driver', 'driver', 'col-md-6 form-group','iron');
- $form .= $this->form($short, 'Host', 'host', 'col-md-6 form-group','mq-aws-us-east-1.iron.io');
+ $form .= $this->form($short, 'Driver', 'driver', 'col-md-6 form-group', 'iron');
+ $form .= $this->form($short, 'Host', 'host', 'col-md-6 form-group', 'mq-aws-us-east-1.iron.io');
$form .= $this->form($short, 'Token', 'token', 'col-md-6 form-group', 'your-token');
$form .= $this->form($short, 'Project', 'project', 'col-md-6 form-group', 'your-project-id');
$form .= $this->form($short, 'Queue', 'queue', 'col-md-6 form-group', 'your-queue-name');
- $form .= "
";
+ $form .= '";
- $form .= $this->form($short, 'Driver', 'driver', 'col-md-6 form-group','redis');
+ $form .= $this->form($short, 'Driver', 'driver', 'col-md-6 form-group', 'redis');
$form .= $this->form($short, 'Queue', 'queue', 'col-md-6 form-group', 'default');
- $form .= "
";
+ $form .= '" . Form::label($name, $label) . " *" .
- Form::text($name, $queue->getExtraField($name), ['class' => "form-control", 'placeholder' => $placeholder]) . "
";
+ $form = "".Form::label($name, $label)." *".
+ Form::text($name, $queue->getExtraField($name), ['class' => 'form-control', 'placeholder' => $placeholder]).'
';
} else {
- $form = "" . Form::label($name, $label) . " *" .
- Form::text($name, NULL, ['class' => "form-control", 'placeholder' => $placeholder]) . "
";
+ $form = "".Form::label($name, $label)." *".
+ Form::text($name, null, ['class' => 'form-control', 'placeholder' => $placeholder]).'
';
}
+
return $form;
}
-
}
diff --git a/app/Http/Controllers/Update/UpgradeController.php b/app/Http/Controllers/Update/UpgradeController.php
index 223355df8..3eeab9f84 100644
--- a/app/Http/Controllers/Update/UpgradeController.php
+++ b/app/Http/Controllers/Update/UpgradeController.php
@@ -9,16 +9,18 @@ use Artisan;
use Exception;
use Illuminate\Http\Request;
-class UpgradeController extends Controller {
-
+class UpgradeController extends Controller
+{
public $dir;
- public function __construct() {
+ public function __construct()
+ {
$dir = base_path();
$this->dir = $dir;
}
- public function getLatestVersion() {
+ public function getLatestVersion()
+ {
try {
$name = \Config::get('app.name');
//dd($name);
@@ -28,17 +30,17 @@ class UpgradeController extends Controller {
$order_number = '44596328';
$url = env('APP_URL');
$data = [
- 'serial_key' => $serial_key,
+ 'serial_key' => $serial_key,
'order_number' => $order_number,
- 'name' => $name,
- 'version' => Utility::getFileVersion(),
+ 'name' => $name,
+ 'version' => Utility::getFileVersion(),
'request_type' => 'check_update',
- 'url' => $url,
+ 'url' => $url,
];
$data = Utility::encryptByFaveoPublicKey(json_encode($data));
//dd($data);
$post_data = [
- 'data' => $data
+ 'data' => $data,
];
$url = 'http://faveohelpdesk.com/billing/public/verification';
if (str_contains($url, ' ')) {
@@ -59,7 +61,8 @@ class UpgradeController extends Controller {
}
}
- public function downloadLatestCode() {
+ public function downloadLatestCode()
+ {
$name = \Config::get('app.name');
$durl = 'http://www.faveohelpdesk.com/billing/public/download-url';
if (str_contains($durl, ' ')) {
@@ -75,7 +78,8 @@ class UpgradeController extends Controller {
return $download_url;
}
- public function saveLatestCodeAtTemp($download_url) {
+ public function saveLatestCodeAtTemp($download_url)
+ {
echo 'Downloading New Update
'; $context = stream_context_create( [ @@ -87,10 +91,10 @@ class UpgradeController extends Controller { $newUpdate = file_get_contents($download_url, false, $context); if (!is_dir("$this->dir/UPDATES/")) { - \File::makeDirectory($this->dir . '/UPDATES/', 0777); + \File::makeDirectory($this->dir.'/UPDATES/', 0777); } - $dlHandler = fopen($this->dir . '/UPDATES/' . '/faveo-helpdesk-master.zip', 'w'); + $dlHandler = fopen($this->dir.'/UPDATES/'.'/faveo-helpdesk-master.zip', 'w'); if (!fwrite($dlHandler, $newUpdate)) { echo 'Could not save new update. Operation aborted.
'; exit(); @@ -99,25 +103,28 @@ class UpgradeController extends Controller { echo 'Update Downloaded And Saved
'; } - public function doUpdate() { + public function doUpdate() + { try { $memory_limit = ini_get('memory_limit'); if ($memory_limit < 256) { echo '- ';
echo "
- Sorry we can not process your request because of limited memory! You have only $memory_limit. For this you need atleast 256 MB "; echo '
- ';
echo "
- Sorry we can not process your request because you don't have ZIP extension contact your system admin "; echo '
- ';
@@ -130,30 +137,29 @@ class UpgradeController extends Controller {
continue;
}
-
//Make the directory if we need to...
- if (!is_dir($update . '/' . $thisFileDir . '/')) {
- \File::makeDirectory($update . '/' . $thisFileDir, 0775, true, true);
+ if (!is_dir($update.'/'.$thisFileDir.'/')) {
+ \File::makeDirectory($update.'/'.$thisFileDir, 0775, true, true);
// mkdir($update.'/'. $thisFileDir, 0775);
- echo '
- Created Directory ' . $thisFileDir . ' '; + echo '
- Created Directory '.$thisFileDir.' '; } //Overwrite the file - if (!is_dir($update . '/' . $thisFileName)) { - echo '
- ' . $thisFileName . '...........'; + if (!is_dir($update.'/'.$thisFileName)) { + echo '
- '.$thisFileName.'...........'; $contents = zip_entry_read($aF, zip_entry_filesize($aF)); $contents = str_replace("\r\n", "\n", $contents); $updateThis = ''; //If we need to run commands, then do it. - if ($thisFileName == $thisFileDir . '/.env') { - if (is_file($update . '/' . $thisFileDir . '/.env')) { - unlink($update . '/' . $thisFileDir . '/.env'); - unlink($update . '/' . $thisFileDir . '/config/database.php'); + if ($thisFileName == $thisFileDir.'/.env') { + if (is_file($update.'/'.$thisFileDir.'/.env')) { + unlink($update.'/'.$thisFileDir.'/.env'); + unlink($update.'/'.$thisFileDir.'/config/database.php'); } echo' EXECUTED '; } else { - $updateThis = fopen($update . '/' . $thisFileName, 'w'); + $updateThis = fopen($update.'/'.$thisFileName, 'w'); fwrite($updateThis, $contents); fclose($updateThis); unset($contents); @@ -166,12 +172,13 @@ class UpgradeController extends Controller { return true; } catch (Exception $ex) { echo '
- " . $ex->getMessage() . " "; + echo "
- ".$ex->getMessage().' '; echo '
- » Faveo Updated to v" . Utility::getFileVersion() . " "; + echo "
- » Faveo Updated to v".Utility::getFileVersion().' '; echo '
- " . $ex->getMessage() . " "; + echo "
- ".$ex->getMessage().' '; echo '
- '; + return '
- '; } else { //$var = '
- ' . $var . ' '; + $var = ''; + + return '
- '.$var.' '; } } } - } diff --git a/app/Model/helpdesk/Ticket/Ticket_source.php b/app/Model/helpdesk/Ticket/Ticket_source.php index 21d6b8828..b520359c0 100644 --- a/app/Model/helpdesk/Ticket/Ticket_source.php +++ b/app/Model/helpdesk/Ticket/Ticket_source.php @@ -9,6 +9,6 @@ class Ticket_source extends BaseModel public $timestamps = false; protected $table = 'ticket_source'; protected $fillable = [ - 'name', 'value','css_class', + 'name', 'value', 'css_class', ]; } diff --git a/app/Model/helpdesk/Ticket/Tickets.php b/app/Model/helpdesk/Ticket/Tickets.php index 3b59f9f99..84018a537 100644 --- a/app/Model/helpdesk/Ticket/Tickets.php +++ b/app/Model/helpdesk/Ticket/Tickets.php @@ -4,8 +4,8 @@ namespace App\Model\helpdesk\Ticket; use App\BaseModel; -class Tickets extends BaseModel { - +class Tickets extends BaseModel +{ protected $table = 'tickets'; protected $fillable = ['id', 'ticket_number', 'num_sequence', 'user_id', 'priority_id', 'sla', 'help_topic_id', 'max_open_ticket', 'captcha', 'status', 'lock_by', 'lock_at', 'source', 'isoverdue', 'reopened', 'isanswered', 'is_deleted', 'closed', 'is_transfer', 'transfer_at', 'reopened_at', 'duedate', 'closed_at', 'last_message_at', 'last_response_at', 'created_at', 'updated_at', 'assigned_to']; @@ -13,62 +13,76 @@ class Tickets extends BaseModel { // return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_attachments',); // // } - public function thread() { + public function thread() + { return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_Thread', 'ticket_id'); } - public function collaborator() { + public function collaborator() + { return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_Collaborator', 'ticket_id'); } - - public function helptopic(){ + + public function helptopic() + { $related = 'App\Model\helpdesk\Manage\Help_topic'; $foreignKey = 'help_topic_id'; + return $this->belongsTo($related, $foreignKey); } - public function formdata() { + public function formdata() + { return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_Form_Data', 'ticket_id'); } - public function extraFields() { + public function extraFields() + { $id = $this->attributes['id']; $ticket_form_datas = \App\Model\helpdesk\Ticket\Ticket_Form_Data::where('ticket_id', '=', $id)->get(); + return $ticket_form_datas; } - public function source() { + public function source() + { $source_id = $this->attributes['source']; $sources = new Ticket_source(); $source = $sources->find($source_id); + return $source; } - public function sourceCss() { - $css = "fa fa-comment"; + public function sourceCss() + { + $css = 'fa fa-comment'; $source = $this->source(); if ($source) { $css = $source->css_class; } + return $css; } - public function delete() { + public function delete() + { $this->thread()->delete(); $this->collaborator()->delete(); $this->formdata()->delete(); parent::delete(); } - public function setAssignedToAttribute($value) { + public function setAssignedToAttribute($value) + { if (!$value) { $this->attributes['assigned_to'] = null; - }else{ - $this->attributes['assigned_to'] = $value; + } else { + $this->attributes['assigned_to'] = $value; } } - public function getAssignedTo() { + public function getAssignedTo() + { $agentid = $this->attributes['assigned_to']; if ($agentid) { $users = new \App\User(); @@ -78,11 +92,12 @@ class Tickets extends BaseModel { } } } - - public function user(){ + + public function user() + { $related = "App\User"; - $foreignKey = "user_id"; + $foreignKey = 'user_id'; + return $this->belongsTo($related, $foreignKey); } - } diff --git a/app/Model/helpdesk/Utility/Limit_Login.php b/app/Model/helpdesk/Utility/Limit_Login.php index 124ee3ec7..531f6f2c3 100644 --- a/app/Model/helpdesk/Utility/Limit_Login.php +++ b/app/Model/helpdesk/Utility/Limit_Login.php @@ -5,7 +5,7 @@ namespace App\Model\helpdesk\Utility; use App\BaseModel; class Limit_Login extends BaseModel -{ - protected $table = 'login_attempts'; +{ + protected $table = 'login_attempts'; protected $fillable = ['User', 'IP', 'Attempts', 'LastLogin', 'created_at', 'updated_at']; } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 17dff6b91..0175dfc4f 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -3,10 +3,10 @@ namespace App\Providers; use App\Model\Update\BarNotification; -use Illuminate\Support\ServiceProvider; -use View; -use Queue; use Illuminate\Queue\Events\JobFailed; +use Illuminate\Support\ServiceProvider; +use Queue; +use View; class AppServiceProvider extends ServiceProvider { @@ -22,13 +22,13 @@ class AppServiceProvider extends ServiceProvider public function register() { $this->app->bind('Illuminate\Contracts\Auth\Registrar'); - require_once __DIR__ . '/../Http/helpers.php'; + require_once __DIR__.'/../Http/helpers.php'; } public function boot() { Queue::failing(function (JobFailed $event) { - loging('Failed Job - '.$event->connectionName, json_encode($event->data)); + loging('Failed Job - '.$event->connectionName, json_encode($event->data)); $failedid = $event->failedId; //\Artisan::call('queue:retry',['id'=>[$failedid]]); }); @@ -58,7 +58,7 @@ class AppServiceProvider extends ServiceProvider \View::composer('themes.default1.update.notification', function () { $notification = new BarNotification(); $not = [ - 'notification' => $notification->where('value','!=','')->get(), + 'notification' => $notification->where('value', '!=', '')->get(), ]; view()->share($not); }); diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php index 9954471fc..9dbcb5152 100644 --- a/app/Providers/ComposerServiceProvider.php +++ b/app/Providers/ComposerServiceProvider.php @@ -16,7 +16,7 @@ class ComposerServiceProvider extends ServiceProvider view()->composer( [ 'themes.default1.agent.layout.agent', - 'themes.default1.agent.helpdesk.dashboard.dashboard' + 'themes.default1.agent.helpdesk.dashboard.dashboard', ], 'App\Http\ViewComposers\AgentLayout' ); view()->composer( diff --git a/app/User.php b/app/User.php index 163724c9c..a746bd1c7 100644 --- a/app/User.php +++ b/app/User.php @@ -8,8 +8,8 @@ use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; use Illuminate\Database\Eloquent\Model; -class User extends Model implements AuthenticatableContract, CanResetPasswordContract { - +class User extends Model implements AuthenticatableContract, CanResetPasswordContract +{ use Authenticatable, CanResetPassword; @@ -28,7 +28,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon protected $fillable = ['user_name', 'email', 'password', 'active', 'first_name', 'last_name', 'ban', 'ext', 'mobile', 'profile_pic', 'phone_number', 'company', 'agent_sign', 'account_type', 'account_status', 'assign_group', 'primary_dpt', 'agent_tzone', 'daylight_save', 'limit_access', - 'directory_listing', 'vacation_mode', 'role', 'internal_note', 'country_code','not_accept_ticket','is_delete']; + 'directory_listing', 'vacation_mode', 'role', 'internal_note', 'country_code', 'not_accept_ticket', 'is_delete', ]; /** * The attributes excluded from the model's JSON form. @@ -36,31 +36,34 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon * @var array */ protected $hidden = ['password', 'remember_token']; - - public function getProfilePicAttribute($value) { - + public function getProfilePicAttribute($value) + { $info = $this->avatar(); - $pic = NULL; + $pic = null; if ($info) { $pic = $this->checkArray('avatar', $info); } if (!$pic) { - $pic = asset('uploads/profilepic/' . $value); + $pic = asset('uploads/profilepic/'.$value); } if (!$value) { $pic = \Gravatar::src($this->attributes['email']); - } + } + return $pic; } - - public function avatar(){ + + public function avatar() + { $related = 'App\UserAdditionalInfo'; $foreignKey = 'owner'; - return $this->hasMany($related, $foreignKey)->select('value')->where('key','avatar')->first(); + + return $this->hasMany($related, $foreignKey)->select('value')->where('key', 'avatar')->first(); } - public function getOrganizationRelation() { + public function getOrganizationRelation() + { $related = "App\Model\helpdesk\Agent_panel\User_org"; $user_relation = $this->hasMany($related, 'user_id'); $relation = $user_relation->first(); @@ -68,96 +71,111 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon $org_id = $relation->org_id; $orgs = new \App\Model\helpdesk\Agent_panel\Organization(); $org = $orgs->where('id', $org_id); + return $org; } } - public function getOrganization() { - $name = ""; + public function getOrganization() + { + $name = ''; if ($this->getOrganizationRelation()) { $org = $this->getOrganizationRelation()->first(); if ($org) { $name = $org->name; } } + return $name; } - public function getOrgWithLink() { - $name = ""; + public function getOrgWithLink() + { + $name = ''; $org = $this->getOrganization(); - if ($org !== "") { + if ($org !== '') { $orgs = $this->getOrganizationRelation()->first(); if ($orgs) { $id = $orgs->id; - $name = "" . ucfirst($org) . ""; + $name = ''.ucfirst($org).''; } } + return $name; } - public function getEmailAttribute($value) { + public function getEmailAttribute($value) + { if (!$value) { $value = \Lang::get('lang.not-available'); } + return $value; } - public function getExtraInfo($id = "") { - if ($id === "") { + public function getExtraInfo($id = '') + { + if ($id === '') { $id = $this->attributes['id']; } $info = new UserAdditionalInfo(); $infos = $info->where('owner', $id)->lists('value', 'key')->toArray(); + return $infos; } - public function checkArray($key, $array) { - $value = ""; + public function checkArray($key, $array) + { + $value = ''; if (is_array($array)) { if (array_key_exists($key, $array)) { $value = $array[$key]; } } + return $value; } - public function twitterLink() { - $html = ""; + public function twitterLink() + { + $html = ''; $info = $this->getExtraInfo(); $username = $this->checkArray('username', $info); - if ($username !== "") { - $html = " Twitter"; + if ($username !== '') { + $html = " Twitter"; } + return $html; } - - public function name(){ + + public function name() + { $first_name = $this->first_name; $last_name = $this->last_name; $name = $this->user_name; - if($first_name !== '' && $first_name !== null) { + if ($first_name !== '' && $first_name !== null) { if ($last_name !== '' && $last_name !== null) { $name = $first_name.' '.$last_name; } else { $name = $first_name; } } + return $name; } - - public function getFullNameAttribute() { + + public function getFullNameAttribute() + { return $this->name(); } + // public function save() { // dd($this->id); // parent::save(); // } - + // public function save(array $options = array()) { // parent::save($options); // dd($this->where('id',$this->id)->select('first_name','last_name','user_name','email')->get()->toJson()); // } - - } diff --git a/app/UserAdditionalInfo.php b/app/UserAdditionalInfo.php index 09bb9072d..7876c5c80 100644 --- a/app/UserAdditionalInfo.php +++ b/app/UserAdditionalInfo.php @@ -6,7 +6,6 @@ use Illuminate\Database\Eloquent\Model; class UserAdditionalInfo extends Model { - protected $table = "user_additional_infos"; - protected $fillable = ["owner","service","key","value",]; - + protected $table = 'user_additional_infos'; + protected $fillable = ['owner', 'service', 'key', 'value']; } diff --git a/config/app.php b/config/app.php index ae437a455..0423b5ce1 100644 --- a/config/app.php +++ b/config/app.php @@ -97,7 +97,7 @@ return [ | will not be safe. Please do this before deploying an application! | */ - 'key' => env('APP_KEY', 'F70u5RfMoiq7ptPR'), + 'key' => env('APP_KEY', 'F70u5RfMoiq7ptPR'), 'cipher' => MCRYPT_RIJNDAEL_128, /* |-------------------------------------------------------------------------- @@ -139,7 +139,6 @@ return [ * Laravel Framework Service Providers... */ - 'Illuminate\Auth\AuthServiceProvider', 'Illuminate\Bus\BusServiceProvider', 'Illuminate\Cache\CacheServiceProvider', @@ -189,8 +188,6 @@ return [ App\FaveoStorage\StorageServiceProvider::class, Yajra\Datatables\DatatablesServiceProvider::class, - - ], /* |-------------------------------------------------------------------------- @@ -203,62 +200,62 @@ return [ | */ 'aliases' => [ - 'App' => 'Illuminate\Support\Facades\App', - 'Artisan' => 'Illuminate\Support\Facades\Artisan', - 'Auth' => 'Illuminate\Support\Facades\Auth', - 'Blade' => 'Illuminate\Support\Facades\Blade', - 'Cache' => 'Illuminate\Support\Facades\Cache', - 'Config' => 'Illuminate\Support\Facades\Config', - 'Cookie' => 'Illuminate\Support\Facades\Cookie', - 'Crypt' => 'Illuminate\Support\Facades\Crypt', - 'DB' => 'Illuminate\Support\Facades\DB', - 'Eloquent' => 'Illuminate\Database\Eloquent\Model', - 'Event' => 'Illuminate\Support\Facades\Event', - 'File' => 'Illuminate\Support\Facades\File', - 'Hash' => 'Illuminate\Support\Facades\Hash', - 'Input' => 'Illuminate\Support\Facades\Input', - 'Inspiring' => 'Illuminate\Foundation\Inspiring', - 'Lang' => 'Illuminate\Support\Facades\Lang', - 'Log' => 'Illuminate\Support\Facades\Log', - 'Mail' => 'Illuminate\Support\Facades\Mail', - 'Password' => 'Illuminate\Support\Facades\Password', - 'Queue' => 'Illuminate\Support\Facades\Queue', - 'Redirect' => 'Illuminate\Support\Facades\Redirect', - 'Redis' => 'Illuminate\Support\Facades\Redis', - 'Request' => 'Illuminate\Support\Facades\Request', - 'Response' => 'Illuminate\Support\Facades\Response', - 'Route' => 'Illuminate\Support\Facades\Route', - 'Schema' => 'Illuminate\Support\Facades\Schema', - 'Session' => 'Illuminate\Support\Facades\Session', - 'Storage' => 'Illuminate\Support\Facades\Storage', - 'URL' => 'Illuminate\Support\Facades\URL', - 'Validator' => 'Illuminate\Support\Facades\Validator', - 'View' => 'Illuminate\Support\Facades\View', - 'Form' => 'Illuminate\Html\FormFacade', - 'HTML' => 'Illuminate\Html\HtmlFacade', - 'phone' => 'The :attribute field contains an invalid number.', - 'Bugsnag' => 'Bugsnag\BugsnagLaravel\BugsnagFacade', - 'PDF' => 'Vsmoraes\Pdf\PdfFacade', - 'Gravatar' => 'Thomaswelton\LaravelGravatar\Facades\Gravatar', - 'UTC' => 'App\Http\Controllers\Agent\helpdesk\TicketController', - 'Ttable' => 'App\Http\Controllers\Agent\helpdesk\TicketController', //to use getTable function. - 'SMTPS' => 'App\Http\Controllers\HomeController', - 'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade', - 'Zipper' => 'Chumper\Zipper\Zipper', - 'JWTAuth' => 'Tymon\JWTAuth\Facades\JWTAuth', - 'JWTFactory' => 'Tymon\JWTAuth\Facades\JWTFactory', + 'App' => 'Illuminate\Support\Facades\App', + 'Artisan' => 'Illuminate\Support\Facades\Artisan', + 'Auth' => 'Illuminate\Support\Facades\Auth', + 'Blade' => 'Illuminate\Support\Facades\Blade', + 'Cache' => 'Illuminate\Support\Facades\Cache', + 'Config' => 'Illuminate\Support\Facades\Config', + 'Cookie' => 'Illuminate\Support\Facades\Cookie', + 'Crypt' => 'Illuminate\Support\Facades\Crypt', + 'DB' => 'Illuminate\Support\Facades\DB', + 'Eloquent' => 'Illuminate\Database\Eloquent\Model', + 'Event' => 'Illuminate\Support\Facades\Event', + 'File' => 'Illuminate\Support\Facades\File', + 'Hash' => 'Illuminate\Support\Facades\Hash', + 'Input' => 'Illuminate\Support\Facades\Input', + 'Inspiring' => 'Illuminate\Foundation\Inspiring', + 'Lang' => 'Illuminate\Support\Facades\Lang', + 'Log' => 'Illuminate\Support\Facades\Log', + 'Mail' => 'Illuminate\Support\Facades\Mail', + 'Password' => 'Illuminate\Support\Facades\Password', + 'Queue' => 'Illuminate\Support\Facades\Queue', + 'Redirect' => 'Illuminate\Support\Facades\Redirect', + 'Redis' => 'Illuminate\Support\Facades\Redis', + 'Request' => 'Illuminate\Support\Facades\Request', + 'Response' => 'Illuminate\Support\Facades\Response', + 'Route' => 'Illuminate\Support\Facades\Route', + 'Schema' => 'Illuminate\Support\Facades\Schema', + 'Session' => 'Illuminate\Support\Facades\Session', + 'Storage' => 'Illuminate\Support\Facades\Storage', + 'URL' => 'Illuminate\Support\Facades\URL', + 'Validator' => 'Illuminate\Support\Facades\Validator', + 'View' => 'Illuminate\Support\Facades\View', + 'Form' => 'Illuminate\Html\FormFacade', + 'HTML' => 'Illuminate\Html\HtmlFacade', + 'phone' => 'The :attribute field contains an invalid number.', + 'Bugsnag' => 'Bugsnag\BugsnagLaravel\BugsnagFacade', + 'PDF' => 'Vsmoraes\Pdf\PdfFacade', + 'Gravatar' => 'Thomaswelton\LaravelGravatar\Facades\Gravatar', + 'UTC' => 'App\Http\Controllers\Agent\helpdesk\TicketController', + 'Ttable' => 'App\Http\Controllers\Agent\helpdesk\TicketController', //to use getTable function. + 'SMTPS' => 'App\Http\Controllers\HomeController', + 'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade', + 'Zipper' => 'Chumper\Zipper\Zipper', + 'JWTAuth' => 'Tymon\JWTAuth\Facades\JWTAuth', + 'JWTFactory' => 'Tymon\JWTAuth\Facades\JWTFactory', 'Breadcrumbs' => 'DaveJamesMiller\Breadcrumbs\Facade', - 'GeoIP' => \Torann\GeoIP\Facades\GeoIP::class, - 'Image' => Intervention\Image\Facades\Image::class, - 'FCM' => LaravelFCM\Facades\FCM::class, - 'FCMGroup' => LaravelFCM\Facades\FCMGroup::class, - 'Debugbar' => Barryvdh\Debugbar\Facade::class, - 'Excel' => Maatwebsite\Excel\Facades\Excel::class, - 'Socialite' => Laravel\Socialite\Facades\Socialite::class, - 'UnAuth' => 'App\Http\Controllers\Client\helpdesk\UnAuthController', - 'Finder' => App\Helper\Finder::class, - 'Datatables' => Yajra\Datatables\Facades\Datatables::class, + 'GeoIP' => \Torann\GeoIP\Facades\GeoIP::class, + 'Image' => Intervention\Image\Facades\Image::class, + 'FCM' => LaravelFCM\Facades\FCM::class, + 'FCMGroup' => LaravelFCM\Facades\FCMGroup::class, + 'Debugbar' => Barryvdh\Debugbar\Facade::class, + 'Excel' => Maatwebsite\Excel\Facades\Excel::class, + 'Socialite' => Laravel\Socialite\Facades\Socialite::class, + 'UnAuth' => 'App\Http\Controllers\Client\helpdesk\UnAuthController', + 'Finder' => App\Helper\Finder::class, + 'Datatables' => Yajra\Datatables\Facades\Datatables::class, ], -]; \ No newline at end of file +]; diff --git a/config/datatables.php b/config/datatables.php index 89000cac5..c8ac57a44 100644 --- a/config/datatables.php +++ b/config/datatables.php @@ -1,59 +1,59 @@ [ - /** + /* * Smart search will enclose search keyword with wildcard string "%keyword%". * SQL: column LIKE "%keyword%" */ 'smart' => true, - /** + /* * Case insensitive will search the keyword in lower case format. * SQL: LOWER(column) LIKE LOWER(keyword) */ 'case_insensitive' => true, - /** + /* * Wild card will add "%" in between every characters of the keyword. * SQL: column LIKE "%k%e%y%w%o%r%d%" */ 'use_wildcards' => false, ], - /** + /* * DataTables fractal configurations. */ 'fractal' => [ - /** + /* * Request key name to parse includes on fractal. */ 'includes' => 'include', - /** + /* * Default fractal serializer. */ 'serializer' => 'League\Fractal\Serializer\DataArraySerializer', ], - /** + /* * DataTables script view template. */ 'script_template' => 'datatables::script', - /** + /* * DataTables internal index id response column name. */ 'index_column' => 'DT_Row_Index', - /** + /* * Namespaces used by the generator. */ 'namespace' => [ - /** + /* * Base namespace/directory to create the new file. * This is appended on default Laravel namespace. * @@ -64,7 +64,7 @@ return [ */ 'base' => 'DataTables', - /** + /* * Base namespace/directory where your model's are located. * This is appended on default Laravel namespace. * @@ -76,7 +76,7 @@ return [ 'model' => '', ], - /** + /* * PDF generator to be used when converting the table to pdf. * Available generators: excel, snappy * Snappy package: barryvdh/laravel-snappy diff --git a/config/debugbar.php b/config/debugbar.php index 406692f79..d6d0b11e5 100644 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -1,6 +1,6 @@ array( + 'storage' => [ 'enabled' => true, 'driver' => 'file', // redis, file, pdo, custom 'path' => storage_path('debugbar'), // For file driver 'connection' => null, // Leave null for default connection (Redis/PDO) - 'provider' => '' // Instance of StorageInterface for custom driver - ), + 'provider' => '', // Instance of StorageInterface for custom driver + ], /* |-------------------------------------------------------------------------- @@ -82,7 +82,7 @@ return array( | */ - 'collectors' => array( + 'collectors' => [ 'phpinfo' => true, // Php version 'messages' => true, // Messages 'time' => true, // Time Datalogger @@ -103,7 +103,7 @@ return array( 'auth' => false, // Display Laravel authentication status 'gate' => false, // Display Laravel Gate checks 'session' => true, // Display session data - ), + ], /* |-------------------------------------------------------------------------- @@ -114,33 +114,33 @@ return array( | */ - 'options' => array( - 'auth' => array( + 'options' => [ + 'auth' => [ 'show_name' => false, // Also show the users name/email in the debugbar - ), - 'db' => array( + ], + 'db' => [ 'with_params' => true, // Render SQL with the parameters substituted 'timeline' => false, // Add the queries to the timeline 'backtrace' => false, // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files. - 'explain' => array( // EXPERIMENTAL: Show EXPLAIN output on queries + 'explain' => [ // EXPERIMENTAL: Show EXPLAIN output on queries 'enabled' => false, - 'types' => array('SELECT'), // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+ - ), + 'types' => ['SELECT'], // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+ + ], 'hints' => true, // Show hints for common mistakes - ), - 'mail' => array( - 'full_log' => false - ), - 'views' => array( + ], + 'mail' => [ + 'full_log' => false, + ], + 'views' => [ 'data' => false, //Note: Can slow down the application, because the data can be quite large.. - ), - 'route' => array( - 'label' => true // show complete route on bar - ), - 'logs' => array( - 'file' => null - ), - ), + ], + 'route' => [ + 'label' => true, // show complete route on bar + ], + 'logs' => [ + 'file' => null, + ], + ], /* |-------------------------------------------------------------------------- @@ -167,4 +167,4 @@ return array( */ 'route_prefix' => '_debugbar', -); +]; diff --git a/config/excel.php b/config/excel.php index 2ad127703..fdbc685c4 100644 --- a/config/excel.php +++ b/config/excel.php @@ -1,8 +1,8 @@ array( + 'cache' => [ /* |-------------------------------------------------------------------------- @@ -29,24 +29,24 @@ return array( | Cache settings |-------------------------------------------------------------------------- */ - 'settings' => array( + 'settings' => [ 'memoryCacheSize' => '32MB', - 'cacheTime' => 600 + 'cacheTime' => 600, - ), + ], /* |-------------------------------------------------------------------------- | Memcache settings |-------------------------------------------------------------------------- */ - 'memcache' => array( + 'memcache' => [ 'host' => 'localhost', 'port' => 11211, - ), + ], /* |-------------------------------------------------------------------------- @@ -54,10 +54,10 @@ return array( |-------------------------------------------------------------------------- */ - 'dir' => storage_path('cache') - ), + 'dir' => storage_path('cache'), + ], - 'properties' => array( + 'properties' => [ 'creator' => 'Maatwebsite', 'lastModifiedBy' => 'Maatwebsite', 'title' => 'Spreadsheet', @@ -67,35 +67,35 @@ return array( 'category' => 'Excel', 'manager' => 'Maatwebsite', 'company' => 'Maatwebsite', - ), + ], /* |-------------------------------------------------------------------------- | Sheets settings |-------------------------------------------------------------------------- */ - 'sheets' => array( + 'sheets' => [ /* |-------------------------------------------------------------------------- | Default page setup |-------------------------------------------------------------------------- */ - 'pageSetup' => array( + 'pageSetup' => [ 'orientation' => 'portrait', 'paperSize' => '9', 'scale' => '100', 'fitToPage' => false, 'fitToHeight' => true, 'fitToWidth' => true, - 'columnsToRepeatAtLeft' => array('', ''), - 'rowsToRepeatAtTop' => array(0, 0), + 'columnsToRepeatAtLeft' => ['', ''], + 'rowsToRepeatAtTop' => [0, 0], 'horizontalCentered' => false, 'verticalCentered' => false, 'printArea' => null, 'firstPageNumber' => null, - ), - ), + ], + ], /* |-------------------------------------------------------------------------- @@ -108,7 +108,7 @@ return array( 'creator' => 'Maatwebsite', - 'csv' => array( + 'csv' => [ /* |-------------------------------------------------------------------------- | Delimiter @@ -142,10 +142,10 @@ return array( |-------------------------------------------------------------------------- */ - 'use_bom' => false - ), + 'use_bom' => false, + ], - 'export' => array( + 'export' => [ /* |-------------------------------------------------------------------------- @@ -218,7 +218,7 @@ return array( | Default sheet settings |-------------------------------------------------------------------------- */ - 'sheets' => array( + 'sheets' => [ /* |-------------------------------------------------------------------------- @@ -253,8 +253,8 @@ return array( | Apply strict comparison when testing for null values in the array |-------------------------------------------------------------------------- */ - 'strictNullComparison' => false - ), + 'strictNullComparison' => false, + ], /* |-------------------------------------------------------------------------- @@ -262,7 +262,7 @@ return array( |-------------------------------------------------------------------------- */ - 'store' => array( + 'store' => [ /* |-------------------------------------------------------------------------- @@ -282,16 +282,16 @@ return array( | Whether we want to return information about the stored file or not | */ - 'returnInfo' => false + 'returnInfo' => false, - ), + ], /* |-------------------------------------------------------------------------- | PDF Settings |-------------------------------------------------------------------------- */ - 'pdf' => array( + 'pdf' => [ /* |-------------------------------------------------------------------------- @@ -306,48 +306,48 @@ return array( | PDF Driver settings |-------------------------------------------------------------------------- */ - 'drivers' => array( + 'drivers' => [ /* |-------------------------------------------------------------------------- | DomPDF settings |-------------------------------------------------------------------------- */ - 'DomPDF' => array( - 'path' => base_path('vendor/dompdf/dompdf/') - ), + 'DomPDF' => [ + 'path' => base_path('vendor/dompdf/dompdf/'), + ], /* |-------------------------------------------------------------------------- | tcPDF settings |-------------------------------------------------------------------------- */ - 'tcPDF' => array( - 'path' => base_path('vendor/tecnick.com/tcpdf/') - ), + 'tcPDF' => [ + 'path' => base_path('vendor/tecnick.com/tcpdf/'), + ], /* |-------------------------------------------------------------------------- | mPDF settings |-------------------------------------------------------------------------- */ - 'mPDF' => array( - 'path' => base_path('vendor/mpdf/mpdf/') - ), - ) - ) - ), + 'mPDF' => [ + 'path' => base_path('vendor/mpdf/mpdf/'), + ], + ], + ], + ], - 'filters' => array( + 'filters' => [ /* |-------------------------------------------------------------------------- | Register read filters |-------------------------------------------------------------------------- */ - 'registered' => array( - 'chunk' => 'Maatwebsite\Excel\Filters\ChunkReadFilter' - ), + 'registered' => [ + 'chunk' => 'Maatwebsite\Excel\Filters\ChunkReadFilter', + ], /* |-------------------------------------------------------------------------- @@ -355,10 +355,10 @@ return array( |-------------------------------------------------------------------------- */ - 'enabled' => array() - ), + 'enabled' => [], + ], - 'import' => array( + 'import' => [ /* |-------------------------------------------------------------------------- @@ -423,12 +423,12 @@ return array( |-------------------------------------------------------------------------- */ - 'encoding' => array( + 'encoding' => [ 'input' => 'UTF-8', - 'output' => 'UTF-8' + 'output' => 'UTF-8', - ), + ], /* |-------------------------------------------------------------------------- @@ -474,7 +474,7 @@ return array( | */ - 'dates' => array( + 'dates' => [ /* |-------------------------------------------------------------------------- @@ -498,15 +498,15 @@ return array( | Date columns |-------------------------------------------------------------------------- */ - 'columns' => array() - ), + 'columns' => [], + ], /* |-------------------------------------------------------------------------- | Import sheets by config |-------------------------------------------------------------------------- */ - 'sheets' => array( + 'sheets' => [ /* |-------------------------------------------------------------------------- @@ -517,16 +517,16 @@ return array( | */ - 'test' => array( + 'test' => [ - 'firstname' => 'A2' + 'firstname' => 'A2', - ) + ], - ) - ), + ], + ], - 'views' => array( + 'views' => [ /* |-------------------------------------------------------------------------- @@ -537,155 +537,155 @@ return array( | */ - 'styles' => array( + 'styles' => [ /* |-------------------------------------------------------------------------- | Table headings |-------------------------------------------------------------------------- */ - 'th' => array( - 'font' => array( + 'th' => [ + 'font' => [ 'bold' => true, 'size' => 12, - ) - ), + ], + ], /* |-------------------------------------------------------------------------- | Strong tags |-------------------------------------------------------------------------- */ - 'strong' => array( - 'font' => array( + 'strong' => [ + 'font' => [ 'bold' => true, 'size' => 12, - ) - ), + ], + ], /* |-------------------------------------------------------------------------- | Bold tags |-------------------------------------------------------------------------- */ - 'b' => array( - 'font' => array( + 'b' => [ + 'font' => [ 'bold' => true, 'size' => 12, - ) - ), + ], + ], /* |-------------------------------------------------------------------------- | Italic tags |-------------------------------------------------------------------------- */ - 'i' => array( - 'font' => array( + 'i' => [ + 'font' => [ 'italic' => true, 'size' => 12, - ) - ), + ], + ], /* |-------------------------------------------------------------------------- | Heading 1 |-------------------------------------------------------------------------- */ - 'h1' => array( - 'font' => array( + 'h1' => [ + 'font' => [ 'bold' => true, 'size' => 24, - ) - ), + ], + ], /* |-------------------------------------------------------------------------- | Heading 2 |-------------------------------------------------------------------------- */ - 'h2' => array( - 'font' => array( + 'h2' => [ + 'font' => [ 'bold' => true, 'size' => 18, - ) - ), + ], + ], /* |-------------------------------------------------------------------------- | Heading 2 |-------------------------------------------------------------------------- */ - 'h3' => array( - 'font' => array( + 'h3' => [ + 'font' => [ 'bold' => true, 'size' => 13.5, - ) - ), + ], + ], /* |-------------------------------------------------------------------------- | Heading 4 |-------------------------------------------------------------------------- */ - 'h4' => array( - 'font' => array( + 'h4' => [ + 'font' => [ 'bold' => true, 'size' => 12, - ) - ), + ], + ], /* |-------------------------------------------------------------------------- | Heading 5 |-------------------------------------------------------------------------- */ - 'h5' => array( - 'font' => array( + 'h5' => [ + 'font' => [ 'bold' => true, 'size' => 10, - ) - ), + ], + ], /* |-------------------------------------------------------------------------- | Heading 6 |-------------------------------------------------------------------------- */ - 'h6' => array( - 'font' => array( + 'h6' => [ + 'font' => [ 'bold' => true, 'size' => 7.5, - ) - ), + ], + ], /* |-------------------------------------------------------------------------- | Hyperlinks |-------------------------------------------------------------------------- */ - 'a' => array( - 'font' => array( + 'a' => [ + 'font' => [ 'underline' => true, - 'color' => array('argb' => 'FF0000FF'), - ) - ), + 'color' => ['argb' => 'FF0000FF'], + ], + ], /* |-------------------------------------------------------------------------- | Horizontal rules |-------------------------------------------------------------------------- */ - 'hr' => array( - 'borders' => array( - 'bottom' => array( + 'hr' => [ + 'borders' => [ + 'bottom' => [ 'style' => 'thin', - 'color' => array('FF000000') - ), - ) - ) - ) + 'color' => ['FF000000'], + ], + ], + ], + ], - ) + ], -); +]; diff --git a/config/lfm.php b/config/lfm.php index 5f817f287..409361fe0 100644 --- a/config/lfm.php +++ b/config/lfm.php @@ -33,10 +33,9 @@ return [ 'image/jpeg', 'image/pjpeg', 'image/png', - 'image/gif' + 'image/gif', ], - // valid file mimetypes (only when '/laravel-filemanager?type=Files') 'valid_file_mimetypes' => [ 'image/jpeg', @@ -44,6 +43,6 @@ return [ 'image/png', 'image/gif', 'application/pdf', - 'text/plain' + 'text/plain', ], ]; diff --git a/config/mail.php b/config/mail.php index f6e88b3b7..8c41cf899 100644 --- a/config/mail.php +++ b/config/mail.php @@ -15,7 +15,7 @@ return [ | */ - 'driver' =>'', + 'driver' => '', /* |-------------------------------------------------------------------------- | SMTP Host Address diff --git a/config/queue.php b/config/queue.php index 5077fbc8e..46bf10ca0 100644 --- a/config/queue.php +++ b/config/queue.php @@ -34,34 +34,34 @@ return [ ], 'database' => [ 'driver' => 'database', - 'table' => 'jobs', - 'queue' => 'default', + 'table' => 'jobs', + 'queue' => 'default', 'expire' => 60, ], 'beanstalkd' => [ 'driver' => 'beanstalkd', - 'host' => 'localhost', - 'queue' => 'default', - 'ttr' => 60, + 'host' => 'localhost', + 'queue' => 'default', + 'ttr' => 60, ], 'sqs' => [ 'driver' => 'sqs', - 'key' => 'your-public-key', + 'key' => 'your-public-key', 'secret' => 'your-secret-key', - 'queue' => 'your-queue-url', + 'queue' => 'your-queue-url', 'region' => 'us-east-1', ], 'iron' => [ - 'driver' => 'iron', - 'host' => 'mq-aws-us-east-1.iron.io', - 'token' => 'your-token', + 'driver' => 'iron', + 'host' => 'mq-aws-us-east-1.iron.io', + 'token' => 'your-token', 'project' => 'your-project-id', - 'queue' => 'your-queue-name', + 'queue' => 'your-queue-name', 'encrypt' => true, ], 'redis' => [ 'driver' => '', - 'queue' => '', + 'queue' => '', 'expire' => 60, ], ], diff --git a/config/services.php b/config/services.php index 869acc439..61305a76f 100644 --- a/config/services.php +++ b/config/services.php @@ -22,45 +22,44 @@ return [ 'secret' => '', ], 'ses' => [ - 'key' => '', + 'key' => '', 'secret' => '', 'region' => 'us-east-1', ], 'stripe' => [ - 'model' => 'User', + 'model' => 'User', 'secret' => '', ], - + 'facebook' => [ - 'client_id' => '',//'1549781705316089', //app id - 'client_secret' => '',//'d87caaf1b1dd1d5620fee458a85fb04b', //app secret - 'redirect' => '',//'http://localhost/FaveoVersions/faveo-helpdesk/public/social/login/facebook', //redirec + 'client_id' => '', //'1549781705316089', //app id + 'client_secret' => '', //'d87caaf1b1dd1d5620fee458a85fb04b', //app secret + 'redirect' => '', //'http://localhost/FaveoVersions/faveo-helpdesk/public/social/login/facebook', //redirec ], 'google' => [ - 'client_id' => '',//'688540182553-kp780p6fvhjqtl6c91npm6hjair96vkr.apps.googleusercontent.com', //app id - 'client_secret' => '',//'ZZ9lXX6uqLGgP1NzbQMh8tMT', //secret - 'redirect' => '',//'http://localhost/FaveoVersions/faveo-helpdesk/public/social/login/google', //redirect + 'client_id' => '', //'688540182553-kp780p6fvhjqtl6c91npm6hjair96vkr.apps.googleusercontent.com', //app id + 'client_secret' => '', //'ZZ9lXX6uqLGgP1NzbQMh8tMT', //secret + 'redirect' => '', //'http://localhost/FaveoVersions/faveo-helpdesk/public/social/login/google', //redirect ], 'github' => [ - 'client_id' => '',//'32e7f0bf89715bee29c4', //app id - 'client_secret' => '',//'2f279448a6e22bcc3948684b9fd9ae52859aa3dc', //app secrete, - 'redirect' => '',//'http://localhost/FaveoVersions/faveo-helpdesk/public/social/login/github', //redirect + 'client_id' => '', //'32e7f0bf89715bee29c4', //app id + 'client_secret' => '', //'2f279448a6e22bcc3948684b9fd9ae52859aa3dc', //app secrete, + 'redirect' => '', //'http://localhost/FaveoVersions/faveo-helpdesk/public/social/login/github', //redirect ], 'twitter' => [ - 'client_id' => '',//'zIngm3fOvZSUl2mXQVuUkeyJq', //app id - 'client_secret' => '',//'56qAS0c0AuDQqMKu6eFaixfEuIMt8L0PrOxvXtJ4Lcq08xClT2', //app secrete, - 'redirect' => '',//'http://twitter-auth.app/FaveoVersions/faveo-helpdesk/public/social/login/twitter', //redirect + 'client_id' => '', //'zIngm3fOvZSUl2mXQVuUkeyJq', //app id + 'client_secret' => '', //'56qAS0c0AuDQqMKu6eFaixfEuIMt8L0PrOxvXtJ4Lcq08xClT2', //app secrete, + 'redirect' => '', //'http://twitter-auth.app/FaveoVersions/faveo-helpdesk/public/social/login/twitter', //redirect ], 'linkedin' => [ - 'client_id' => '',//'8124vrpk0p0a4h', //client id - 'client_secret' => '',//'hKWvjrJba80PSzET', //client secrete, - 'redirect' => '',//'http://localhost/FaveoVersions/faveo-helpdesk/public/social/login/linkedin', //redirect + 'client_id' => '', //'8124vrpk0p0a4h', //client id + 'client_secret' => '', //'hKWvjrJba80PSzET', //client secrete, + 'redirect' => '', //'http://localhost/FaveoVersions/faveo-helpdesk/public/social/login/linkedin', //redirect ], 'bitbucket' => [ - 'client_id' => '',//'pLKys6C89Xg6bbuHcL', //client id - 'client_secret' => '',//'dD7HerXuELJR3uZQv93ZYuXsg5vLSzLR', //client secrete, - 'redirect' => '',//'http://localhost/FaveoVersions/faveo-helpdesk/public/social/login/bitbucket', //redirect + 'client_id' => '', //'pLKys6C89Xg6bbuHcL', //client id + 'client_secret' => '', //'dD7HerXuELJR3uZQv93ZYuXsg5vLSzLR', //client secrete, + 'redirect' => '', //'http://localhost/FaveoVersions/faveo-helpdesk/public/social/login/bitbucket', //redirect ], - - + ]; diff --git a/database/migrations/2016_02_16_140450_create_users_table.php b/database/migrations/2016_02_16_140450_create_users_table.php index b1392a743..83676a3ae 100644 --- a/database/migrations/2016_02_16_140450_create_users_table.php +++ b/database/migrations/2016_02_16_140450_create_users_table.php @@ -22,7 +22,7 @@ class CreateUsersTable extends Migration $table->boolean('ban'); $table->string('password', 60); $table->integer('active'); - $table->boolean('is_delete')->default(0);; + $table->boolean('is_delete')->default(0); $table->string('ext'); $table->integer('country_code'); $table->string('phone_number'); diff --git a/database/migrations/2016_06_28_141613_version1079table.php b/database/migrations/2016_06_28_141613_version1079table.php index e5ae54496..70d13aa36 100644 --- a/database/migrations/2016_06_28_141613_version1079table.php +++ b/database/migrations/2016_06_28_141613_version1079table.php @@ -1,16 +1,16 @@ where('option_name', 'itil')->first(); if (!$settings) { - DB::table('common_settings')->insert(['option_name'=>'itil','status'=>'0']); + DB::table('common_settings')->insert(['option_name'=>'itil', 'status'=>'0']); } } } - } diff --git a/database/migrations/2016_07_02_051247_create_jobs_table.php b/database/migrations/2016_07_02_051247_create_jobs_table.php index 81b2d29f2..1d2900ac0 100644 --- a/database/migrations/2016_07_02_051247_create_jobs_table.php +++ b/database/migrations/2016_07_02_051247_create_jobs_table.php @@ -1,7 +1,7 @@ string('short_name'); $table->timestamps(); }); - + $mail = new MailService(); - $services= ['smtp'=>'SMTP','mail'=>'Php Mail','sendmail'=>'Send Mail','mailgun'=>'Mailgun','mandrill'=>'Mandrill','log'=>'Log file']; - foreach($services as $key=>$value){ - $mail->create([ - 'name'=>$value, - 'short_name'=>$key, + $services = ['smtp'=>'SMTP', 'mail'=>'Php Mail', 'sendmail'=>'Send Mail', 'mailgun'=>'Mailgun', 'mandrill'=>'Mandrill', 'log'=>'Log file']; + foreach ($services as $key=>$value) { + $mail->create([ + 'name' => $value, + 'short_name'=> $key, ]); } - - } /** diff --git a/database/migrations/2016_07_26_095020_create_queue_services_table.php b/database/migrations/2016_07_26_095020_create_queue_services_table.php index 122ad622b..a975ab6be 100644 --- a/database/migrations/2016_07_26_095020_create_queue_services_table.php +++ b/database/migrations/2016_07_26_095020_create_queue_services_table.php @@ -1,8 +1,8 @@ integer('status'); $table->timestamps(); }); - + $queue = new QueueService(); - $services = ['sync'=>'Sync','database'=>'Database','beanstalkd'=>'Beanstalkd','sqs'=>'SQS','iron'=>'Iron','redis'=>'Redis']; - foreach($services as $key=>$value){ + $services = ['sync'=>'Sync', 'database'=>'Database', 'beanstalkd'=>'Beanstalkd', 'sqs'=>'SQS', 'iron'=>'Iron', 'redis'=>'Redis']; + foreach ($services as $key=>$value) { $queue->create([ - 'name'=>$value, - 'short_name'=>$key, - 'status'=>0, + 'name' => $value, + 'short_name'=> $key, + 'status' => 0, ]); } - $q = $queue->where('short_name','sync')->first(); - if($q){ - $q->status = 1; - $q->save(); + $q = $queue->where('short_name', 'sync')->first(); + if ($q) { + $q->status = 1; + $q->save(); } } diff --git a/database/migrations/2016_07_29_113012_create_conditions_table.php b/database/migrations/2016_07_29_113012_create_conditions_table.php index 8fb8691b5..042504317 100644 --- a/database/migrations/2016_07_29_113012_create_conditions_table.php +++ b/database/migrations/2016_07_29_113012_create_conditions_table.php @@ -1,7 +1,7 @@ string('css_class'); @@ -23,15 +24,16 @@ class AlterTicketSourceTable extends Migration { } } - public function values() { + public function values() + { return[ - ['name' => 'web', 'value' => 'Web', 'css_class' => 'fa fa-internet-explorer',], - ['name' => 'email', 'value' => 'E-mail', 'css_class' => 'fa fa-envelope',], - ['name' => 'agent', 'value' => 'Agent Panel', 'css_class' => 'fa fa-envelope',], - ['name' => 'facebook', 'value' => 'Facebook', 'css_class' => 'fa fa-facebook',], - ['name' => 'twitter', 'value' => 'Twitter', 'css_class' => 'fa fa-twitter',], - ['name' => 'call', 'value' => 'Call', 'css_class' => 'fa fa-phone',], - ['name' => 'chat', 'value' => 'Chat', 'css_class' => 'fa fa-comment',], + ['name' => 'web', 'value' => 'Web', 'css_class' => 'fa fa-internet-explorer'], + ['name' => 'email', 'value' => 'E-mail', 'css_class' => 'fa fa-envelope'], + ['name' => 'agent', 'value' => 'Agent Panel', 'css_class' => 'fa fa-envelope'], + ['name' => 'facebook', 'value' => 'Facebook', 'css_class' => 'fa fa-facebook'], + ['name' => 'twitter', 'value' => 'Twitter', 'css_class' => 'fa fa-twitter'], + ['name' => 'call', 'value' => 'Call', 'css_class' => 'fa fa-phone'], + ['name' => 'chat', 'value' => 'Chat', 'css_class' => 'fa fa-comment'], ]; } @@ -40,10 +42,10 @@ class AlterTicketSourceTable extends Migration { * * @return void */ - public function down() { + public function down() + { Schema::table('ticket_source', function (Blueprint $table) { // }); } - } diff --git a/database/migrations/test/2016_07_26_084458_create_faveo_mails_table.php b/database/migrations/test/2016_07_26_084458_create_faveo_mails_table.php index 94a66f639..ef3c1ce93 100644 --- a/database/migrations/test/2016_07_26_084458_create_faveo_mails_table.php +++ b/database/migrations/test/2016_07_26_084458_create_faveo_mails_table.php @@ -1,7 +1,7 @@ string('short_name'); $table->timestamps(); }); - + $mail = new MailService(); - $services= ['smtp'=>'SMTP','mail'=>'Php Mail','sendmail'=>'Send Mail','mailgun'=>'Mailgun','mandrill'=>'Mandrill','log'=>'Log file']; - foreach($services as $key=>$value){ - $mail->create([ - 'name'=>$value, - 'short_name'=>$key, + $services = ['smtp'=>'SMTP', 'mail'=>'Php Mail', 'sendmail'=>'Send Mail', 'mailgun'=>'Mailgun', 'mandrill'=>'Mandrill', 'log'=>'Log file']; + foreach ($services as $key=>$value) { + $mail->create([ + 'name' => $value, + 'short_name'=> $key, ]); } - - } /** diff --git a/database/migrations/test/2016_07_26_095020_create_queue_services_table.php b/database/migrations/test/2016_07_26_095020_create_queue_services_table.php index fa7283707..a682c7b59 100644 --- a/database/migrations/test/2016_07_26_095020_create_queue_services_table.php +++ b/database/migrations/test/2016_07_26_095020_create_queue_services_table.php @@ -1,8 +1,8 @@ integer('status'); $table->timestamps(); }); - + $queue = new QueueService(); - $services = ['database'=>'Local Database','beanstalkd'=>'Beanstalkd','sqs'=>'SQS','iron'=>'Iron','redis'=>'Redis']; + $services = ['database'=>'Local Database', 'beanstalkd'=>'Beanstalkd', 'sqs'=>'SQS', 'iron'=>'Iron', 'redis'=>'Redis']; $status = 0; - foreach($services as $key=>$value){ - if($key==='database'){ - $status=1; + foreach ($services as $key=>$value) { + if ($key === 'database') { + $status = 1; } $queue->create([ - 'name'=>$value, - 'short_name'=>$key, - 'status'=>$status, + 'name' => $value, + 'short_name'=> $key, + 'status' => $status, ]); } } diff --git a/database/migrations/test/2016_07_29_113012_create_conditions_table.php b/database/migrations/test/2016_07_29_113012_create_conditions_table.php index 8fb8691b5..042504317 100644 --- a/database/migrations/test/2016_07_29_113012_create_conditions_table.php +++ b/database/migrations/test/2016_07_29_113012_create_conditions_table.php @@ -1,7 +1,7 @@ string('css_class'); @@ -23,13 +24,14 @@ class AlterTicketSourceTable extends Migration { } } - public function values() { + public function values() + { return[ - ['name' => 'web', 'value' => 'Web', 'css_class' => 'fa fa-internet-explorer',], - ['name' => 'email', 'value' => 'E-mail', 'css_class' => 'fa fa-envelope',], - ['name' => 'agent', 'value' => 'Agent Panel', 'css_class' => 'fa fa-envelope',], - ['name' => 'facebook', 'value' => 'Facebook', 'css_class' => 'fa fa-facebook',], - ['name' => 'twitter', 'value' => 'Twitter', 'css_class' => 'fa fa-twitter',], + ['name' => 'web', 'value' => 'Web', 'css_class' => 'fa fa-internet-explorer'], + ['name' => 'email', 'value' => 'E-mail', 'css_class' => 'fa fa-envelope'], + ['name' => 'agent', 'value' => 'Agent Panel', 'css_class' => 'fa fa-envelope'], + ['name' => 'facebook', 'value' => 'Facebook', 'css_class' => 'fa fa-facebook'], + ['name' => 'twitter', 'value' => 'Twitter', 'css_class' => 'fa fa-twitter'], ]; } @@ -38,10 +40,10 @@ class AlterTicketSourceTable extends Migration { * * @return void */ - public function down() { + public function down() + { Schema::table('ticket_source', function (Blueprint $table) { // }); } - } diff --git a/database/migrations/test1/test1/2016_08_16_104539_alter_ticket_source_table.php b/database/migrations/test1/test1/2016_08_16_104539_alter_ticket_source_table.php index aa126f8d5..a39f3e57e 100644 --- a/database/migrations/test1/test1/2016_08_16_104539_alter_ticket_source_table.php +++ b/database/migrations/test1/test1/2016_08_16_104539_alter_ticket_source_table.php @@ -1,16 +1,17 @@ string('css_class'); @@ -23,13 +24,14 @@ class AlterTicketSourceTable extends Migration { } } - public function values() { + public function values() + { return[ - ['name' => 'web', 'value' => 'Web', 'css_class' => 'fa fa-internet-explorer',], - ['name' => 'email', 'value' => 'E-mail', 'css_class' => 'fa fa-envelope',], - ['name' => 'agent', 'value' => 'Agent Panel', 'css_class' => 'fa fa-envelope',], - ['name' => 'facebook', 'value' => 'Facebook', 'css_class' => 'fa fa-facebook',], - ['name' => 'twitter', 'value' => 'Twitter', 'css_class' => 'fa fa-twitter',], + ['name' => 'web', 'value' => 'Web', 'css_class' => 'fa fa-internet-explorer'], + ['name' => 'email', 'value' => 'E-mail', 'css_class' => 'fa fa-envelope'], + ['name' => 'agent', 'value' => 'Agent Panel', 'css_class' => 'fa fa-envelope'], + ['name' => 'facebook', 'value' => 'Facebook', 'css_class' => 'fa fa-facebook'], + ['name' => 'twitter', 'value' => 'Twitter', 'css_class' => 'fa fa-twitter'], ]; } @@ -38,10 +40,10 @@ class AlterTicketSourceTable extends Migration { * * @return void */ - public function down() { + public function down() + { Schema::table('ticket_source', function (Blueprint $table) { // }); } - } diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 45fcdf006..d64053fe8 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -26,6 +26,7 @@ use App\Model\helpdesk\Utility\CountryCode; use App\Model\helpdesk\Utility\Date_format; use App\Model\helpdesk\Utility\Date_time_format; use App\Model\helpdesk\Utility\Languages; +use App\Model\helpdesk\Utility\Limit_Login; use App\Model\helpdesk\Utility\Log_notification; use App\Model\helpdesk\Utility\MailboxProtocol; use App\Model\helpdesk\Utility\Time_format; @@ -33,8 +34,6 @@ use App\Model\helpdesk\Utility\Timezones; use App\Model\helpdesk\Utility\Version_Check; use App\Model\helpdesk\Workflow\WorkflowClose; use App\Model\kb\Settings; -use App\Model\helpdesk\Utility\Limit_Login; - // Knowledge base use Illuminate\Database\Seeder; @@ -218,7 +217,6 @@ class DatabaseSeeder extends Seeder Ticket_priority::create(['priority' => 'Normal', 'status' => 1, 'priority_desc' => 'Normal', 'priority_color' => '#00bfef', 'priority_urgency' => '3', 'ispublic' => '1', 'is_default' => '1']); Ticket_priority::create(['priority' => 'High', 'status' => 1, 'priority_desc' => 'High', 'priority_color' => '#f39c11', 'priority_urgency' => '2', 'ispublic' => '1']); Ticket_priority::create(['priority' => 'Emergency', 'status' => 1, 'priority_desc' => 'Emergency', 'priority_color' => '#dd4b38', 'priority_urgency' => '1', 'ispublic' => '1']); - /* SLA Plans */ Sla_plan::create(['name' => 'Sla 1', 'grace_period' => '6 Hours', 'status' => '1']); @@ -272,7 +270,7 @@ class DatabaseSeeder extends Seeder Company::create(['id' => '1']); Email::create(['id' => '1', 'template' => 'default', 'email_fetching' => '1', 'notification_cron' => '1', 'all_emails' => '1', 'email_collaborator' => '1', 'attachment' => '1']); Responder::create(['id' => '1', 'new_ticket' => '1', 'agent_new_ticket' => '1']); - System::create(array('id' => '1', 'status' => '1', 'department' => '1', 'date_time_format' => '1', 'time_zone' => '32')); + System::create(['id' => '1', 'status' => '1', 'department' => '1', 'date_time_format' => '1', 'time_zone' => '32']); Ticket::create(['num_format' => '$$$$-####-####', 'num_sequence' => 'sequence', 'collision_avoid' => '2', 'priority' => '1', 'sla' => '2', 'help_topic' => '1', 'status' => '1']); /* Ticket source */ Ticket_source::create(['name' => 'web', 'value' => 'Web']); @@ -1979,11 +1977,8 @@ class DatabaseSeeder extends Seeder 'numcode' => '716', 'phonecode' => '263', ]); - - Security::create(['id' => '1', 'lockout_message' => 'You have been locked out of application due to too many failed login attempts.', 'backlist_offender' => '0', 'backlist_threshold' => '15', 'lockout_period' => '15', 'days_to_keep_logs' => '0']); - TemplateSet::create(['id' => '1', 'name' => 'default', 'active' => '1']); TemplateType::create(['id' => '1', 'name' => 'assign-ticket']); @@ -2000,7 +1995,6 @@ class DatabaseSeeder extends Seeder TemplateType::create(['id' => '12', 'name' => 'team_assign_ticket']); TemplateType::create(['id' => '13', 'name' => 'reset_new_password']); - Template::create(['id' => '1', 'variable' => '0', 'name' => 'This template is for sending notice to agent when ticket is assigned to them', 'type' => '1', 'message' => '
- ';
- echo "
- ';
$directory = "$this->dir/UPDATES";
@@ -190,17 +197,18 @@ class UpgradeController extends Controller {
$this->deleteBarNotification('new-version');
- echo "
- ';
- echo "
- ';
for ($i = 0; $i < $ex; $i++) {
@@ -257,7 +269,8 @@ class UpgradeController extends Controller {
echo '
CURRENT VERSION: $current_version
"; echo 'Reading Current Releases List
'; if ($latest_version > $current_version) { - echo 'New Update Found: v' . $latest_version . '
'; + echo 'New Update Found: v'.$latest_version.'
'; $found = true; if (!is_file("$this->dir/UPDATES/faveo-helpdesk-master.zip")) { if ($request->get('dodownload') == true) { @@ -278,7 +291,7 @@ class UpgradeController extends Controller { echo 'Error in you network connection.
'; } } else { - echo 'Latest code found. » Download Now?
'; + echo 'Latest code found. » Download Now?
'; exit(); } } else { @@ -287,7 +300,7 @@ class UpgradeController extends Controller { if ($request->get('doUpdate') == true) { $updated = $this->doUpdate(); } else { - echo 'Update ready. » Install Now?
'; + echo 'Update ready. » Install Now?
'; exit(); } @@ -307,17 +320,18 @@ class UpgradeController extends Controller { } } - public function getCurl($url) { + public function getCurl($url) + { try { $curl = Utility::_isCurl(); if (!$curl) { - throw new Exception("Please enable your curl function to check latest update"); + throw new Exception('Please enable your curl function to check latest update'); } $ch = curl_init(); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_URL, $url); if (curl_exec($ch) === false) { - echo 'Curl error: ' . curl_error($ch); + echo 'Curl error: '.curl_error($ch); } $data = curl_exec($ch); curl_close($ch); @@ -328,11 +342,12 @@ class UpgradeController extends Controller { } } - public function postDownloadCurl($url, $data) { + public function postDownloadCurl($url, $data) + { try { $curl = Utility::_isCurl(); if (!$curl) { - throw new Exception("Please enable your curl function to check latest update"); + throw new Exception('Please enable your curl function to check latest update'); } $ch = curl_init(); curl_setopt($ch, CURLOPT_POST, 1); @@ -340,21 +355,23 @@ class UpgradeController extends Controller { curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_URL, $url); if (curl_exec($ch) === false) { - echo 'Curl error: ' . curl_error($ch); + echo 'Curl error: '.curl_error($ch); } $data = curl_exec($ch); curl_close($ch); + return json_decode($data, true); } catch (Exception $ex) { return redirect()->back()->with('fails', $ex->getMessage()); } } - public function postCurl($url, $data) { + public function postCurl($url, $data) + { try { $curl = Utility::_isCurl(); if (!$curl) { - throw new Exception("Please enable your curl function to check latest update"); + throw new Exception('Please enable your curl function to check latest update'); } $ch = curl_init(); curl_setopt($ch, CURLOPT_POST, 1); @@ -362,18 +379,20 @@ class UpgradeController extends Controller { curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_URL, $url); if (curl_exec($ch) === false) { - echo 'Curl error: ' . curl_error($ch); + echo 'Curl error: '.curl_error($ch); } $data = curl_exec($ch); curl_close($ch); $data = Utility::decryptByFaveoPrivateKey($data); + return json_decode($data, true); } catch (Exception $ex) { return redirect()->back()->with('fails', $ex->getMessage()); } } - public function databaseUpdate() { + public function databaseUpdate() + { try { if (Utility::getFileVersion() > Utility::getDatabaseVersion()) { $url = url('database-upgrade'); @@ -387,7 +406,8 @@ class UpgradeController extends Controller { } } - public function databaseUpgrade() { + public function databaseUpgrade() + { try { if (Utility::getFileVersion() > Utility::getDatabaseVersion()) { Artisan::call('migrate', ['--force' => true]); @@ -400,5 +420,4 @@ class UpgradeController extends Controller { return redirect()->back()->with('fails', $ex->getMessage()); } } - } diff --git a/app/Http/Controllers/Utility/LibraryController.php b/app/Http/Controllers/Utility/LibraryController.php index cca5c4a02..c8b324606 100644 --- a/app/Http/Controllers/Utility/LibraryController.php +++ b/app/Http/Controllers/Utility/LibraryController.php @@ -7,9 +7,10 @@ use Config; use Exception; use Schema; -class LibraryController extends Controller { - - public static function getFileVersion() { +class LibraryController extends Controller +{ + public static function getFileVersion() + { try { $app = Config::get('app.version'); if ($app) { @@ -22,7 +23,8 @@ class LibraryController extends Controller { } } - public static function getDatabaseVersion() { + public static function getDatabaseVersion() + { try { $database = self::isDatabaseSetup(); if ($database == true) { @@ -39,7 +41,8 @@ class LibraryController extends Controller { } } - public static function isDatabaseSetup() { + public static function isDatabaseSetup() + { try { if (Schema::hasTable('settings_system')) { return true; @@ -49,28 +52,30 @@ class LibraryController extends Controller { } } - public static function encryptByFaveoPublicKey($data) { + public static function encryptByFaveoPublicKey($data) + { try { - $path = storage_path() . DIRECTORY_SEPARATOR . 'app' . DIRECTORY_SEPARATOR . 'public.key'; + $path = storage_path().DIRECTORY_SEPARATOR.'app'.DIRECTORY_SEPARATOR.'public.key'; //dd($path); $key_content = file_get_contents($path); $public_key = openssl_get_publickey($key_content); - $encrypted = $e = NULL; - openssl_seal($data, $encrypted, $e, array($public_key)); + $encrypted = $e = null; + openssl_seal($data, $encrypted, $e, [$public_key]); $sealed_data = base64_encode($encrypted); $envelope = base64_encode($e[0]); $result = ['seal' => $sealed_data, 'envelope' => $envelope]; + return json_encode($result); } catch (Exception $ex) { throw new Exception($ex->getMessage()); } } - public static function decryptByFaveoPrivateKey($encrypted) { - + public static function decryptByFaveoPrivateKey($encrypted) + { try { $encrypted = json_decode($encrypted); if ($encrypted) { @@ -78,11 +83,12 @@ class LibraryController extends Controller { $envelope = $encrypted->envelope; $input = base64_decode($sealed_data); $einput = base64_decode($envelope); - $path = storage_path('app' . DIRECTORY_SEPARATOR . 'private.key'); + $path = storage_path('app'.DIRECTORY_SEPARATOR.'private.key'); $key_content = file_get_contents($path); $private_key = openssl_get_privatekey($key_content); - $plaintext = NULL; + $plaintext = null; openssl_open($input, $plaintext, $einput, $private_key); + return $plaintext; } } catch (Exception $ex) { @@ -90,8 +96,8 @@ class LibraryController extends Controller { } } - public static function _isCurl() { + public static function _isCurl() + { return function_exists('curl_version'); } - } diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index a4b107f4a..9fa7a70fd 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -44,6 +44,7 @@ class Authenticate if ($this->auth->guest()) { if ($request->ajax()) { $result = ['fails' => 'Unauthorized! Please login again']; + return response()->json(compact('result')); } else { return redirect()->guest('auth/login'); diff --git a/app/Http/Requests/helpdesk/AgentRequest.php b/app/Http/Requests/helpdesk/AgentRequest.php index 0dd514ef6..d31d9f0ea 100644 --- a/app/Http/Requests/helpdesk/AgentRequest.php +++ b/app/Http/Requests/helpdesk/AgentRequest.php @@ -1,9 +1,9 @@ check(new CommonSettings); + $check = $this->check(new CommonSettings()); if ($check != 0) { return $check; } + return [ 'user_name' => 'required|unique:users|max:30', 'first_name' => 'required|max:30', @@ -45,15 +46,18 @@ class AgentRequest extends Request 'agent_time_zone' => 'required', // 'phone_number' => 'phone:IN', 'mobile' => 'unique:users', - 'team' => 'required', + 'team' => 'required', ]; } /** *@category Funcion to set rule if send opt is enabled - *@param Object $settings (instance of Model common settings) + * + *@param object $settings (instance of Model common settings) + * *@author manish.verma@ladybirdweb.com - *@return array|int + * + *@return array|int */ public function check($settings) { @@ -72,8 +76,8 @@ class AgentRequest extends Request // 'phone_number' => 'phone:IN', // 'mobile' => 'phone:IN', 'team' => 'required', - 'mobile' => 'required|unique:users', - 'country_code' => 'required', + 'mobile' => 'required|unique:users', + 'country_code' => 'required', ]; } else { return 0; diff --git a/app/Http/Requests/helpdesk/ChangepasswordRequest.php b/app/Http/Requests/helpdesk/ChangepasswordRequest.php index d4f591fa1..e0b71b06a 100644 --- a/app/Http/Requests/helpdesk/ChangepasswordRequest.php +++ b/app/Http/Requests/helpdesk/ChangepasswordRequest.php @@ -29,7 +29,7 @@ class ChangepasswordRequest extends Request public function rules() { return [ - + 'change_password' => 'required', // 'message' => 'required', ]; diff --git a/app/Http/Requests/helpdesk/ClientRequest.php b/app/Http/Requests/helpdesk/ClientRequest.php index 6f2d58231..9fbd5b12b 100644 --- a/app/Http/Requests/helpdesk/ClientRequest.php +++ b/app/Http/Requests/helpdesk/ClientRequest.php @@ -5,7 +5,6 @@ namespace App\Http\Requests\helpdesk; use App\Http\Requests\Request; use App\Model\helpdesk\Settings\CommonSettings; - /** * CompanyRequest. * @@ -30,11 +29,12 @@ class ClientRequest extends Request */ public function rules() { - $check = $this->check(new CommonSettings); + $check = $this->check(new CommonSettings()); if ($check != 0) { return $check; $custom_rule = $this->getCustomRule(); $rules = array_merge($check, $custom_rule); + return $rules; } $current_rule = [ @@ -45,70 +45,83 @@ class ClientRequest extends Request ]; $custom_rule = $this->getCustomRule(); $rules = array_merge($current_rule, $custom_rule); + return $rules; - } - - public function getHelpTopic(){ + + public function getHelpTopic() + { $help_topics = new \App\Model\helpdesk\Manage\Help_topic(); $topic = $this->input('helptopic'); - $help_topic = $help_topics->where('id',$topic)->first(); + $help_topic = $help_topics->where('id', $topic)->first(); + return $help_topic; } - - public function getCustomRule(){ - $custom_form = ""; + + public function getCustomRule() + { + $custom_form = ''; $help_topic = $this->getHelpTopic(); - if($help_topic){ + if ($help_topic) { $custom_form = $help_topic->custom_form; - } + return $this->getForm($custom_form); } - - public function getForm($formid){ - $id = ""; + + public function getForm($formid) + { + $id = ''; $forms = new \App\Model\helpdesk\Form\Forms(); - $form = $forms->where('id',$formid)->first(); - if($form){ + $form = $forms->where('id', $formid)->first(); + if ($form) { $id = $form->id; - } + return $this->getFields($id); } - - public function getFields($formid){ + + public function getFields($formid) + { $rules = []; $field = new \App\Model\helpdesk\Form\Fields(); - $fields = $field->where('forms_id',$formid)->get(); - if($fields->count()>0){ - foreach($fields as $fd){ - if($fd->required==='1'){ - $rules[str_replace(" ",'_',$fd->name)]="required"; + $fields = $field->where('forms_id', $formid)->get(); + if ($fields->count() > 0) { + foreach ($fields as $fd) { + if ($fd->required === '1') { + $rules[str_replace(' ', '_', $fd->name)] = 'required'; } - $rules = array_merge($rules,$this->getChild($fd->id)); + $rules = array_merge($rules, $this->getChild($fd->id)); } } + return $rules; } - - public function getChild($fieldid){ + + public function getChild($fieldid) + { $children = new \App\Model\helpdesk\Form\FieldValue(); - $childs = $children->where('field_id',$fieldid)->get(); + $childs = $children->where('field_id', $fieldid)->get(); $rules = []; - if($childs->count()>0){ - foreach($childs as $child){ + if ($childs->count() > 0) { + foreach ($childs as $child) { $child_formid = $child->child_id; + return $this->getForm($child_formid); } } + return []; } + /** *@category Funcion to set rule if send opt is enabled - *@param Object $settings (instance of Model common settings) + * + *@param object $settings (instance of Model common settings) + * *@author manish.verma@ladybirdweb.com - *@return array|int + * + *@return array|int */ public function check($settings) { diff --git a/app/Http/Requests/helpdesk/CreateTicketRequest.php b/app/Http/Requests/helpdesk/CreateTicketRequest.php index faca2b31b..849fd7c0b 100644 --- a/app/Http/Requests/helpdesk/CreateTicketRequest.php +++ b/app/Http/Requests/helpdesk/CreateTicketRequest.php @@ -1,7 +1,10 @@ segments())){ + if (in_array('api', $this->segments())) { return true; } + return false; } + /** * Get the validation rules that apply to the request. * @@ -33,14 +38,15 @@ class CreateTicketRequest extends Request */ public function rules() { - $check = $this->check(new CommonSettings); + $check = $this->check(new CommonSettings()); if ($check != 0) { return $check; } + return [ - 'email' => 'required|email|max:60', + 'email' => 'required|email|max:60', 'first_name' => 'required|min:3|max:40', - 'helptopic' => 'required', + 'helptopic' => 'required', // 'dept' => 'required', 'sla' => 'required', 'subject' => 'required|min:5', @@ -48,11 +54,15 @@ class CreateTicketRequest extends Request 'priority' => 'required', ]; } + /** *@category Funcion to set rule if send opt is enabled - *@param Object $settings (instance of Model common settings) + * + *@param object $settings (instance of Model common settings) + * *@author manish.verma@ladybirdweb.com - *@return array|int + * + *@return array|int */ public function check($settings) { @@ -61,9 +71,9 @@ class CreateTicketRequest extends Request // dd($settings->status, $email_mandatory->status); if (($settings->status == '1' || $settings->status == 1) && ($email_mandatory->status == '1' || $email_mandatory->status == 1)) { return [ - 'email' => 'required|email|max:60', + 'email' => 'required|email|max:60', 'first_name' => 'required|min:3|max:40', - 'helptopic' => 'required', + 'helptopic' => 'required', // 'dept' => 'required', 'sla' => 'required', 'subject' => 'required|min:5', @@ -76,9 +86,11 @@ class CreateTicketRequest extends Request return 0; } elseif (($settings->status == '0' || $settings->status == 0) && ($email_mandatory->status == '0' || $email_mandatory->status == 0)) { $rule = $this->onlyMobleRequired(); + return $rule; } elseif (($settings->status == '1' || $settings->status == 1) && ($email_mandatory->status == '0' || $email_mandatory->status == 0)) { $rule = $this->onlyMobleRequired(); + return $rule; } else { return 0; @@ -87,15 +99,17 @@ class CreateTicketRequest extends Request /** *@category function to make only moble required rule + * *@param null + * *@return array */ public function onlyMobleRequired() { return [ - 'email' => 'email|max:60', + 'email' => 'email|max:60', 'first_name' => 'required|min:3|max:40', - 'helptopic' => 'required', + 'helptopic' => 'required', // 'dept' => 'required', 'sla' => 'required', 'subject' => 'required|min:5', @@ -105,4 +119,4 @@ class CreateTicketRequest extends Request 'mobile' => 'required', ]; } -} \ No newline at end of file +} diff --git a/app/Http/Requests/helpdesk/Job/TaskRequest.php b/app/Http/Requests/helpdesk/Job/TaskRequest.php index 86408cf0a..4ca5a0301 100644 --- a/app/Http/Requests/helpdesk/Job/TaskRequest.php +++ b/app/Http/Requests/helpdesk/Job/TaskRequest.php @@ -4,14 +4,15 @@ namespace App\Http\Requests\helpdesk\Job; use App\Http\Requests\Request; -class TaskRequest extends Request { - +class TaskRequest extends Request +{ /** * Determine if the user is authorized to make this request. * * @return bool */ - public function authorize() { + public function authorize() + { return true; } @@ -20,27 +21,28 @@ class TaskRequest extends Request { * * @return array */ - public function rules() { + public function rules() + { return [ - 'fetching-commands' => 'required_if:email_fetching,1', + 'fetching-commands' => 'required_if:email_fetching,1', 'notification-commands' => 'required_if:notification_cron,1', - 'work-commands' => 'required_if:condition,1', - 'workflow-dailyAt' => 'required_if:work-commands,dailyAt', - 'notification-dailyAt' => 'required_if:notification-commands,dailyAt', - 'fetching-dailyAt' => 'required_if:fetching-commands,dailyAt', + 'work-commands' => 'required_if:condition,1', + 'workflow-dailyAt' => 'required_if:work-commands,dailyAt', + 'notification-dailyAt' => 'required_if:notification-commands,dailyAt', + 'fetching-dailyAt' => 'required_if:fetching-commands,dailyAt', ]; } - public function messages() { + public function messages() + { return [ - 'fetching-commands.required_if' => 'Please choose your Email Fetching timing', - 'notification-commands.required_if'=>'Please choose your Email Notification timing', - 'work-commands.required_if'=>'Please choose your Auto-close Workflow timing', - 'workflow-dailyAt.required_if'=>'Please enter the time for Auto-close Workflow timing', - 'notification-dailyAt.required_if'=>'Please enter the time for Email Notification timing', - 'fetching-dailyAt.required_if'=>'Please enter the time for Email Fetching timing', - + 'fetching-commands.required_if' => 'Please choose your Email Fetching timing', + 'notification-commands.required_if'=> 'Please choose your Email Notification timing', + 'work-commands.required_if' => 'Please choose your Auto-close Workflow timing', + 'workflow-dailyAt.required_if' => 'Please enter the time for Auto-close Workflow timing', + 'notification-dailyAt.required_if' => 'Please enter the time for Email Notification timing', + 'fetching-dailyAt.required_if' => 'Please enter the time for Email Fetching timing', + ]; } - } diff --git a/app/Http/Requests/helpdesk/LableUpdate.php b/app/Http/Requests/helpdesk/LableUpdate.php index 2e89edbc9..1b8b80475 100644 --- a/app/Http/Requests/helpdesk/LableUpdate.php +++ b/app/Http/Requests/helpdesk/LableUpdate.php @@ -30,11 +30,12 @@ class LableUpdate extends Request public function rules() { $label_data = \Request::segments(); - $label = Label::find($label_data[1]); + $label = Label::find($label_data[1]); + return [ 'title' => 'required|max:10|unique:labels,title,'.$label->id, 'color' => 'required|regex:/#([a-fA-F0-9]{3}){1,2}\b/', - 'order' => 'required|integer' - ]; + 'order' => 'required|integer', + ]; } } diff --git a/app/Http/Requests/helpdesk/Mail/MailRequest.php b/app/Http/Requests/helpdesk/Mail/MailRequest.php index bee13a163..e0d76ffe3 100644 --- a/app/Http/Requests/helpdesk/Mail/MailRequest.php +++ b/app/Http/Requests/helpdesk/Mail/MailRequest.php @@ -23,52 +23,56 @@ class MailRequest extends Request */ public function rules() { - $id = $this->segment(2); $email_address_rule = 'required|email|unique:emails'; - if($id){ + if ($id) { $email_address_rule = 'required|email|unique:emails,id,'.$id; } - - - $rules = [ - 'email_address' => $email_address_rule, - 'email_name' => 'required', - 'password' => 'required', - 'sending_protocol'=>'required_if:sending_status,on', + + $rules = [ + 'email_address' => $email_address_rule, + 'email_name' => 'required', + 'password' => 'required', + 'sending_protocol'=> 'required_if:sending_status,on', ]; $driver = $this->input('sending_protocol'); $driver_rules = $this->getDriver($driver); - $rules = array_merge($rules,$driver_rules); + $rules = array_merge($rules, $driver_rules); + return $rules; } - - public function getDriver($serviceid){ + + public function getDriver($serviceid) + { $rules = []; $mail_services = new \App\Model\MailJob\MailService(); $mail_service = $mail_services->find($serviceid); - if($mail_service){ + if ($mail_service) { $short = $mail_service->short_name; $rules = $this->getRules($short); } + return $rules; } - - public function getRules($short){ + + public function getRules($short) + { $rules = []; - switch ($short){ - case "mailgun": - $rules = [ - 'domain'=>'required', - 'secret'=>'required', + switch ($short) { + case 'mailgun': + $rules = [ + 'domain'=> 'required', + 'secret'=> 'required', ]; + return $rules; - case "mandrill": - $rules = [ - 'secret'=>'required', + case 'mandrill': + $rules = [ + 'secret'=> 'required', ]; + return $rules; - default : + default: return $rules; } } diff --git a/app/Http/Requests/helpdesk/PriorityRequest.php b/app/Http/Requests/helpdesk/PriorityRequest.php index 91123a6fc..c4b0cdb64 100644 --- a/app/Http/Requests/helpdesk/PriorityRequest.php +++ b/app/Http/Requests/helpdesk/PriorityRequest.php @@ -29,18 +29,14 @@ class PriorityRequest extends Request public function rules() { return [ - - - 'priority' => 'required|max:10', - 'status' => 'required', - 'priority_desc' => 'required|max:255', - 'priority_color' => 'required', - 'ispublic' => 'required', - 'priority_successfully_updated'=>'priority successfully updated', - 'priority_successfully_created!!!'=>'priority successfully created', - - + 'priority' => 'required|max:10', + 'status' => 'required', + 'priority_desc' => 'required|max:255', + 'priority_color' => 'required', + 'ispublic' => 'required', + 'priority_successfully_updated' => 'priority successfully updated', + 'priority_successfully_created!!!'=> 'priority successfully created', ]; } diff --git a/app/Http/Requests/helpdesk/ProfileRequest.php b/app/Http/Requests/helpdesk/ProfileRequest.php index bf76d3dd4..3b995c906 100644 --- a/app/Http/Requests/helpdesk/ProfileRequest.php +++ b/app/Http/Requests/helpdesk/ProfileRequest.php @@ -36,8 +36,8 @@ class ProfileRequest extends Request } /** + *Check the mobile number is unique or not. * - *Check the mobile number is unique or not *@return string */ public function checkMobile() diff --git a/app/Http/Requests/helpdesk/Queue/QueueRequest.php b/app/Http/Requests/helpdesk/Queue/QueueRequest.php index bae4cd5f3..a61f48239 100644 --- a/app/Http/Requests/helpdesk/Queue/QueueRequest.php +++ b/app/Http/Requests/helpdesk/Queue/QueueRequest.php @@ -25,16 +25,19 @@ class QueueRequest extends Request { $request = $this->except('_token'); $rules = $this->setRule($request); + return $rules; } - - public function setRule($request){ + + public function setRule($request) + { $rules = []; - if(count($request)>0){ - foreach($request as $key=>$value){ - $rules[$key]='required'; + if (count($request) > 0) { + foreach ($request as $key=>$value) { + $rules[$key] = 'required'; } } + return $rules; } } diff --git a/app/Http/Requests/helpdesk/RegisterRequest.php b/app/Http/Requests/helpdesk/RegisterRequest.php index 9964c1cc5..d652a0e3e 100644 --- a/app/Http/Requests/helpdesk/RegisterRequest.php +++ b/app/Http/Requests/helpdesk/RegisterRequest.php @@ -29,10 +29,11 @@ class RegisterRequest extends Request */ public function rules() { - $check = $this->check(new CommonSettings); + $check = $this->check(new CommonSettings()); if ($check != 0) { return $check; } + return [ 'email' => 'required|max:50|email|unique:users', 'full_name' => 'required', @@ -43,9 +44,12 @@ class RegisterRequest extends Request /** *@category Funcion to set rule if send opt is enabled - *@param Object $settings (instance of Model common settings) + * + *@param object $settings (instance of Model common settings) + * *@author manish.verma@ladybirdweb.com - *@return array|int + * + *@return array|int */ public function check($settings) { diff --git a/app/Http/Requests/helpdesk/Sys_userRequest.php b/app/Http/Requests/helpdesk/Sys_userRequest.php index 7c904efcc..c01359728 100644 --- a/app/Http/Requests/helpdesk/Sys_userRequest.php +++ b/app/Http/Requests/helpdesk/Sys_userRequest.php @@ -1,9 +1,9 @@ check(new CommonSettings); + { + $check = $this->check(new CommonSettings()); if ($check != 0) { return $check; } + return [ - 'first_name' => 'required', - 'user_name' => 'required|min:3|unique:users,user_name', - 'email' => 'required|unique:users,email', - 'mobile' => 'unique:users', + 'first_name' => 'required', + 'user_name' => 'required|min:3|unique:users,user_name', + 'email' => 'required|unique:users,email', + 'mobile' => 'unique:users', ]; } /** *@category Funcion to set rule if send opt is enabled - *@param Object $settings (instance of Model common settings) + * + *@param object $settings (instance of Model common settings) + * *@author manish.verma@ladybirdweb.com - *@return array|int + * + *@return array|int */ public function check($settings) { @@ -53,19 +57,21 @@ class Sys_userRequest extends Request $email_mandatory = CommonSettings::select('status')->where('option_name', '=', 'email_mandatory')->first(); if (($settings->status == '1' || $settings->status == 1) && ($email_mandatory->status == '1' || $email_mandatory->status == 1)) { return [ - 'first_name' => 'required', - 'user_name' => 'required|min:3|unique:users,user_name', - 'email' => 'required|unique:users,email', - 'country_code' => 'required', - 'mobile' => 'required|unique:users', + 'first_name' => 'required', + 'user_name' => 'required|min:3|unique:users,user_name', + 'email' => 'required|unique:users,email', + 'country_code' => 'required', + 'mobile' => 'required|unique:users', ]; } elseif (($settings->status == '0' || $settings->status == 0) && ($email_mandatory->status == '1' || $email_mandatory->status == 1)) { return 0; } elseif (($settings->status == '0' || $settings->status == 0) && ($email_mandatory->status == '0' || $email_mandatory->status == 0)) { $rule = $this->onlyMobleRequired(); + return $rule; } elseif (($settings->status == '1' || $settings->status == 1) && ($email_mandatory->status == '0' || $email_mandatory->status == 0)) { $rule = $this->onlyMobleRequired(); + return $rule; } else { return 0; @@ -74,17 +80,19 @@ class Sys_userRequest extends Request /** *@category function to make only moble required rule + * *@param null + * *@return array */ public function onlyMobleRequired() { return [ - 'first_name' => 'required', - 'user_name' => 'required|min:3|unique:users,user_name', - 'email' => 'unique:users,email', - 'country_code' => 'required', - 'mobile' => 'required|unique:users', + 'first_name' => 'required', + 'user_name' => 'required|min:3|unique:users,user_name', + 'email' => 'unique:users,email', + 'country_code' => 'required', + 'mobile' => 'required|unique:users', ]; } } diff --git a/app/Http/Requests/helpdesk/Sys_userUpdate.php b/app/Http/Requests/helpdesk/Sys_userUpdate.php index 00418d020..ac50aa4c7 100644 --- a/app/Http/Requests/helpdesk/Sys_userUpdate.php +++ b/app/Http/Requests/helpdesk/Sys_userUpdate.php @@ -3,6 +3,7 @@ namespace App\Http\Requests\helpdesk; use App\Http\Requests\Request; + //use Illuminate\Http\Request as Req; /** * Sys_userUpdate. @@ -29,10 +30,10 @@ class Sys_userUpdate extends Request public function rules() { return [ - 'first_name' => 'required', - 'user_name' => 'required|min:3|unique:users,user_name,'.$this->segment(2), - 'email' => 'required|email|unique:users,email,'.$this->segment(2), - 'mobile' => 'unique:users,mobile,'.$this->segment(2), + 'first_name' => 'required', + 'user_name' => 'required|min:3|unique:users,user_name,'.$this->segment(2), + 'email' => 'required|email|unique:users,email,'.$this->segment(2), + 'mobile' => 'unique:users,mobile,'.$this->segment(2), ]; } } diff --git a/app/Http/Requests/helpdesk/TicketRequest.php b/app/Http/Requests/helpdesk/TicketRequest.php index 240763dea..3dd05d61e 100644 --- a/app/Http/Requests/helpdesk/TicketRequest.php +++ b/app/Http/Requests/helpdesk/TicketRequest.php @@ -9,14 +9,15 @@ use App\Http\Requests\Request; * * @author Ladybird
+
+ return $button.'
';
}
-function isInstall() {
+function isInstall()
+{
$check = false;
$env = base_path('.env');
if (\File::exists($env) && env('DB_INSTALL') == 1) {
$check = true;
}
+
return $check;
}
-function faveotime($date, $hour = 0, $min = 0, $sec = 0) {
+function faveotime($date, $hour = 0, $min = 0, $sec = 0)
+{
if (is_bool($hour) && $hour == true) {
$hour = $date->hour;
}
@@ -125,5 +143,6 @@ function faveotime($date, $hour = 0, $min = 0, $sec = 0) {
$sec = $date->second;
}
$date1 = \Carbon\Carbon::create($date->year, $date->month, $date->day, $hour, $min, $sec);
+
return $date1->hour($hour)->minute($min)->second($sec);
}
diff --git a/app/Http/routes.php b/app/Http/routes.php
index d36a3ed36..131494175 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -11,15 +11,14 @@
|
*/
Route::group(['middleware' => ['web']], function () {
-
Route::group(['middleware' => 'update', 'middleware' => 'install'], function () {
Route::controllers([
- 'auth' => 'Auth\AuthController',
+ 'auth' => 'Auth\AuthController',
'password' => 'Auth\PasswordController',
]);
Route::get('social/login/redirect/{provider}/{redirect?}', ['uses' => 'Auth\AuthController@redirectToProvider', 'as' => 'social.login']);
- Route::get('social/login/{provider}', ['as'=>'social.login.callback','uses'=>'Auth\AuthController@handleProviderCallback']);
- Route::get('social-sync', ['as'=>'social.sync','uses'=>'Client\helpdesk\GuestController@sync']);
+ Route::get('social/login/{provider}', ['as'=>'social.login.callback', 'uses'=>'Auth\AuthController@handleProviderCallback']);
+ Route::get('social-sync', ['as'=>'social.sync', 'uses'=>'Client\helpdesk\GuestController@sync']);
});
/*
@@ -29,44 +28,29 @@ Route::group(['middleware' => ['web']], function () {
| Here is defining entire routes for the Admin Panel
|
*/
- Route::get('password/email/{one?}/{two?}/{three?}/{four?}/{five?}',['as' => 'password.email', 'uses' => 'Auth\PasswordController@getEmail']);
- Breadcrumbs::register('password.email', function ($breadcrumbs) {
- $breadcrumbs->parent('/');
- $breadcrumbs->push('Login', url('auth/login'));
- $breadcrumbs->push('Forgot Password', url('password/email'));
- });
+ Route::get('password/email/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'password.email', 'uses' => 'Auth\PasswordController@getEmail']);
+ Breadcrumbs::register('password.email', function ($breadcrumbs) {
+ $breadcrumbs->parent('/');
+ $breadcrumbs->push('Login', url('auth/login'));
+ $breadcrumbs->push('Forgot Password', url('password/email'));
+ });
-
// register page
- Route::get('auth/register/{one?}/{two?}/{three?}/{four?}/{five?}',['as' => 'auth.register', 'uses' => 'Auth\AuthController@getRegister']);
- Breadcrumbs::register('auth.register', function ($breadcrumbs) {
- $breadcrumbs->parent('/');
- $breadcrumbs->push('Login', url('auth/login'));
- $breadcrumbs->push('Create Account', url('auth/register'));
- });
-
+ Route::get('auth/register/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'auth.register', 'uses' => 'Auth\AuthController@getRegister']);
+ Breadcrumbs::register('auth.register', function ($breadcrumbs) {
+ $breadcrumbs->parent('/');
+ $breadcrumbs->push('Login', url('auth/login'));
+ $breadcrumbs->push('Create Account', url('auth/register'));
+ });
// Auth login
- Route::get('auth/login/{one?}/{two?}/{three?}/{four?}/{five?}',['as' => 'auth.login', 'uses' => 'Auth\AuthController@getLogin']);
- Breadcrumbs::register('auth.login', function ($breadcrumbs) {
- $breadcrumbs->parent('/');
- $breadcrumbs->push('Create Account', url('auth/register'));
- $breadcrumbs->push('Login', url('auth/login'));
-
- });
+ Route::get('auth/login/{one?}/{two?}/{three?}/{four?}/{five?}', ['as' => 'auth.login', 'uses' => 'Auth\AuthController@getLogin']);
+ Breadcrumbs::register('auth.login', function ($breadcrumbs) {
+ $breadcrumbs->parent('/');
+ $breadcrumbs->push('Create Account', url('auth/register'));
+ $breadcrumbs->push('Login', url('auth/login'));
+ });
-
-
-
-
-
-
-
-
-
-
-
-
Route::get('account/activate/{token}', ['as' => 'account.activate', 'uses' => 'Auth\AuthController@accountActivate']);
Route::get('getmail/{token}', 'Auth\AuthController@getMail');
Route::get('verify-otp', ['as' => 'otp-verification', 'uses' => 'Auth\AuthController@getVerifyOTP']);
@@ -84,7 +68,7 @@ Route::group(['middleware' => ['web']], function () {
//Notification marking
Route::post('mark-read/{id}', 'Common\NotificationController@markRead');
Route::post('mark-all-read/{id}', 'Common\NotificationController@markAllRead');
-
+
Route::get('notifications-list', ['as' => 'notification.list', 'uses' => 'Common\NotificationController@show']);
Route::post('notification-delete/{id}', ['as' => 'notification.delete', 'uses' => 'Common\NotificationController@delete']);
Route::get('notifications-list/delete', ['as' => 'notification.delete.all', 'uses' => 'Common\NotificationController@deleteAll']);
@@ -94,27 +78,27 @@ Route::group(['middleware' => ['web']], function () {
Route::post('delete-notification-log', 'Admin\helpdesk\SettingsController@deleteNotificationLog');
// resource is a function to process create,edit,read and delete
Route::resource('groups', 'Admin\helpdesk\GroupController'); // for group module, for CRUD
-
+
Route::resource('departments', 'Admin\helpdesk\DepartmentController'); // for departments module, for CRUD
-
+
Route::resource('teams', 'Admin\helpdesk\TeamController'); // in teams module, for CRUD
Route::get('/teams/show/{id}', ['as' => 'teams.show', 'uses' => 'Admin\helpdesk\TeamController@show']); /* Get Team View */
Breadcrumbs::register('teams.show', function ($breadcrumbs) {
- $breadcrumbs->parent('teams.index');
- $breadcrumbs->push(Lang::get('lang.show'), url('teams/{teams}/show'));
- });
-Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpdesk\TeamController@getshow']);
+ $breadcrumbs->parent('teams.index');
+ $breadcrumbs->push(Lang::get('lang.show'), url('teams/{teams}/show'));
+ });
+ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpdesk\TeamController@getshow']);
Route::resource('agents', 'Admin\helpdesk\AgentController'); // in agents module, for CRUD
-
+
Route::resource('emails', 'Admin\helpdesk\EmailsController'); // in emails module, for CRUD
-
+
Route::resource('banlist', 'Admin\helpdesk\BanlistController'); // in banlist module, for CRUD
-
+
Route::get('banlist/delete/{id}', ['as' => 'banlist.delete', 'uses' => 'Admin\helpdesk\BanlistController@delete']); // in banlist module, for CRUD
/*
* Templates
*/
-
+
Route::resource('templates', 'Common\TemplateController');
Route::get('get-templates', 'Common\TemplateController@GetTemplates');
Route::get('templates-delete', 'Common\TemplateController@destroy');
@@ -132,96 +116,96 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
Route::post('create-templates', ['as' => 'template.createnew', 'uses' => 'Admin\helpdesk\TemplateController@createtemplate']);
Route::get('delete-template/{template}/{path}', ['as' => 'templates.delete', 'uses' => 'Admin\helpdesk\TemplateController@deletetemplate']);
Route::get('getdiagno', ['as' => 'getdiagno', 'uses' => 'Admin\helpdesk\TemplateController@formDiagno']); // for getting form for diagnostic
-
+
Route::post('postdiagno', ['as' => 'postdiagno', 'uses' => 'Admin\helpdesk\TemplateController@postDiagno']); // for getting form for diagnostic
Route::resource('helptopic', 'Admin\helpdesk\HelptopicController'); // in helptopics module, for CRUD
-
+
Route::resource('sla', 'Admin\helpdesk\SlaController'); // in SLA Plan module, for CRUD
-
+
Route::resource('forms', 'Admin\helpdesk\FormController');
Route::get('forms/add-child/{formid}', ['as' => 'forms.add.child', 'uses' => 'Admin\helpdesk\FormController@addChildForm']);
Route::post('forms/field/{fieldid}/child', [
- 'as' => 'forms.field.child',
+ 'as' => 'forms.field.child',
'uses' => 'Admin\helpdesk\FormController@addChild',
]);
Route::get('forms/render/child', [
- 'as' => 'forms.field.child',
+ 'as' => 'forms.field.child',
'uses' => 'Admin\helpdesk\FormController@renderChild',
]);
-
+
Route::get('delete-forms/{id}', ['as' => 'forms.delete', 'uses' => 'Admin\helpdesk\FormController@delete']);
//$router->model('id','getcompany');
Route::get('job-scheduler', ['as' => 'get.job.scheder', 'uses' => 'Admin\helpdesk\SettingsController@getSchedular']); //to get ob scheduler form page
-
+
Route::patch('post-scheduler', ['as' => 'post.job.scheduler', 'uses' => 'Admin\helpdesk\SettingsController@postSchedular']); //to update job scheduler
Route::get('agent-profile-page/{id}', ['as' => 'agent.profile.page', 'uses' => 'Admin\helpdesk\AgentController@agent_profile']);
Route::get('getcompany', ['as' => 'getcompany', 'uses' => 'Admin\helpdesk\SettingsController@getcompany']); // direct to company setting page
-
+
Route::patch('postcompany/{id}', 'Admin\helpdesk\SettingsController@postcompany'); // Updating the Company table with requests
Route::get('delete-logo', ['as' => 'delete.logo', 'uses' => 'Admin\helpdesk\SettingsController@deleteLogo']); // deleting a logo
Route::get('getsystem', ['as' => 'getsystem', 'uses' => 'Admin\helpdesk\SettingsController@getsystem']); // direct to system setting page
-
+
Route::patch('postsystem/{id}', 'Admin\helpdesk\SettingsController@postsystem'); // Updating the System table with requests
Route::get('getticket', ['as' => 'getticket', 'uses' => 'Admin\helpdesk\SettingsController@getticket']); // direct to ticket setting page
-
+
Route::patch('postticket/{id}', 'Admin\helpdesk\SettingsController@postticket'); // Updating the Ticket table with requests
Route::get('getemail', ['as' => 'getemail', 'uses' => 'Admin\helpdesk\SettingsController@getemail']); // direct to email setting page
-
- Route::get('ticket/tooltip',['as'=>'ticket.tooltip','uses'=>'Agent\helpdesk\TicketController@getTooltip']);
-
+
+ Route::get('ticket/tooltip', ['as'=>'ticket.tooltip', 'uses'=>'Agent\helpdesk\TicketController@getTooltip']);
+
Route::patch('postemail/{id}', 'Admin\helpdesk\SettingsController@postemail'); // Updating the Email table with requests
// Route::get('getaccess', 'Admin\helpdesk\SettingsController@getaccess'); // direct to access setting page
// Route::patch('postaccess/{id}', 'Admin\helpdesk\SettingsController@postaccess'); // Updating the Access table with requests
Route::get('getresponder', ['as' => 'getresponder', 'uses' => 'Admin\helpdesk\SettingsController@getresponder']); // direct to responder setting page
-
+
Route::patch('postresponder/{id}', 'Admin\helpdesk\SettingsController@postresponder'); // Updating the Responder table with requests
Route::get('getalert', ['as' => 'getalert', 'uses' => 'Admin\helpdesk\SettingsController@getalert']); // direct to alert setting page
-
+
Route::patch('postalert/{id}', 'Admin\helpdesk\SettingsController@postalert'); // Updating the Alert table with requests
// Templates
-
+
Route::get('security', ['as' => 'security.index', 'uses' => 'Admin\helpdesk\SecurityController@index']); // direct to security setting page
Route::resource('close-workflow', 'Admin\helpdesk\CloseWrokflowController'); // direct to security setting page
-
+
Route::resource('close-workflow', 'Admin\helpdesk\CloseWrokflowController'); // direct to security setting page
Route::patch('security/{id}', ['as' => 'securitys.update', 'uses' => 'Admin\helpdesk\SecurityController@update']); // direct to security setting page
Route::get('setting-status', ['as' => 'statuss.index', 'uses' => 'Admin\helpdesk\SettingsController@getStatuses']); // direct to status setting page
-
+
Route::patch('status-update/{id}', ['as' => 'statuss.update', 'uses' => 'Admin\helpdesk\SettingsController@editStatuses']);
-
+
Route::get('status/edit/{id}', ['as' => 'status.edit', 'uses' => 'Admin\helpdesk\SettingsController@getEditStatuses']);
Route::post('status-create', ['as' => 'statuss.create', 'uses' => 'Admin\helpdesk\SettingsController@createStatuses']);
Route::get('status-delete/{id}', ['as' => 'statuss.delete', 'uses' => 'Admin\helpdesk\SettingsController@deleteStatuses']);
Route::get('ticket/status/{id}/{state}', ['as' => 'statuss.state', 'uses' => 'Agent\helpdesk\TicketController@updateStatuses']);
Route::get('getratings', ['as' => 'ratings.index', 'uses' => 'Admin\helpdesk\SettingsController@RatingSettings']);
-
+
Route::get('deleter/{rating}', ['as' => 'ratings.delete', 'uses' => 'Admin\helpdesk\SettingsController@RatingDelete']);
-
+
Route::get('create-ratings', ['as' => 'rating.create', 'uses' => 'Admin\helpdesk\SettingsController@createRating']);
Route::post('store-ratings', ['as' => 'rating.store', 'uses' => 'Admin\helpdesk\SettingsController@storeRating']);
-
+
Route::get('editratings/{slug}', ['as' => 'rating.edit', 'uses' => 'Admin\helpdesk\SettingsController@editRatingSettings']);
Route::patch('postratings/{slug}', ['as' => 'settings.rating', 'uses' => 'Admin\helpdesk\SettingsController@PostRatingSettings']);
Route::get('remove-user-org/{id}', ['as' => 'removeuser.org', 'uses' => 'Agent\helpdesk\UserController@removeUserOrg']);
Route::get('admin-profile', ['as' => 'admin-profile', 'uses' => 'Admin\helpdesk\ProfileController@getProfile']); /* User profile edit get */
-
+
Route::get('admin-profile-edit', 'Admin\helpdesk\ProfileController@getProfileedit'); /* Admin profile get */
Route::patch('admin-profile', 'Admin\helpdesk\ProfileController@postProfileedit'); /* Admin Profile Post */
Route::patch('admin-profile-password', 'Admin\helpdesk\ProfileController@postProfilePassword'); /* Admin Profile Password Post */
Route::get('widgets', ['as' => 'widgets', 'uses' => 'Common\SettingsController@widgets']); /* get the create footer page for admin */
-
+
Route::get('list-widget', 'Common\SettingsController@list_widget'); /* get the list widget page for admin */
Route::post('edit-widget/{id}', 'Common\SettingsController@edit_widget'); /* get the create footer page for admin */
Route::get('social-buttons', ['as' => 'social.buttons', 'uses' => 'Common\SettingsController@social_buttons']); /* get the create footer page for admin */
-
+
Route::get('list-social-buttons', ['as' => 'list.social.buttons', 'uses' => 'Common\SettingsController@list_social_buttons']); /* get the list widget page for admin */
Route::post('edit-widget/{id}', 'Common\SettingsController@edit_social_buttons'); /* get the create footer page for admin */
Route::get('version-check', ['as' => 'version-check', 'uses' => 'Common\SettingsController@version_check']); /* Check version */
Route::post('post-version-check', ['as' => 'post-version-check', 'uses' => 'Common\SettingsController@post_version_check']); /* post Check version */
Route::get('admin', ['as' => 'setting', 'uses' => 'Admin\helpdesk\SettingsController@settings']);
-
+
Route::get('plugins', ['as' => 'plugins', 'uses' => 'Common\SettingsController@Plugins']);
-
+
Route::get('getplugin', ['as' => 'get.plugin', 'uses' => 'Common\SettingsController@GetPlugin']);
Route::post('post-plugin', ['as' => 'post.plugin', 'uses' => 'Common\SettingsController@PostPlugins']);
Route::get('getconfig', ['as' => 'get.config', 'uses' => 'Common\SettingsController@fetchConfig']);
@@ -229,7 +213,7 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
Route::get('plugin/status/{slug}', ['as' => 'status.plugin', 'uses' => 'Common\SettingsController@StatusPlugin']);
//Routes for showing language table and switching language
Route::get('languages', ['as' => 'LanguageController', 'uses' => 'Admin\helpdesk\LanguageController@index']);
-
+
Route::get('get-languages', ['as' => 'getAllLanguages', 'uses' => 'Admin\helpdesk\LanguageController@getLanguages']);
Route::get('change-language/{lang}', ['as' => 'lang.switch', 'uses' => 'Admin\helpdesk\LanguageController@switchLanguage']);
//Route for download language template package
@@ -237,20 +221,20 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
//Routes for language file upload form-----------You may want to use csrf protection for these route--------------
Route::post('language/add', 'Admin\helpdesk\LanguageController@postForm');
Route::get('language/add', ['as' => 'add-language', 'uses' => 'Admin\helpdesk\LanguageController@getForm']);
-
+
//Routes for delete language package
Route::get('delete-language/{lang}', ['as' => 'lang.delete', 'uses' => 'Admin\helpdesk\LanguageController@deleteLanguage']);
Route::get('generate-api-key', 'Admin\helpdesk\SettingsController@GenerateApiKey'); // route to generate api key
Route::post('validating-email-settings', ['as' => 'validating.email.settings', 'uses' => 'Admin\helpdesk\EmailsController@validatingEmailSettings']); // route to check email input validation
Route::post('validating-email-settings-on-update/{id}', ['as' => 'validating.email.settings.update', 'uses' => 'Admin\helpdesk\EmailsController@validatingEmailSettingsUpdate']); // route to check email input validation
Route::get('workflow', ['as' => 'workflow', 'uses' => 'Admin\helpdesk\WorkflowController@index']);
-
+
Route::get('workflow-list', ['as' => 'workflow.list', 'uses' => 'Admin\helpdesk\WorkflowController@workFlowList']);
Route::get('workflow/create', ['as' => 'workflow.create', 'uses' => 'Admin\helpdesk\WorkflowController@create']);
-
+
Route::post('workflow/store', ['as' => 'workflow.store', 'uses' => 'Admin\helpdesk\WorkflowController@store']);
Route::get('workflow/edit/{id}', ['as' => 'workflow.edit', 'uses' => 'Admin\helpdesk\WorkflowController@edit']);
-
+
Route::post('workflow/update/{id}', ['as' => 'workflow.update', 'uses' => 'Admin\helpdesk\WorkflowController@update']);
Route::get('workflow/action-rule/{id}', ['as' => 'workflow.dept', 'uses' => 'Admin\helpdesk\WorkflowController@selectAction']);
Route::get('workflow/delete/{id}', ['as' => 'workflow.delete', 'uses' => 'Admin\helpdesk\WorkflowController@destroy']);
@@ -258,23 +242,23 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
* Api Settings
*/
Route::get('api', ['as' => 'api.settings.get', 'uses' => 'Common\ApiSettings@show']);
-
+
Route::post('api', ['as' => 'api.settings.post', 'uses' => 'Common\ApiSettings@postSettings']);
/*
* Error and debugging
*/
//route for showing error and debugging setting form page
Route::get('error-and-debugging-options', ['as' => 'err.debug.settings', 'uses' => 'Admin\helpdesk\ErrorAndDebuggingController@showSettings']);
-
+
//route for submit error and debugging setting form page
Route::post('post-settings', ['as' => 'post.error.debug.settings',
- 'uses' => 'Admin\helpdesk\ErrorAndDebuggingController@postSettings',]);
+ 'uses' => 'Admin\helpdesk\ErrorAndDebuggingController@postSettings', ]);
//route to error logs table page
Route::get('show-error-logs', [
- 'as' => 'error.logs',
+ 'as' => 'error.logs',
'uses' => 'Admin\helpdesk\ErrorAndDebuggingController@showErrorLogs',
]);
-
+
/*
* Approval
*/
@@ -282,18 +266,17 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
Route::post('settingsUpdateApproval/settings', ['as' => 'settingsUpdateApproval.settings', 'uses' => 'Agent\helpdesk\TicketController@settingsUpdateApproval']);
Route::get('/ticket/approval/closed', ['as' => 'closed.approvel.ticket', 'uses' => 'Agent\helpdesk\TicketController@approverClosedTicketList']); /* Get Closed Ticket */
-
+
Route::get('/ticket/get-approval', ['as' => 'get.approval.ticket', 'uses' => 'Agent\helpdesk\TicketController@getApproval']); /* Get tickets in datatable */
Route::get('/ticket/close/get-approval/{id}', ['as' => 'get.close.approval.ticket', 'uses' => 'Agent\helpdesk\TicketController@getCloseapproval']); /* Get tickets in datatable */
-
- /**
+
+ /*
* Labels
*/
-
- Route::resource('labels','Admin\helpdesk\Label\LabelController');
- Route::get('labels-ajax',['as'=>'labels.ajax','uses'=>'Admin\helpdesk\Label\LabelController@ajaxTable']);
+
+ Route::resource('labels', 'Admin\helpdesk\Label\LabelController');
+ Route::get('labels-ajax', ['as'=>'labels.ajax', 'uses'=>'Admin\helpdesk\Label\LabelController@ajaxTable']);
Route::get('labels/delete/{id}', ['as' => 'labels.destroy', 'uses' => 'Admin\helpdesk\Label\LabelController@destroy']);
-
});
/*
|------------------------------------------------------------------
@@ -315,15 +298,12 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
Route::get('user-export', ['as' => 'user.export', 'uses' => 'Agent\helpdesk\UserController@getExportUser']); /* User router is used to control the CRUD of user */
Route::post('user-export', ['as' => 'user.export.post', 'uses' => 'Agent\helpdesk\UserController@exportUser']); /* User router is used to control the CRUD of user */
-
-
-
Route::get('user-list', ['as' => 'user.list', 'uses' => 'Agent\helpdesk\UserController@user_list']);
-
+
// Route::get('user/delete/{id}', ['as' => 'user.delete' , 'uses' => 'Agent\helpdesk\UserController@destroy']);
Route::resource('organizations', 'Agent\helpdesk\OrganizationController'); /* organization router used to deal CRUD function of organization */
Route::get('get-organization', ['as' => 'org.get.ajax', 'uses' => 'Agent\helpdesk\OrganizationController@getOrgAjax']);
-
+
Route::get('org-list', ['as' => 'org.list', 'uses' => 'Agent\helpdesk\OrganizationController@org_list']);
Route::get('organization-autofill', ['as' => 'post.organization.autofill', 'uses' => 'Agent\helpdesk\OrganizationController@organizationAutofill']); //auto fill organization name
Route::get('org/delete/{id}', ['as' => 'org.delete', 'uses' => 'Agent\helpdesk\OrganizationController@destroy']);
@@ -331,9 +311,8 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
// Route::post('org-chart-range', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']);
Route::post('org-chart-range/{id}/{date1}/{date2}', ['as' => 'post.org.chart', 'uses' => 'Agent\helpdesk\OrganizationController@orgChartData']);
Route::get('profile', ['as' => 'profile', 'uses' => 'Agent\helpdesk\UserController@getProfile']); /* User profile get */
-
+
Route::get('profile-edit', ['as' => 'agent-profile-edit', 'uses' => 'Agent\helpdesk\UserController@getProfileedit']); /* User profile edit get */
-
Route::post('verify-number', ['as' => 'agent-verify-number', 'uses' => 'Agent\helpdesk\UserController@resendOTP']);
Route::post('verify-number2', ['as' => 'post-agent-verify-number', 'uses' => 'Agent\helpdesk\UserController@verifyOTP']);
@@ -341,45 +320,45 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
Route::patch('agent-profile', ['as' => 'agent-profile', 'uses' => 'Agent\helpdesk\UserController@postProfileedit']); /* User Profile Post */
Route::patch('agent-profile-password/{id}', 'Agent\helpdesk\UserController@postProfilePassword'); /* Profile Password Post */
Route::get('canned/list', ['as' => 'canned.list', 'uses' => 'Agent\helpdesk\CannedController@index']); /* Canned list */
-
+
Route::get('canned/create', ['as' => 'canned.create', 'uses' => 'Agent\helpdesk\CannedController@create']); /* Canned create */
-
+
Route::patch('canned/store', ['as' => 'canned.store', 'uses' => 'Agent\helpdesk\CannedController@store']); /* Canned store */
Route::get('canned/edit/{id}', ['as' => 'canned.edit', 'uses' => 'Agent\helpdesk\CannedController@edit']); /* Canned edit */
-
+
Route::patch('canned/update/{id}', ['as' => 'canned.update', 'uses' => 'Agent\helpdesk\CannedController@update']); /* Canned update */
Route::get('canned/show/{id}', ['as' => 'canned.show', 'uses' => 'Agent\helpdesk\CannedController@show']); /* Canned show */
Route::delete('canned/destroy/{id}', ['as' => 'canned.destroy', 'uses' => 'Agent\helpdesk\CannedController@destroy']); /* Canned delete */
Route::get('/test', ['as' => 'thr', 'uses' => 'Agent\helpdesk\MailController@fetchdata']); /* Fetch Emails */
Route::get('/ticket', ['as' => 'ticket', 'uses' => 'Agent\helpdesk\TicketController@ticket_list']); /* Get Ticket */
Route::get('/ticket/inbox', ['as' => 'inbox.ticket', 'uses' => 'Agent\helpdesk\TicketController@inbox_ticket_list']); /* Get Inbox Ticket */
-
+
Route::get('/ticket/get-inbox', ['as' => 'get.inbox.ticket', 'uses' => 'Agent\helpdesk\TicketController@get_inbox']); /* Get tickets in datatable */
Route::get('/ticket/open', ['as' => 'open.ticket', 'uses' => 'Agent\helpdesk\TicketController@open_ticket_list']); /* Get Open Ticket */
-
+
Route::get('/ticket/get-open', ['as' => 'get.open.ticket', 'uses' => 'Agent\helpdesk\TicketController@get_open']); /* Get tickets in datatable */
Route::get('/ticket/answered', ['as' => 'answered.ticket', 'uses' => 'Agent\helpdesk\TicketController@answered_ticket_list']); /* Get Answered Ticket */
-
+
Route::get('/ticket/get-answered', ['as' => 'get.answered.ticket', 'uses' => 'Agent\helpdesk\TicketController@get_answered']); /* Get tickets in datatable */
Route::get('/ticket/myticket', ['as' => 'myticket.ticket', 'uses' => 'Agent\helpdesk\TicketController@myticket_ticket_list']); /* Get Tickets Assigned to logged user */
-
+
Route::get('/ticket/get-myticket', ['as' => 'get.myticket.ticket', 'uses' => 'Agent\helpdesk\TicketController@get_myticket']); /* Get tickets in datatable */
Route::get('/ticket/overdue', ['as' => 'overdue.ticket', 'uses' => 'Agent\helpdesk\TicketController@overdue_ticket_list']); /* Get Overdue Ticket */
-
+
Route::get('/ticket/get-overdue', ['as' => 'get.overdue.ticket', 'uses' => 'Agent\helpdesk\TicketController@getOverdueTickets']); /* Get Overdue Ticket */
Route::get('/ticket/closed', ['as' => 'closed.ticket', 'uses' => 'Agent\helpdesk\TicketController@closed_ticket_list']); /* Get Closed Ticket */
-
+
Route::get('/ticket/get-closed', ['as' => 'get.closed.ticket', 'uses' => 'Agent\helpdesk\TicketController@get_closed']); /* Get tickets in datatable */
Route::get('/ticket/assigned', ['as' => 'assigned.ticket', 'uses' => 'Agent\helpdesk\TicketController@assigned_ticket_list']); /* Get Assigned Ticket */
-
+
Route::get('/ticket/get-assigned', ['as' => 'get.assigned.ticket', 'uses' => 'Agent\helpdesk\TicketController@get_assigned']); /* Get tickets in datatable */
Route::get('/newticket', ['as' => 'newticket', 'uses' => 'Agent\helpdesk\TicketController@newticket']); /* Get Create New Ticket */
-
+
Route::get('/newticket/autofill', ['as' => 'post.newticket.autofill', 'uses' => 'Agent\helpdesk\TicketController@autofill']);
Route::post('/newticket/post', ['as' => 'post.newticket', 'uses' => 'Agent\helpdesk\TicketController@post_newticket']); /* Post Create New Ticket */
Route::get('/thread/{id}', ['as' => 'ticket.thread', 'uses' => 'Agent\helpdesk\TicketController@thread']); /* Get Thread by ID */
-
+
Route::post('/thread/reply/{id}', ['as' => 'ticket.reply', 'uses' => 'Agent\helpdesk\TicketController@reply']); /* Patch Thread Reply */
Route::patch('/internal/note/{id}', ['as' => 'Internal.note', 'uses' => 'Agent\helpdesk\TicketController@InternalNote']); /* Patch Internal Note */
Route::patch('/ticket/assign/{id}', ['as' => 'assign.ticket', 'uses' => 'Agent\helpdesk\TicketController@assign']); /* Patch Ticket assigned to whom */
@@ -393,13 +372,13 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
Route::get('/ticket/surrender/{id}', ['as' => 'ticket.surrender', 'uses' => 'Agent\helpdesk\TicketController@surrender']); /* Get Ticket Surrender */
Route::get('/aaaa', 'Client\helpdesk\GuestController@ticket_number');
Route::get('trash', ['as' => 'get-trash', 'uses' => 'Agent\helpdesk\TicketController@trash']); /* To show Deleted Tickets */
-
+
Route::get('/ticket/trash', ['as' => 'get.trash.ticket', 'uses' => 'Agent\helpdesk\TicketController@get_trash']); /* Get tickets in datatable */
Route::get('unassigned', ['as' => 'unassigned', 'uses' => 'Agent\helpdesk\TicketController@unassigned']); /* To show Unassigned Tickets */
-
+
Route::get('/ticket/unassigned', ['as' => 'get.unassigned.ticket', 'uses' => 'Agent\helpdesk\TicketController@get_unassigned']); /* Get tickets in datatable */
Route::get('dashboard', ['as' => 'dashboard', 'uses' => 'Agent\helpdesk\DashboardController@index']); /* To show dashboard pages */
-
+
Route::get('agen', 'Agent\helpdesk\DashboardController@ChartData');
Route::get('image/{id}', ['as' => 'image', 'uses' => 'Agent\helpdesk\MailController@get_data']); /* get image */
Route::get('thread/auto/{id}', 'Agent\helpdesk\TicketController@autosearch');
@@ -412,17 +391,17 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
// Route::get('message' , 'MessageController@show');
Route::post('lock', ['as' => 'lock', 'uses' => 'Agent\helpdesk\TicketController@lock']);
Route::patch('user-org-assign/{id}', ['as' => 'user.assign.org', 'uses' => 'Agent\helpdesk\UserController@UserAssignOrg']);
- Route::patch('user-org-edit-assign/{id}', ['as' => 'user.editassign.org', 'uses' => 'Agent\helpdesk\UserController@UsereditAssignOrg']);
+ Route::patch('user-org-edit-assign/{id}', ['as' => 'user.editassign.org', 'uses' => 'Agent\helpdesk\UserController@UsereditAssignOrg']);
Route::patch('/user-org/{id}', 'Agent\helpdesk\UserController@User_Create_Org');
Route::patch('/head-org/{id}', 'Agent\helpdesk\OrganizationController@Head_Org');
// Department ticket
Route::get('/{dept}/open', ['as' => 'dept.open.ticket', 'uses' => 'Agent\helpdesk\TicketController@deptopen']); // Open
Route::get('tickets/{dept}/{status}', ['as' => 'dept.ticket', 'uses' => 'Agent\helpdesk\TicketController@deptTicket']); // Open
-
+
Route::get('/{dept}/assigned', ['as' => 'dept.inprogress.ticket', 'uses' => 'Agent\helpdesk\TicketController@deptinprogress']); // Inprogress
-
+
Route::get('/{dept}/closed', ['as' => 'dept.closed.ticket', 'uses' => 'Agent\helpdesk\TicketController@deptclose']); // Closed
-
+
Route::post('rating/{id}', ['as' => 'ticket.rating', 'uses' => 'Agent\helpdesk\TicketController@rating']); /* Get overall Ratings */
Route::post('rating2/{id}', ['as' => 'ticket.rating2', 'uses' => 'Agent\helpdesk\TicketController@ratingReply']); /* Get reply Ratings */
// To check and lock tickets
@@ -443,29 +422,28 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
// route for graphical reporting
Route::get('report', ['as' => 'report.index', 'uses' => 'Agent\helpdesk\ReportController@index']); /* To show dashboard pages */
-
+
// default route to get the data for the first time
Route::get('help-topic-report', 'Agent\helpdesk\ReportController@chartdataHelptopic');
// route to get the data on change
Route::post('help-topic-report/{date1}/{date2}/{id}', ['as' => 'report.helptopic', 'uses' => 'Agent\helpdesk\ReportController@chartdataHelptopic']); /* To show dashboard pages */
Route::post('help-topic-pdf', ['as' => 'help.topic.pdf', 'uses' => 'Agent\helpdesk\ReportController@helptopicPdf']);
- // Route to get details of agents
+ // Route to get details of agents
Route::post('get-agents', ['as' => 'get-agents', 'uses' => 'Agent\helpdesk\UserController@getAgentDetails']);
-
- /**
+
+ /*
* Label
*/
- Route::get('labels-ticket',['as'=>'labels.ticket','uses'=>'Admin\helpdesk\Label\LabelController@attachTicket']);
- Route::get('json-labels',['as'=>'labels.json','uses'=>'Admin\helpdesk\Label\LabelController@getLabel']);
- Route::get('filter',['as'=>'filter','uses'=>'Agent\helpdesk\Filter\FilterController@getFilter']);
-
- /**
+ Route::get('labels-ticket', ['as'=>'labels.ticket', 'uses'=>'Admin\helpdesk\Label\LabelController@attachTicket']);
+ Route::get('json-labels', ['as'=>'labels.json', 'uses'=>'Admin\helpdesk\Label\LabelController@getLabel']);
+ Route::get('filter', ['as'=>'filter', 'uses'=>'Agent\helpdesk\Filter\FilterController@getFilter']);
+
+ /*
* Tags
*/
-
- Route::get('add-tag',['as'=>'tag.add','uses'=>'Agent\helpdesk\Filter\TagController@addToFilter']);
- Route::get('get-tag',['as'=>'tag.get','uses'=>'Agent\helpdesk\Filter\TagController@getTag']);
-
+
+ Route::get('add-tag', ['as'=>'tag.add', 'uses'=>'Agent\helpdesk\Filter\TagController@addToFilter']);
+ Route::get('get-tag', ['as'=>'tag.get', 'uses'=>'Agent\helpdesk\Filter\TagController@getTag']);
});
/*
@@ -492,7 +470,7 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
// });
Route::any('getdata', function () {
$term = Illuminate\Support\Str::lower(Input::get('term'));
- $data = Illuminate\Support\Facades\DB::table('tickets')->distinct()->select('ticket_number')->where('ticket_number', 'LIKE', $term . '%')->groupBy('ticket_number')->take(10)->get();
+ $data = Illuminate\Support\Facades\DB::table('tickets')->distinct()->select('ticket_number')->where('ticket_number', 'LIKE', $term.'%')->groupBy('ticket_number')->take(10)->get();
foreach ($data as $v) {
return [
'value' => $v->ticket_number,
@@ -501,38 +479,37 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
});
Route::post('postform/{id}', 'Client\helpdesk\FormController@postForm'); /* post the AJAX form for create a ticket by guest user */
- Route::post('postedform', ['as'=>'client.form.post','uses'=>'Client\helpdesk\FormController@postedForm']); /* post the form to store the value */
+ Route::post('postedform', ['as'=>'client.form.post', 'uses'=>'Client\helpdesk\FormController@postedForm']); /* post the form to store the value */
//Route::get('check', 'CheckController@getcheck'); //testing checkbox auto-populate
//Route::post('postcheck/{id}', 'CheckController@postcheck');
Route::get('get-helptopic-form', 'Client\helpdesk\FormController@getCustomForm');
-
+
Route::get('home', ['as' => 'home', 'uses' => 'Client\helpdesk\WelcomepageController@index']); //guest layout
-
+
Route::get('/', ['as' => '/', 'uses' => 'Client\helpdesk\WelcomepageController@index']);
-
+
Route::get('create-ticket', ['as' => 'form', 'uses' => 'Client\helpdesk\FormController@getForm']); //getform
Route::get('mytickets/{id}', ['as' => 'ticketinfo', 'uses' => 'Client\helpdesk\GuestController@singleThread']); //detail ticket information
Route::post('checkmyticket', 'Client\helpdesk\UnAuthController@PostCheckTicket'); //ticket ckeck
Route::get('check_ticket/{id}', ['as' => 'check_ticket', 'uses' => 'Client\helpdesk\GuestController@get_ticket_email']); //detail ticket information
-
+
// 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 */
-
+
Route::get('mytickets', ['as' => 'ticket2', 'uses' => 'Client\helpdesk\GuestController@getMyticket']);
Route::get('myticket/{id}', ['as' => 'ticket', 'uses' => 'Client\helpdesk\GuestController@thread']); /* Get my tickets */
Route::patch('client-profile-edit', 'Client\helpdesk\GuestController@postProfile'); /* User Profile Post */
Route::patch('client-profile-password', 'Client\helpdesk\GuestController@postProfilePassword'); /* Profile Password Post */
Route::post('post/reply/{id}', ['as' => 'client.reply', 'uses' => 'Client\helpdesk\ClientTicketController@reply']);
Route::post('verify-client-number', ['as' => 'client-verify-number', 'uses' => 'Client\helpdesk\GuestController@resendOTP']);
-
+
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 */
@@ -593,10 +570,10 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
echo '';
foreach ($routeCollection as $value) {
echo '';
- echo '' . $value->getMethods()[0] . ' ';
- echo '' . $value->getName() . ' ';
- echo '' . $value->getPath() . ' ';
- echo '' . $value->getActionName() . ' ';
+ echo ''.$value->getMethods()[0].' ';
+ echo ''.$value->getName().' ';
+ echo ''.$value->getPath().' ';
+ echo ''.$value->getActionName().' ';
echo ' ';
}
echo '';
@@ -607,29 +584,25 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
|=============================================================
*/
Route::get('500', ['as' => 'error500', function () {
- return view('errors.500');
- }]);
-
+ return view('errors.500');
+ }]);
+
Route::get('404', ['as' => 'error404', function () {
- return view('errors.404');
- }]);
-
+ return view('errors.404');
+ }]);
- Route::get('error-in-database-connection', ['as' => 'errordb', function() {
- return view('errors.db');
- }]);
+ Route::get('error-in-database-connection', ['as' => 'errordb', function () {
+ return view('errors.db');
+ }]);
-
+ Route::get('unauthorized', ['as' => 'unauth', function () {
+ return view('errors.unauth');
+ }]);
- Route::get('unauthorized', ['as' => 'unauth', function() {
- return view('errors.unauth');
- }]);
-
-
Route::get('board-offline', ['as' => 'board.offline', function () {
- return view('errors.offline');
- }]);
-
+ return view('errors.offline');
+ }]);
+
/*
|=============================================================
| Test mail Routes
@@ -644,20 +617,20 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
// });
/* For the crud of catogory */
Route::resource('category', 'Agent\kb\CategoryController');
-
+
Route::get('category/delete/{id}', 'Agent\kb\CategoryController@destroy');
/* For the crud of article */
Route::resource('article', 'Agent\kb\ArticleController');
-
+
Route::get('article/delete/{id}', 'Agent\kb\ArticleController@destroy');
/* get settings */
Route::get('kb/settings', ['as' => 'settings', 'uses' => 'Agent\kb\SettingsController@settings']);
-
+
/* post settings */
Route::patch('postsettings/{id}', 'Agent\kb\SettingsController@postSettings');
//Route for administrater to access the comment
Route::get('comment', ['as' => 'comment', 'uses' => 'Agent\kb\SettingsController@comment']);
-
+
/* Route to define the comment should Published */
Route::get('published/{id}', ['as' => 'published', 'uses' => 'Agent\kb\SettingsController@publish']);
/* Route for deleting comments */
@@ -673,8 +646,7 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
/* delete Background */
Route::get('delete-background/{id}', ['as' => 'delete-background', 'uses' => 'Agent\kb\SettingsController@deleteBackground']);
Route::resource('page', 'Agent\kb\PageController');
-
-
+
Route::get('get-pages', ['as' => 'api.page', 'uses' => 'Agent\kb\PageController@getData']);
Route::get('page/delete/{id}', ['as' => 'pagedelete', 'uses' => 'Agent\kb\PageController@destroy']);
Route::get('comment/delete/{id}', ['as' => 'commentdelete', 'uses' => 'Agent\kb\SettingsController@delete']);
@@ -690,19 +662,19 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
/* post the comment from show page */
Route::post('postcomment/{slug}', ['as' => 'postcomment', 'uses' => 'Client\kb\UserController@postComment']);
/* get the article list */
-
+
Route::get('article-list', ['as' => 'article-list', 'uses' => 'Client\kb\UserController@getArticle']);
// /* get search values */
Route::get('search', ['as' => 'search', 'uses' => 'Client\kb\UserController@search']);
-
+
/* get the selected article */
Route::get('show/{slug}', ['as' => 'show', 'uses' => 'Client\kb\UserController@show']);
-
+
Route::get('category-list', ['as' => 'category-list', 'uses' => 'Client\kb\UserController@getCategoryList']);
-
+
/* get the categories with article */
Route::get('category-list/{id}', ['as' => 'categorylist', 'uses' => 'Client\kb\UserController@getCategory']);
-
+
Route::post('show/rating/{id}', ['as' => 'show.rating', 'uses' => 'Client\helpdesk\UnAuthController@rating']); /* Get overall Ratings */
Route::post('show/rating2/{id}', ['as' => 'show.rating2', 'uses' => 'Client\helpdesk\UnAuthController@ratingReply']); /* Get reply Ratings */
Route::get('show/change-status/{status}/{id}', ['as' => 'show.change.status', 'uses' => 'Client\helpdesk\UnAuthController@changeStatus']); /* Get reply Ratings */
@@ -712,12 +684,12 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
// $router->get('faq',['as'=>'faq' , 'uses'=>'Client\kb\UserController@Faq'] );
/* get the cantact page to user */
Route::get('contact', ['as' => 'contact', 'uses' => 'Client\kb\UserController@contact']);
-
+
/* post the cantact page to controller */
Route::post('post-contact', ['as' => 'post-contact', 'uses' => 'Client\kb\UserController@postContact']);
//to get the value for page content
Route::get('pages/{name}', ['as' => 'pages', 'uses' => 'Client\kb\UserController@getPage']);
-
+
//profile
// $router->get('client-profile',['as' => 'client-profile', 'uses' => 'Client\kb\UserController@clientProfile']);
// Route::patch('client-profile-edit',['as' => 'client-profile-edit', 'uses' => 'Client\kb\UserController@postClientProfile']);
@@ -802,44 +774,42 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
$api_control->ticketDetailEvent($details);
});
-
-
Route::get('test', ['as' => 'test', 'uses' => 'Common\PushNotificationController@response']);
Route::get('mail/config/service', ['as' => 'mail.config.service', 'uses' => 'Job\MailController@serviceForm']);
- /**
+ /*
* Queue
*/
-
+
Route::get('queue', ['as' => 'queue', 'uses' => 'Job\QueueController@index']);
Route::get('form/queue', ['as' => 'queue.form', 'uses' => 'Job\QueueController@getForm']);
-
+
Route::get('queue/{id}', ['as' => 'queue.edit', 'uses' => 'Job\QueueController@edit']);
Route::post('queue/{id}', ['as' => 'queue.update', 'uses' => 'Job\QueueController@update']);
Route::get('queue/{id}/activate', ['as' => 'queue.activate', 'uses' => 'Job\QueueController@activate']);
Route::get('get-ticket-number', ['as' => 'get.ticket.number', 'uses' => 'Admin\helpdesk\SettingsController@getTicketNumber']);
Route::get('genereate-pdf/{threadid}', ['as' => 'thread.pdf', 'uses' => 'Agent\helpdesk\TicketController@pdfThread']);
- /**
+ /*
* Url Settings
*/
-
+
Route::get('url/settings', ['as' => 'url.settings', 'uses' => 'Admin\helpdesk\UrlSettingController@settings']);
Route::patch('url/settings', ['as' => 'url.settings.post', 'uses' => 'Admin\helpdesk\UrlSettingController@postSettings']);
-
- /**
+
+ /*
* Social media settings
*/
-
- Route::get('social/media',['as'=>'social','uses'=>'Admin\helpdesk\SocialMedia\SocialMediaController@index']);
- Route::get('social/media/{provider}',['as'=>'social.media','uses'=>'Admin\helpdesk\SocialMedia\SocialMediaController@settings']);
- Route::post('social/media/{provider}',['as'=>'social.media.post','uses'=>'Admin\helpdesk\SocialMedia\SocialMediaController@postSettings']);
+
+ Route::get('social/media', ['as'=>'social', 'uses'=>'Admin\helpdesk\SocialMedia\SocialMediaController@index']);
+ Route::get('social/media/{provider}', ['as'=>'social.media', 'uses'=>'Admin\helpdesk\SocialMedia\SocialMediaController@settings']);
+ Route::post('social/media/{provider}', ['as'=>'social.media.post', 'uses'=>'Admin\helpdesk\SocialMedia\SocialMediaController@postSettings']);
/*
* Ticket_Priority Settings
*/
Route::get('ticket/priority', ['as' => 'priority.index', 'uses' => 'Admin\helpdesk\PriorityController@priorityIndex']);
Route::post('user/ticket/priority', ['as' => 'user.priority.index', 'uses' => 'Admin\helpdesk\PriorityController@userPriorityIndex']);
-
+
Route::get('get_index', ['as' => 'priority.index1', 'uses' => 'Admin\helpdesk\PriorityController@priorityIndex1']);
Route::get('ticket/priority/create', ['as' => 'priority.create', 'uses' => 'Admin\helpdesk\PriorityController@priorityCreate']);
Route::post('ticket/priority/create1', ['as' => 'priority.create1', 'uses' => 'Admin\helpdesk\PriorityController@priorityCreate1']);
@@ -848,20 +818,20 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
Route::get('ticket/priority/{ticket_priority}/destroy', ['as' => 'priority.destroy', 'uses' => 'Admin\helpdesk\PriorityController@destroy']);
// user---arindam
Route::post('rolechangeadmin/{id}', ['as' => 'user.post.rolechangeadmin', 'uses' =>'Agent\helpdesk\UserController@changeRoleAdmin']);
- Route::post('rolechangeagent/{id}', ['as' => 'user.post.rolechangeagent', 'uses' =>'Agent\helpdesk\UserController@changeRoleAgent']);
- Route::post('rolechangeuser/{id}', ['as' => 'user.post.rolechangeuser', 'uses' =>'Agent\helpdesk\UserController@changeRoleUser']);
- Route::get('password', ['as' => 'user.changepassword', 'uses' =>'Agent\helpdesk\UserController@randomPassword']);
- Route::post('changepassword/{id}', ['as' => 'user.post.changepassword', 'uses' =>'Agent\helpdesk\UserController@randomPostPassword']);
- Route::post('delete/{id}', ['as' => 'user.post.delete', 'uses' =>'Agent\helpdesk\UserController@deleteAgent']);
+ Route::post('rolechangeagent/{id}', ['as' => 'user.post.rolechangeagent', 'uses' =>'Agent\helpdesk\UserController@changeRoleAgent']);
+ Route::post('rolechangeuser/{id}', ['as' => 'user.post.rolechangeuser', 'uses' =>'Agent\helpdesk\UserController@changeRoleUser']);
+ Route::get('password', ['as' => 'user.changepassword', 'uses' =>'Agent\helpdesk\UserController@randomPassword']);
+ Route::post('changepassword/{id}', ['as' => 'user.post.changepassword', 'uses' =>'Agent\helpdesk\UserController@randomPostPassword']);
+ Route::post('delete/{id}', ['as' => 'user.post.delete', 'uses' =>'Agent\helpdesk\UserController@deleteAgent']);
// deleted user list
- Route::get('deleted/user', ['as' => 'user.deleted', 'uses' => 'Agent\helpdesk\UserController@deletedUser']);
+ Route::get('deleted/user', ['as' => 'user.deleted', 'uses' => 'Agent\helpdesk\UserController@deletedUser']);
- Route::post('restore/{id}', ['as' => 'user.restore', 'uses' => 'Agent\helpdesk\UserController@restoreUser']);
+ Route::post('restore/{id}', ['as' => 'user.restore', 'uses' => 'Agent\helpdesk\UserController@restoreUser']);
//due today ticket
Route::get('duetoday', ['as' => 'ticket.duetoday', 'uses' =>'Agent\helpdesk\TicketController@dueTodayTicketlist']);
-
+
// Route::post('duetoday/list/ticket', ['as' => 'ticket.post.duetoday', 'uses' =>'Agent\helpdesk\TicketController@getDueToday']);
Route::get('duetoday/list/ticket', ['as' => 'ticket.post.duetoday', 'uses' =>'Agent\helpdesk\TicketController@getDueToday']); /* Get Open Ticket */
// Breadcrumbs::register('open.ticket', function ($breadcrumbs) {
@@ -869,4 +839,3 @@ Route::get('getshow/{id}', ['as' => 'teams.getshow.list', 'uses' => 'Admin\helpd
// $breadcrumbs->push(Lang::get('lang.tickets') . ' > ' . Lang::get('lang.open'), route('open.ticket'));
// });
});
-
diff --git a/app/Jobs/SendEmail.php b/app/Jobs/SendEmail.php
index 8e6a1d4ca..9187e3d50 100644
--- a/app/Jobs/SendEmail.php
+++ b/app/Jobs/SendEmail.php
@@ -2,28 +2,27 @@
namespace App\Jobs;
-use App\Jobs\Job;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Contracts\Bus\SelfHandling;
use App\Http\Controllers\Common\PhpMailController;
+use Illuminate\Contracts\Bus\SelfHandling;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
-class SendEmail extends Job implements SelfHandling,ShouldQueue
+class SendEmail extends Job implements SelfHandling, ShouldQueue
{
use InteractsWithQueue,SerializesModels;
-
-
+
protected $from;
protected $to;
protected $message;
protected $template;
+
/**
* Create a new job instance.
*
* @return void
*/
- public function __construct($from, $to, $message,$template_variables='')
+ public function __construct($from, $to, $message, $template_variables = '')
{
$this->from = $from;
$this->to = $to;
@@ -38,10 +37,8 @@ class SendEmail extends Job implements SelfHandling,ShouldQueue
*/
public function handle(PhpMailController $PhpMailController)
{
- $p = $PhpMailController->sendEmail($this->from, $this->to, $this->message,$this->template);
+ $p = $PhpMailController->sendEmail($this->from, $this->to, $this->message, $this->template);
+
return $p;
-
}
-
-
}
diff --git a/app/Model/MailJob/Condition.php b/app/Model/MailJob/Condition.php
index 3086e46e7..80cc34d8b 100644
--- a/app/Model/MailJob/Condition.php
+++ b/app/Model/MailJob/Condition.php
@@ -4,12 +4,13 @@ namespace App\Model\MailJob;
use Illuminate\Database\Eloquent\Model;
-class Condition extends Model {
-
- protected $table = "conditions";
+class Condition extends Model
+{
+ protected $table = 'conditions';
protected $fillable = ['job', 'value'];
- public function getConditionValue($job) {
+ public function getConditionValue($job)
+ {
$value = ['condition' => '', 'at' => ''];
$condition = $this->where('job', $job)->first();
if ($condition) {
@@ -19,21 +20,24 @@ class Condition extends Model {
$value = ['condition' => $this->checkArray(0, $condition_value), 'at' => $this->checkArray(1, $condition_value)];
}
}
+
return $value;
}
-
- public function checkArray($key,$array){
- $value = "";
- if(is_array($array)){
- if(array_key_exists($key, $array)){
+
+ public function checkArray($key, $array)
+ {
+ $value = '';
+ if (is_array($array)) {
+ if (array_key_exists($key, $array)) {
$value = $array[$key];
}
}
+
return $value;
-
}
- public function checkActiveJob() {
+ public function checkActiveJob()
+ {
$result = ['fetching' => '', 'notification' => '', 'work' => '', 'message' => '', 'remind' => ''];
$emails = new \App\Model\helpdesk\Settings\Email();
$email = $emails->find(1);
@@ -41,19 +45,19 @@ class Condition extends Model {
if ($email->email_fetching == 1) {
$result['fetching'] = true;
}
- if($email->notification_cron==1){
+ if ($email->notification_cron == 1) {
$result['notification'] = true;
}
}
$works = new \App\Model\helpdesk\Workflow\WorkflowClose();
$work = $works->find(1);
//dd($work);
- if($work){
- if($work->condition==1){
+ if ($work) {
+ if ($work->condition == 1) {
$result['work'] = true;
}
}
+
return $result;
}
-
}
diff --git a/app/Model/MailJob/FaveoMail.php b/app/Model/MailJob/FaveoMail.php
index 4741a8f4c..0570c9531 100644
--- a/app/Model/MailJob/FaveoMail.php
+++ b/app/Model/MailJob/FaveoMail.php
@@ -4,9 +4,8 @@ namespace App\Model\MailJob;
use Illuminate\Database\Eloquent\Model;
-class FaveoMail extends Model {
-
- protected $table = "faveo_mails";
- protected $fillable = ["drive", "key", "value","email_id"];
-
+class FaveoMail extends Model
+{
+ protected $table = 'faveo_mails';
+ protected $fillable = ['drive', 'key', 'value', 'email_id'];
}
diff --git a/app/Model/MailJob/FaveoQueue.php b/app/Model/MailJob/FaveoQueue.php
index a4bf88926..e804e608c 100644
--- a/app/Model/MailJob/FaveoQueue.php
+++ b/app/Model/MailJob/FaveoQueue.php
@@ -4,9 +4,8 @@ namespace App\Model\MailJob;
use Illuminate\Database\Eloquent\Model;
-class FaveoQueue extends Model {
-
- protected $table = "faveo_queues";
- protected $fillable = ["key", "value","service_id"];
-
+class FaveoQueue extends Model
+{
+ protected $table = 'faveo_queues';
+ protected $fillable = ['key', 'value', 'service_id'];
}
diff --git a/app/Model/MailJob/MailService.php b/app/Model/MailJob/MailService.php
index 784cb7317..4f75b8a77 100644
--- a/app/Model/MailJob/MailService.php
+++ b/app/Model/MailJob/MailService.php
@@ -6,6 +6,6 @@ use Illuminate\Database\Eloquent\Model;
class MailService extends Model
{
- protected $table = "mail_services";
- protected $fillable = ["name","short_name"];
+ protected $table = 'mail_services';
+ protected $fillable = ['name', 'short_name'];
}
diff --git a/app/Model/MailJob/QueueService.php b/app/Model/MailJob/QueueService.php
index e9877e15f..0c97fc51d 100644
--- a/app/Model/MailJob/QueueService.php
+++ b/app/Model/MailJob/QueueService.php
@@ -7,55 +7,67 @@ use Lang;
class QueueService extends Model
{
- protected $table = "queue_services";
- protected $fillable = ["name","short_name","status"];
-
- public function extraFieldRelation(){
+ protected $table = 'queue_services';
+ protected $fillable = ['name', 'short_name', 'status'];
+
+ public function extraFieldRelation()
+ {
$related = "App\Model\MailJob\FaveoQueue";
- return $this->hasMany($related,'service_id');
+
+ return $this->hasMany($related, 'service_id');
}
-
- public function getExtraField($key){
- $value = "";
- $setting = $this->extraFieldRelation()->where('key',$key)->first();
- if($setting){
+
+ public function getExtraField($key)
+ {
+ $value = '';
+ $setting = $this->extraFieldRelation()->where('key', $key)->first();
+ if ($setting) {
$value = $setting->value;
}
+
return $value;
}
-
- public function getName(){
- $name = $this->attributes['name'];
+
+ public function getName()
+ {
+ $name = $this->attributes['name'];
$id = $this->attributes['id'];
- $html = "".$name."";
+ $html = ''.$name.'';
+
return $html;
}
-
- public function getStatus(){
+
+ public function getStatus()
+ {
$status = $this->attributes['status'];
- $html = "".Lang::get('lang.inactive')."";
- if($status==1){
- $html = "".Lang::get('lang.active')."";
+ $html = "".Lang::get('lang.inactive').'';
+ if ($status == 1) {
+ $html = "".Lang::get('lang.active').'';
}
+
return $html;
}
-
- public function getAction(){
+
+ public function getAction()
+ {
$id = $this->attributes['id'];
$status = $this->attributes['status'];
- $html = "".Lang::get('lang.activate')."";
- if($status==1){
- $html = "".Lang::get('lang.activate')."";
+ $html = '".Lang::get('lang.activate').'';
+ if ($status == 1) {
+ $html = "".Lang::get('lang.activate').'';
}
+
return $html;
}
-
- public function isActivate(){
+
+ public function isActivate()
+ {
$check = true;
$settings = $this->extraFieldRelation()->get();
- if($settings->count()==0){
+ if ($settings->count() == 0) {
$check = false;
}
+
return $check;
}
}
diff --git a/app/Model/helpdesk/Agent/Assign_team_agent.php b/app/Model/helpdesk/Agent/Assign_team_agent.php
index f98cf4d88..d88ba7f52 100644
--- a/app/Model/helpdesk/Agent/Assign_team_agent.php
+++ b/app/Model/helpdesk/Agent/Assign_team_agent.php
@@ -7,5 +7,5 @@ use App\BaseModel;
class Assign_team_agent extends BaseModel
{
protected $table = 'team_assign_agent';
- protected $fillable = ['id', 'team_id', 'agent_id','updated_at', 'created_at'];
+ protected $fillable = ['id', 'team_id', 'agent_id', 'updated_at', 'created_at'];
}
diff --git a/app/Model/helpdesk/Agent_panel/Organization.php b/app/Model/helpdesk/Agent_panel/Organization.php
index 607d5a17b..40a9dce55 100644
--- a/app/Model/helpdesk/Agent_panel/Organization.php
+++ b/app/Model/helpdesk/Agent_panel/Organization.php
@@ -12,22 +12,27 @@ class Organization extends BaseModel
/* Define the fillable fields */
protected $fillable = ['id', 'name', 'phone', 'website', 'address', 'head', 'internal_notes'];
-
-
- public function userRelation(){
+
+ public function userRelation()
+ {
$related = "App\Model\helpdesk\Agent_panel\User_org";
- return $this->hasMany($related,'org_id');
+
+ return $this->hasMany($related, 'org_id');
}
-
- public function getUserIds(){
+
+ public function getUserIds()
+ {
$user_relations = $this->userRelation()->lists('user_id')->toArray();
+
return $user_relations;
}
-
- public function users(){
+
+ public function users()
+ {
$user = new \App\User();
$user_ids = $this->getUserIds();
- $users = $user->whereIn('id',$user_ids);
+ $users = $user->whereIn('id', $user_ids);
+
return $users;
}
}
diff --git a/app/Model/helpdesk/Agent_panel/User_org.php b/app/Model/helpdesk/Agent_panel/User_org.php
index 32ea15fb9..dfb3703d7 100644
--- a/app/Model/helpdesk/Agent_panel/User_org.php
+++ b/app/Model/helpdesk/Agent_panel/User_org.php
@@ -13,10 +13,11 @@ class User_org extends BaseModel
/* define fillable fields */
protected $fillable = ['id', 'org_id', 'user_id'];
- public function setOrgIdAttribute($value){
- if($value==""){
+ public function setOrgIdAttribute($value)
+ {
+ if ($value == '') {
$this->attributes['org_id'] = null;
- }else{
+ } else {
$this->attributes['org_id'] = $value;
}
}
diff --git a/app/Model/helpdesk/Email/Emails.php b/app/Model/helpdesk/Email/Emails.php
index 782c1747c..0468b64db 100644
--- a/app/Model/helpdesk/Email/Emails.php
+++ b/app/Model/helpdesk/Email/Emails.php
@@ -14,53 +14,61 @@ class Emails extends BaseModel
'fetching_status', 'move_to_folder', 'delete_email', 'do_nothing',
'sending_status', 'authentication', 'header_spoofing', 'imap_config',
];
-
- public function getCurrentDrive(){
- $drive = $this->attributes['sending_protocol'];
+
+ public function getCurrentDrive()
+ {
+ $drive = $this->attributes['sending_protocol'];
$mailServices = new \App\Model\MailJob\MailService();
- $id = "";
- $mailService = $mailServices->where('short_name',$drive)->first();
- if($mailService){
+ $id = '';
+ $mailService = $mailServices->where('short_name', $drive)->first();
+ if ($mailService) {
$id = $mailService->id;
}
+
return $id;
-
}
-
- public function getExtraField($key){
- $value = "";
+
+ public function getExtraField($key)
+ {
+ $value = '';
$id = $this->attributes['id'];
$services = new \App\Model\MailJob\FaveoMail();
- $service = $services->where('email_id',$id)->where('key',$key)->first();
- if($service){
+ $service = $services->where('email_id', $id)->where('key', $key)->first();
+ if ($service) {
$value = $service->value;
}
+
return $value;
-
}
-
- public function extraFieldRelation(){
+
+ public function extraFieldRelation()
+ {
$related = "App\Model\MailJob\FaveoMail";
- return $this->hasMany($related,'email_id');
+
+ return $this->hasMany($related, 'email_id');
}
-
- public function deleteExtraFields(){
+
+ public function deleteExtraFields()
+ {
$fields = $this->extraFieldRelation()->get();
- if($fields->count()>0){
- foreach ($fields as $field){
+ if ($fields->count() > 0) {
+ foreach ($fields as $field) {
$field->delete();
}
}
}
-
- public function getPasswordAttribute($value){
- if($value){
+
+ public function getPasswordAttribute($value)
+ {
+ if ($value) {
return \Crypt::decrypt($value);
}
+
return $value;
}
-
- public function delete() {
+
+ public function delete()
+ {
$this->deleteExtraFields();
parent::delete();
}
diff --git a/app/Model/helpdesk/Filters/Filter.php b/app/Model/helpdesk/Filters/Filter.php
index ac12fca2a..ec0bb34d6 100644
--- a/app/Model/helpdesk/Filters/Filter.php
+++ b/app/Model/helpdesk/Filters/Filter.php
@@ -7,28 +7,30 @@ use Illuminate\Database\Eloquent\Model;
class Filter extends Model
{
protected $table = 'filters';
- protected $fillable = ['ticket_id','key','value'];
-
- public function getLabelTitle($ticketid){
- $filter = $this->where('ticket_id',$ticketid)->where('key','label')->first();
- $output = [];
- if($filter && $filter->value){
- $labelids = explode(',', $filter->value);
- $labels = new Label();
- $label = $labels->whereIn('title',$labelids)->get();
- if($label->count()>0){
- foreach($label as $key=>$l){
- $output[$key] = $l->titleWithColor();
- }
- }
- }
- return $output;
+ protected $fillable = ['ticket_id', 'key', 'value'];
+
+ public function getLabelTitle($ticketid)
+ {
+ $filter = $this->where('ticket_id', $ticketid)->where('key', 'label')->first();
+ $output = [];
+ if ($filter && $filter->value) {
+ $labelids = explode(',', $filter->value);
+ $labels = new Label();
+ $label = $labels->whereIn('title', $labelids)->get();
+ if ($label->count() > 0) {
+ foreach ($label as $key=>$l) {
+ $output[$key] = $l->titleWithColor();
+ }
+ }
+ }
+
+ return $output;
+ }
+
+ public function getTagsByTicketId($ticketid)
+ {
+ $filter = $this->where('key', 'tag')->where('ticket_id', $ticketid)->lists('value')->toArray();
+
+ return $filter;
}
-
- public function getTagsByTicketId($ticketid){
- $filter = $this->where('key','tag')->where('ticket_id',$ticketid)->lists('value')->toArray();
- return $filter;
-
- }
-
}
diff --git a/app/Model/helpdesk/Filters/Label.php b/app/Model/helpdesk/Filters/Label.php
index 0ce9c7250..d817bd430 100644
--- a/app/Model/helpdesk/Filters/Label.php
+++ b/app/Model/helpdesk/Filters/Label.php
@@ -5,33 +5,37 @@ namespace App\Model\helpdesk\Filters;
use Illuminate\Database\Eloquent\Model;
use Lang;
-class Label extends Model {
-
+class Label extends Model
+{
protected $table = 'labels';
protected $fillable = ['title', 'color', 'order', 'status'];
- public function titleWithColor() {
+ public function titleWithColor()
+ {
$title = $this->title;
$color = $this->color;
if ($title && $color) {
- return "" . $title . "";
+ return "".$title.'';
} else {
- return "--";
+ return '--';
}
}
- public function status() {
+ public function status()
+ {
$status = $this->status;
$output = Lang::get('lang.disabled');
if ($status == 1) {
$output = Lang::get('lang.enabled');
}
+
return $output;
}
- public function isChecked($ticketid) {
+ public function isChecked($ticketid)
+ {
$title = $this->attributes['title'];
- $output = "";
+ $output = '';
$filters = new Filter();
$filter = $filters
->where('ticket_id', $ticketid)
@@ -39,24 +43,26 @@ class Label extends Model {
->where('value', $title)
->first();
if ($filter && $filter->value) {
- $output = "checked";
+ $output = 'checked';
}
+
return $output;
}
- public function assignedLabels($ticketid) {
- $output = "";
+ public function assignedLabels($ticketid)
+ {
+ $output = '';
$filters = new Filter();
$filter = $filters->where('ticket_id', $ticketid)->where('key', 'label')->select('value')->get();
if (count($filter) > 0) {
foreach ($filter as $fil) {
- $label = $this->where('title',$fil->value)->select('title','color')->first();
- if($label){
- $output .=" ".$label->titleWithColor()." ";
+ $label = $this->where('title', $fil->value)->select('title', 'color')->first();
+ if ($label) {
+ $output .= ' '.$label->titleWithColor().' ';
}
}
}
+
return $output;
}
-
}
diff --git a/app/Model/helpdesk/Filters/Tag.php b/app/Model/helpdesk/Filters/Tag.php
index 01f98942f..7a390f9e4 100644
--- a/app/Model/helpdesk/Filters/Tag.php
+++ b/app/Model/helpdesk/Filters/Tag.php
@@ -7,7 +7,5 @@ use Illuminate\Database\Eloquent\Model;
class Tag extends Model
{
protected $table = 'tags';
- protected $fillable = ['name','description'];
-
-
+ protected $fillable = ['name', 'description'];
}
diff --git a/app/Model/helpdesk/Form/FieldValue.php b/app/Model/helpdesk/Form/FieldValue.php
index 4d20a7a6a..c3e13a6c8 100644
--- a/app/Model/helpdesk/Form/FieldValue.php
+++ b/app/Model/helpdesk/Form/FieldValue.php
@@ -6,22 +6,17 @@ use Illuminate\Database\Eloquent\Model;
class FieldValue extends Model
{
- protected $table = "field_values";
- protected $fillable = ['field_id','child_id','field_key','field_value'];
-
-
- public function childId(){
- $childid = "";
+ protected $table = 'field_values';
+ protected $fillable = ['field_id', 'child_id', 'field_key', 'field_value'];
+
+ public function childId()
+ {
+ $childid = '';
$child = $this->attributes['child_id'];
- if($child){
+ if ($child) {
$childid = $this->attributes['child_id'];
}
+
return $childid;
}
-
-
-
-
-
-
-}
\ No newline at end of file
+}
diff --git a/app/Model/helpdesk/Form/Fields.php b/app/Model/helpdesk/Form/Fields.php
index 24a15ac94..4b53b3b2f 100644
--- a/app/Model/helpdesk/Form/Fields.php
+++ b/app/Model/helpdesk/Form/Fields.php
@@ -4,8 +4,8 @@ namespace App\Model\helpdesk\Form;
use App\BaseModel;
-class Fields extends BaseModel {
-
+class Fields extends BaseModel
+{
protected $table = 'custom_form_fields';
/**
@@ -15,44 +15,55 @@ class Fields extends BaseModel {
*/
protected $fillable = ['forms_id', 'label', 'name', 'type', 'value', 'required'];
- public function valueRelation() {
+ public function valueRelation()
+ {
$related = "App\Model\helpdesk\Form\FieldValue";
+
return $this->hasMany($related, 'field_id');
}
- public function values() {
+ public function values()
+ {
$value = $this->valueRelation();
+
return $value;
}
-
- public function valuesAsString(){
- $string = "";
+
+ public function valuesAsString()
+ {
+ $string = '';
$values = $this->values()->lists('field_value')->toArray();
- if(count($values)>0){
+ if (count($values) > 0) {
$string = implode(',', $values);
}
+
return $string;
-
}
-
- public function requiredFieldForCheck(){
+
+ public function requiredFieldForCheck()
+ {
$check = false;
$required = $this->attributes['required'];
- if($required==='1'){
- $check = true;
- }
- return $check;
- }
- public function nonRequiredFieldForCheck(){
- $check = false;
- $required = $this->attributes['required'];
- if($required!=='1'){
+ if ($required === '1') {
$check = true;
}
+
return $check;
}
- public function deleteValues() {
+ public function nonRequiredFieldForCheck()
+ {
+ $check = false;
+ $required = $this->attributes['required'];
+ if ($required !== '1') {
+ $check = true;
+ }
+
+ return $check;
+ }
+
+ public function deleteValues()
+ {
$values = $this->values()->get();
if ($values->count() > 0) {
foreach ($values as $value) {
@@ -61,9 +72,9 @@ class Fields extends BaseModel {
}
}
- public function delete() {
+ public function delete()
+ {
$this->deleteValues();
parent::delete();
}
-
}
diff --git a/app/Model/helpdesk/Form/Forms.php b/app/Model/helpdesk/Form/Forms.php
index 3b6db99cd..e8d1cdb86 100644
--- a/app/Model/helpdesk/Form/Forms.php
+++ b/app/Model/helpdesk/Form/Forms.php
@@ -14,50 +14,59 @@ class Forms extends BaseModel
* @var array
*/
protected $fillable = ['formname'];
-
-
- public function fieldRelation(){
+
+ public function fieldRelation()
+ {
$related = "App\Model\helpdesk\Form\Fields";
+
return $this->hasMany($related);
}
-
- public function fields(){
+
+ public function fields()
+ {
$relation = $this->fieldRelation()->get();
- return $relation;
+
+ return $relation;
}
-
- public function fieldsDelete(){
+
+ public function fieldsDelete()
+ {
$fields = $this->fields();
- if($fields->count()>0){
- foreach($fields as $field){
+ if ($fields->count() > 0) {
+ foreach ($fields as $field) {
$field->delete();
}
}
}
-
- public function formValueRelation(){
+
+ public function formValueRelation()
+ {
$related = "App\Model\helpdesk\Form\FieldValue";
- return $this->hasMany($related,'child_id');
+
+ return $this->hasMany($related, 'child_id');
}
-
- public function formValueChild(){
+
+ public function formValueChild()
+ {
$childs = $this->formValueRelation()->get();
+
return $childs;
}
-
- public function deleteFormChild(){
+
+ public function deleteFormChild()
+ {
$childs = $this->formValueChild();
- if($childs->count()>0){
- foreach ($childs as $child){
- $child->child_id = NULL;
+ if ($childs->count() > 0) {
+ foreach ($childs as $child) {
+ $child->child_id = null;
$child->save();
}
}
}
-
- public function delete() {
+
+ public function delete()
+ {
$this->fieldsDelete();
parent::delete();
}
-
}
diff --git a/app/Model/helpdesk/Manage/Help_topic.php b/app/Model/helpdesk/Manage/Help_topic.php
index 423bca150..4ccafd9ce 100644
--- a/app/Model/helpdesk/Manage/Help_topic.php
+++ b/app/Model/helpdesk/Manage/Help_topic.php
@@ -12,10 +12,12 @@ class Help_topic extends BaseModel
'sla_plan', 'thank_page', 'ticket_num_format', 'internal_notes', 'status', 'type', 'auto_assign',
'auto_response',
];
-
- public function department(){
+
+ public function department()
+ {
$related = 'App\Model\helpdesk\Agent\Department';
$foreignKey = 'department';
+
return $this->belongsTo($related, $foreignKey);
}
}
diff --git a/app/Model/helpdesk/Notification/Notification.php b/app/Model/helpdesk/Notification/Notification.php
index fa69b1564..0dd581268 100644
--- a/app/Model/helpdesk/Notification/Notification.php
+++ b/app/Model/helpdesk/Notification/Notification.php
@@ -11,44 +11,53 @@ class Notification extends BaseModel
'model_id', 'userid_created', 'type_id',
];
-
- public function type(){
+
+ public function type()
+ {
$related = 'App\Model\helpdesk\Notification\NotificationType';
$id = 'type_id';
- return $this->belongsTo($related,$id);
+
+ return $this->belongsTo($related, $id);
}
-
- public function model(){
+
+ public function model()
+ {
$related = 'App\Model\helpdesk\Ticket\Tickets';
$id = 'model_id';
- return $this->belongsTo($related,$id);
+
+ return $this->belongsTo($related, $id);
}
-
- public function userNotification(){
+
+ public function userNotification()
+ {
$related = 'App\Model\helpdesk\Notification\UserNotification';
$foreignKey = 'notification_id';
+
return $this->hasMany($related, $foreignKey);
}
-
- public function deleteUserNotification(){
+
+ public function deleteUserNotification()
+ {
$user_notifications = $this->userNotification;
- if(count($user_notifications)>0){
- foreach($user_notifications as $noti){
+ if (count($user_notifications) > 0) {
+ foreach ($user_notifications as $noti) {
$noti->delete();
}
}
}
-
- public function dummyDelete(){
- $user_notifications = UserNotification::get();
- if(count($user_notifications)>0){
- foreach($user_notifications as $noti){
+
+ public function dummyDelete()
+ {
+ $user_notifications = UserNotification::get();
+ if (count($user_notifications) > 0) {
+ foreach ($user_notifications as $noti) {
$noti->delete();
}
}
}
-
- public function delete() {
+
+ public function delete()
+ {
$this->deleteUserNotification();
// $this->dummyDelete();
parent::delete();
diff --git a/app/Model/helpdesk/Notification/UserNotification.php b/app/Model/helpdesk/Notification/UserNotification.php
index 5d0f03658..b6243588b 100644
--- a/app/Model/helpdesk/Notification/UserNotification.php
+++ b/app/Model/helpdesk/Notification/UserNotification.php
@@ -11,19 +11,23 @@ class UserNotification extends BaseModel
'notification_id', 'user_id', 'is_read',
];
-
- public function notification(){
+
+ public function notification()
+ {
$related = 'App\Model\helpdesk\Notification\Notification';
$id = 'notification_id';
- return $this->belongsTo($related,$id);
+
+ return $this->belongsTo($related, $id);
}
-
- public function users(){
+
+ public function users()
+ {
$related = 'App\User';
$id = 'user_id';
- return $this->belongsTo($related,$id);
+
+ return $this->belongsTo($related, $id);
}
-
+
// public function delete() {
// //$this->notification()->delete();
// parent::delete();
diff --git a/app/Model/helpdesk/Settings/CommonSettings.php b/app/Model/helpdesk/Settings/CommonSettings.php
index 8f84ed17b..eb3d6dd8a 100644
--- a/app/Model/helpdesk/Settings/CommonSettings.php
+++ b/app/Model/helpdesk/Settings/CommonSettings.php
@@ -10,23 +10,28 @@ class CommonSettings extends BaseModel
protected $fillable = [
'status', 'option_name', 'option_value', 'optional_field', 'created_at', 'updated_at',
];
-
- public function getStatus($option_name){
- $status ="";
- $schema = $this->where('option_name',$option_name)->first();
- if($schema){
+
+ public function getStatus($option_name)
+ {
+ $status = '';
+ $schema = $this->where('option_name', $option_name)->first();
+ if ($schema) {
$status = $schema->status;
}
- return $status;
+
+ return $status;
}
-
- public function getOptionValue($option,$field=''){
- $schema = $this->where('option_name',$option);
- if($field!=""){
- $schema = $schema->where('optional_field',$field);
- return $schema->first();
- }
- $value = $schema->get();
- return $value;
+
+ public function getOptionValue($option, $field = '')
+ {
+ $schema = $this->where('option_name', $option);
+ if ($field != '') {
+ $schema = $schema->where('optional_field', $field);
+
+ return $schema->first();
+ }
+ $value = $schema->get();
+
+ return $value;
}
}
diff --git a/app/Model/helpdesk/Settings/Followup.php b/app/Model/helpdesk/Settings/Followup.php
index a0b625476..ecb7fdcc1 100644
--- a/app/Model/helpdesk/Settings/Followup.php
+++ b/app/Model/helpdesk/Settings/Followup.php
@@ -14,4 +14,4 @@ class Followup extends BaseModel
'id', 'name', 'status', 'condition', 'created_at', 'updated_at',
];
-}
\ No newline at end of file
+}
diff --git a/app/Model/helpdesk/Settings/SocialMedia.php b/app/Model/helpdesk/Settings/SocialMedia.php
index 329f9c429..e33e7fc37 100644
--- a/app/Model/helpdesk/Settings/SocialMedia.php
+++ b/app/Model/helpdesk/Settings/SocialMedia.php
@@ -4,54 +4,58 @@ namespace App\Model\helpdesk\Settings;
use Illuminate\Database\Eloquent\Model;
-class SocialMedia extends Model {
-
- protected $table = "social_media";
+class SocialMedia extends Model
+{
+ protected $table = 'social_media';
protected $fillable = [
'provider',
'key',
'value',
];
- public function getvalueByKey($provider, $key="",$login=true) {
-
- $social = "";
- if ($key == 'redirect'&& $login==true) {
- $social = url('social/login/' . $provider);
+ public function getvalueByKey($provider, $key = '', $login = true)
+ {
+ $social = '';
+ if ($key == 'redirect' && $login == true) {
+ $social = url('social/login/'.$provider);
}
- if($key!=="" && $key !== 'redirect'){
+ if ($key !== '' && $key !== 'redirect') {
$social = $this->where('provider', $provider)->where('key', $key)->first();
- }elseif($key !== 'redirect'){
- $social = $this->where('provider', $provider)->lists('value','key')->toArray();
+ } elseif ($key !== 'redirect') {
+ $social = $this->where('provider', $provider)->lists('value', 'key')->toArray();
}
if (is_object($social)) {
$social = $social->value;
}
-
+
return $social;
}
- public function checkActive($provider) {
- $check = "";
+ public function checkActive($provider)
+ {
+ $check = '';
$social = $this->where('provider', $provider)->where('key', 'status')->first();
if ($social) {
$value = $social->value;
if ($value === '1') {
$check = true;
- }
+ }
}
+
return $check;
}
- public function checkInactive($provider) {
- $check = "";
+
+ public function checkInactive($provider)
+ {
+ $check = '';
$social = $this->where('provider', $provider)->where('key', 'status')->first();
if ($social) {
$value = $social->value;
if ($value === '0') {
$check = true;
- }
+ }
}
+
return $check;
}
-
}
diff --git a/app/Model/helpdesk/Ticket/Ticket_Form_Data.php b/app/Model/helpdesk/Ticket/Ticket_Form_Data.php
index 5726c21f8..148bf5849 100644
--- a/app/Model/helpdesk/Ticket/Ticket_Form_Data.php
+++ b/app/Model/helpdesk/Ticket/Ticket_Form_Data.php
@@ -4,39 +4,43 @@ namespace App\Model\helpdesk\Ticket;
use App\BaseModel;
-class Ticket_Form_Data extends BaseModel {
-
+class Ticket_Form_Data extends BaseModel
+{
protected $table = 'ticket_form_data';
protected $fillable = ['id', 'ticket_id', 'title', 'content', 'created_at', 'updated_at'];
- public function getFieldKeyLabel() {
+ public function getFieldKeyLabel()
+ {
$value = $this->attributes['title'];
$fields = new \App\Model\helpdesk\Form\Fields();
$field = $fields->where('name', $value)->first();
if ($field) {
$value = $field->label;
}
+
return $value;
}
-
- public function isHidden(){
+
+ public function isHidden()
+ {
$check = false;
$value = $this->attributes['title'];
$fields = new \App\Model\helpdesk\Form\Fields();
$field = $fields->where('name', $value)->first();
- if ($field && $field->type=='hidden') {
+ if ($field && $field->type == 'hidden') {
$check = true;
}
+
return $check;
}
-
- public function getHidden(){
+
+ public function getHidden()
+ {
$value = $this->attributes['title'];
$fields = new \App\Model\helpdesk\Form\Fields();
$field = $fields->where('name', $value)->first();
- if ($field && $field->type=='hidden') {
+ if ($field && $field->type == 'hidden') {
return $field->label;
}
}
-
}
diff --git a/app/Model/helpdesk/Ticket/Ticket_Priority.php b/app/Model/helpdesk/Ticket/Ticket_Priority.php
index aed4eb795..f671a55ba 100644
--- a/app/Model/helpdesk/Ticket/Ticket_Priority.php
+++ b/app/Model/helpdesk/Ticket/Ticket_Priority.php
@@ -6,10 +6,10 @@ use App\BaseModel;
class Ticket_Priority extends BaseModel
{
- protected $primaryKey = 'priority_id';
+ protected $primaryKey = 'priority_id';
public $timestamps = false;
protected $table = 'ticket_priority';
protected $fillable = [
- 'priority_id', 'priority', 'status','user_priority_status','priority_desc', 'priority_color', 'priority_urgency', 'ispublic','created_at', 'updated_at',
+ 'priority_id', 'priority', 'status', 'user_priority_status', 'priority_desc', 'priority_color', 'priority_urgency', 'ispublic', 'created_at', 'updated_at',
];
}
diff --git a/app/Model/helpdesk/Ticket/Ticket_Thread.php b/app/Model/helpdesk/Ticket/Ticket_Thread.php
index 184016e7b..54f06828c 100644
--- a/app/Model/helpdesk/Ticket/Ticket_Thread.php
+++ b/app/Model/helpdesk/Ticket/Ticket_Thread.php
@@ -3,21 +3,23 @@
namespace App\Model\helpdesk\Ticket;
//use App\BaseModel;
-use Illuminate\Database\Eloquent\Model;
use File;
+use Illuminate\Database\Eloquent\Model;
-class Ticket_Thread extends Model {
-
+class Ticket_Thread extends Model
+{
protected $table = 'ticket_thread';
protected $fillable = [
'id', 'ticket_id', 'staff_id', 'user_id', 'thread_type', 'poster', 'source', 'is_internal', 'title', 'body', 'format', 'ip_address', 'created_at', 'updated_at',
];
- public function attach() {
+ public function attach()
+ {
return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_attachments', 'thread_id');
}
- public function delete() {
+ public function delete()
+ {
$this->attach()->delete();
parent::delete();
}
@@ -26,20 +28,23 @@ class Ticket_Thread extends Model {
// $this->attributes['title'] = str_replace('"', "'", $value);
// }
- public function getTitleAttribute($value) {
+ public function getTitleAttribute($value)
+ {
return str_replace('"', "'", $value);
}
- public function thread($content) {
-// $porufi = $this->purify($content);
+ public function thread($content)
+ {
+ // $porufi = $this->purify($content);
// dd($content,$porufi);
//return $content;
return $this->purify($content);
}
- public function purifyOld($value) {
- require_once base_path('vendor' . DIRECTORY_SEPARATOR . 'htmlpurifier' . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'HTMLPurifier.auto.php');
- $path = base_path('vendor' . DIRECTORY_SEPARATOR . 'htmlpurifier' . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'HTMLPurifier' . DIRECTORY_SEPARATOR . 'DefinitionCache' . DIRECTORY_SEPARATOR . 'Serializer');
+ public function purifyOld($value)
+ {
+ require_once base_path('vendor'.DIRECTORY_SEPARATOR.'htmlpurifier'.DIRECTORY_SEPARATOR.'library'.DIRECTORY_SEPARATOR.'HTMLPurifier.auto.php');
+ $path = base_path('vendor'.DIRECTORY_SEPARATOR.'htmlpurifier'.DIRECTORY_SEPARATOR.'library'.DIRECTORY_SEPARATOR.'HTMLPurifier'.DIRECTORY_SEPARATOR.'DefinitionCache'.DIRECTORY_SEPARATOR.'Serializer');
if (!File::exists($path)) {
File::makeDirectory($path, $mode = 0777, true, true);
}
@@ -51,27 +56,32 @@ class Ticket_Thread extends Model {
if ($value != strip_tags($value)) {
$value = $purifier->purify($value);
}
+
return $value;
}
- public function purify() {
+ public function purify()
+ {
$value = $this->attributes['body'];
$str = str_replace("'", '"', $value);
$html = preg_replace('#(.*?)#is', '', $str);
$string = trim(preg_replace('/\s+/', ' ', $html));
$content = $this->inlineAttachment($string);
+
return $content;
}
- public function setTitleAttribute($value) {
- if ($value == "") {
+ public function setTitleAttribute($value)
+ {
+ if ($value == '') {
$this->attributes['title'] = 'No available';
} else {
$this->attributes['title'] = $value;
}
}
- public function removeScript($html) {
+ public function removeScript($html)
+ {
$doc = new \DOMDocument();
// load the HTML string we want to strip
@@ -89,50 +99,58 @@ class Ticket_Thread extends Model {
// get the HTML string back
$no_script_html_string = $doc->saveHTML();
+
return $no_script_html_string;
}
- public function firstContent() {
+ public function firstContent()
+ {
$poster = $this->attributes['poster'];
if ($poster == 'client') {
return 'yes';
}
+
return 'no';
}
- public function inlineAttachment($body) {
+ public function inlineAttachment($body)
+ {
$attachments = $this->attach;
- if ($attachments->count() > 0) {
+ if ($attachments->count() > 0) {
foreach ($attachments as $key => $attach) {
- if($attach->poster=="INLINE" || $attach->poster=="inline"){
+ if ($attach->poster == 'INLINE' || $attach->poster == 'inline') {
$search = $attach->name;
- $replace = "data:$attach->type;base64," . $attach->file;
+ $replace = "data:$attach->type;base64,".$attach->file;
$b = str_replace($search, $replace, $body);
$body = $b;
}
}
-
}
+
return $body;
}
- public function getSubject(){
+
+ public function getSubject()
+ {
$subject = $this->attributes['title'];
$array = imap_mime_header_decode($subject);
- $title = "";
- if(is_array($array) && count($array)>0){
- foreach($array as $text){
+ $title = '';
+ if (is_array($array) && count($array) > 0) {
+ foreach ($array as $text) {
$title .= $text->text;
}
+
return wordwrap($title, 70, "
\n"); } + return wordwrap($subject, 70, "
\n"); } - - - public function user(){ + + public function user() + { $related = 'App\User'; $foreignKey = 'user_id'; + return $this->belongsTo($related, $foreignKey); } - } diff --git a/app/Model/helpdesk/Ticket/Ticket_ThreadOld.php b/app/Model/helpdesk/Ticket/Ticket_ThreadOld.php index 54d74f2b3..34df1bd7d 100644 --- a/app/Model/helpdesk/Ticket/Ticket_ThreadOld.php +++ b/app/Model/helpdesk/Ticket/Ticket_ThreadOld.php @@ -3,21 +3,23 @@ namespace App\Model\helpdesk\Ticket; //use App\BaseModel; -use Illuminate\Database\Eloquent\Model; use File; +use Illuminate\Database\Eloquent\Model; -class Ticket_Thread extends Model { - +class Ticket_ThreadOld extends Model +{ protected $table = 'ticket_thread'; protected $fillable = [ 'id', 'ticket_id', 'staff_id', 'user_id', 'thread_type', 'poster', 'source', 'is_internal', 'title', 'body', 'format', 'ip_address', 'created_at', 'updated_at', ]; - public function attach() { + public function attach() + { return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_attachments', 'thread_id'); } - public function delete() { + public function delete() + { $this->attach()->delete(); parent::delete(); } @@ -26,20 +28,23 @@ class Ticket_Thread extends Model { // $this->attributes['title'] = str_replace('"', "'", $value); // } - public function getTitleAttribute($value) { + public function getTitleAttribute($value) + { return str_replace('"', "'", $value); } - public function thread($content) { -// $porufi = $this->purify($content); + public function thread($content) + { + // $porufi = $this->purify($content); // dd($content,$porufi); //return $content; return $this->purify($content); } - public function purifyOld($value) { - require_once base_path('vendor' . DIRECTORY_SEPARATOR . 'htmlpurifier' . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'HTMLPurifier.auto.php'); - $path = base_path('vendor' . DIRECTORY_SEPARATOR . 'htmlpurifier' . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'HTMLPurifier' . DIRECTORY_SEPARATOR . 'DefinitionCache' . DIRECTORY_SEPARATOR . 'Serializer'); + public function purifyOld($value) + { + require_once base_path('vendor'.DIRECTORY_SEPARATOR.'htmlpurifier'.DIRECTORY_SEPARATOR.'library'.DIRECTORY_SEPARATOR.'HTMLPurifier.auto.php'); + $path = base_path('vendor'.DIRECTORY_SEPARATOR.'htmlpurifier'.DIRECTORY_SEPARATOR.'library'.DIRECTORY_SEPARATOR.'HTMLPurifier'.DIRECTORY_SEPARATOR.'DefinitionCache'.DIRECTORY_SEPARATOR.'Serializer'); if (!File::exists($path)) { File::makeDirectory($path, $mode = 0777, true, true); } @@ -51,27 +56,32 @@ class Ticket_Thread extends Model { if ($value != strip_tags($value)) { $value = $purifier->purify($value); } + return $value; } - public function purify() { + public function purify() + { $value = $this->attributes['body']; $str = str_replace("'", '"', $value); $html = preg_replace('#(.*?)#is', '', $str);
$string = trim(preg_replace('/\s+/', ' ', $html));
$content = $this->inlineAttachment($string);
+
return $content;
}
- public function setTitleAttribute($value) {
- if ($value == "") {
+ public function setTitleAttribute($value)
+ {
+ if ($value == '') {
$this->attributes['title'] = 'No available';
} else {
$this->attributes['title'] = $value;
}
}
- public function removeScript($html) {
+ public function removeScript($html)
+ {
$doc = new \DOMDocument();
// load the HTML string we want to strip
@@ -89,43 +99,53 @@ class Ticket_Thread extends Model {
// get the HTML string back
$no_script_html_string = $doc->saveHTML();
+
return $no_script_html_string;
}
- public function firstContent() {
+ public function firstContent()
+ {
$poster = $this->attributes['poster'];
if ($poster == 'client') {
return 'yes';
}
+
return 'no';
}
- public function inlineAttachment($body) {
+ public function inlineAttachment($body)
+ {
if ($this->attach()->where('poster', 'INLINE')->get()->count() > 0) {
$search = $this->attach()->where('poster', 'INLINE')->lists('name')->toArray();
foreach ($this->attach()->where('poster', 'INLINE')->get() as $key => $attach) {
- $replace[$key] = "data:$attach->type;base64," . $attach->file;
+ $replace[$key] = "data:$attach->type;base64,".$attach->file;
}
$body = str_replace($search, $replace, $body);
}
+
return $body;
}
- public function getSubject(){
+
+ public function getSubject()
+ {
$subject = $this->attributes['title'];
$array = imap_mime_header_decode($subject);
- $title = "";
- if(is_array($array) && count($array)>0){
- foreach($array as $text){
+ $title = '';
+ if (is_array($array) && count($array) > 0) {
+ foreach ($array as $text) {
$title .= $text->text;
}
+
return wordwrap($title, 70, "
\n"); } + return wordwrap($subject, 70, "
\n"); } - - public function labels($ticketid){ - $label = new \App\Model\helpdesk\Filters\Label(); + + public function labels($ticketid) + { + $label = new \App\Model\helpdesk\Filters\Label(); + return $label->assignedLabels($ticketid); } - } diff --git a/app/Model/helpdesk/Ticket/Ticket_attachments.php b/app/Model/helpdesk/Ticket/Ticket_attachments.php index d1ccccb55..23d0c01f0 100644 --- a/app/Model/helpdesk/Ticket/Ticket_attachments.php +++ b/app/Model/helpdesk/Ticket/Ticket_attachments.php @@ -4,14 +4,15 @@ namespace App\Model\helpdesk\Ticket; use Illuminate\Database\Eloquent\Model; -class Ticket_attachments extends Model { - +class Ticket_attachments extends Model +{ protected $table = 'ticket_attachment'; protected $fillable = [ 'id', 'thread_id', 'name', 'size', 'type', 'file', 'data', 'poster', 'updated_at', 'created_at', ]; - public function setFileAttribute($value) { + public function setFileAttribute($value) + { if ($value) { $this->attributes['file'] = base64_encode($value); } else { @@ -19,42 +20,43 @@ class Ticket_attachments extends Model { } } - public function getFileAttribute($value) { + public function getFileAttribute($value) + { $drive = $this->driver; $name = $this->name; $root = $this->path; - if (($drive=="database" || !$drive) && $value && base64_decode($value, true) === false) { - + if (($drive == 'database' || !$drive) && $value && base64_decode($value, true) === false) { $value = base64_encode($value); } - if($drive && $drive!=="database"){ - + if ($drive && $drive !== 'database') { $storage = new \App\FaveoStorage\Controllers\StorageController(); $content = $storage->getFile($drive, $name); $value = base64_encode($content); } + return $value; } - public function getFile() { + public function getFile() + { $size = $this->size; $drive = $this->driver; $name = $this->name; $root = $this->path; - $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'); + $units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; $power = $size > 0 ? floor(log($size, 1024)) : 0; - $value = number_format($size / pow(1024, $power), 2, '.', ',') . ' ' . $units[$power]; + $value = number_format($size / pow(1024, $power), 2, '.', ',').' '.$units[$power]; if ($this->poster == 'ATTACHMENT') { - if (mime($this->type) == "image") { + if (mime($this->type) == 'image') { + $var = '
';
- $var = '
';
- return ' . ')
';
- $var = '';
- return '', 'set_id' => '1']);
Template::create(['id' => '10', 'variable' => '0', 'name' => 'This template is for sending notice to agent when ticket reply is made by client on a ticket', 'type' => '10', 'message' => '
Your password is successfully changed.Your new password is : {!!$user_password!!}
Thank You.
Kind Regards,
{!!$system_from!!}', 'set_id' => '1']); - + Template::create(['id' => '12', 'variable' => '1', 'name' => 'This template is for sending notice to team when ticket is assigned to team', 'type' => '12', 'message' => '
Your password is successfully changed.Your new password is : {!!$user_password!!}
Thank You.
Kind Regards,
{!!$system_from!!}', 'set_id' => '1']); /* * All the common settings will be listed here @@ -2032,7 +2025,6 @@ class DatabaseSeeder extends Seeder Rating::create(['id' => '1', 'name' => 'OverAll Satisfaction', 'display_order' => '1', 'allow_modification' => '1', 'rating_scale' => '5', 'rating_area' => 'Helpdesk Area']); Rating::create(['id' => '2', 'name' => 'Reply Rating', 'display_order' => '1', 'allow_modification' => '1', 'rating_scale' => '5', 'rating_area' => 'Comment Area']); - Limit_Login::create(['id' => '1']); } } diff --git a/public/ckeditor/samples/old/assets/posteddata.php b/public/ckeditor/samples/old/assets/posteddata.php index 7006ce62f..2baa84ed6 100644 --- a/public/ckeditor/samples/old/assets/posteddata.php +++ b/public/ckeditor/samples/old/assets/posteddata.php @@ -35,13 +35,10 @@ if (!empty($_POST)) { $value = htmlspecialchars(stripslashes((string) $value)); } else { $value = htmlspecialchars((string) $value); - } - ?> + } ?>
-
'Plugin',
/***************************************************
- *updates
+ *updates
*translation required from here
*****************************************************/
'edit_profile' => 'Edit profile',
@@ -1063,7 +1063,7 @@ return [
'user_priority_status' => 'User priority status',
'current' => 'Current:',
'active_user_can_select_the_priority_while_creating_ticket' => 'Active user can select the priority while creating ticket',
-
+
/* --------------------------------------------------------------------------------------------
* Approval Updated
* --------------------------------------------------------------------------------------------
@@ -1126,7 +1126,7 @@ return [
/*** updates 28-11-2016***/
'apply' => 'Apply',
- /** updates 2-12-2016 **/
+ /* updates 2-12-2016 **/
'sort-by' => 'Sort by',
'created-at' => 'Created at',
'or' => 'OR',
diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php
index 5676d8524..84cb89d7c 100644
--- a/resources/lang/en/lang.php
+++ b/resources/lang/en/lang.php
@@ -41,31 +41,31 @@ return [
| Login Page
|--------------------------------------
*/
- 'login_to_start_your_session' => 'Login to start your session',
- 'login' => 'Login',
- 'remember' => 'Remember me',
- 'signmein' => 'Sign me in',
- 'iforgot' => 'I forgot my password',
- 'email_address' => 'Email address',
- 'password' => 'Password',
+ 'login_to_start_your_session' => 'Login to start your session',
+ 'login' => 'Login',
+ 'remember' => 'Remember me',
+ 'signmein' => 'Sign me in',
+ 'iforgot' => 'I forgot my password',
+ 'email_address' => 'Email address',
+ 'password' => 'Password',
'password_confirmation' => 'Password confirmation',
- 'woops' => 'Whoops!',
- 'theirisproblem' => 'There were some problems with your input.',
- 'login' => 'Login',
- 'e-mail' => 'Email',
- 'reg_new_member' => 'Register a new membership',
- 'this_account_is_currently_inactive' => 'This account is currently inactive!',
- 'not-registered' => 'Email/username is not registered',
- 'verify' => 'Verify',
- 'enter-otp' => 'Enter OTP',
- 'did-not-recive-code' => 'Didn\'t recieve code?',
- 'resend_otp' => 'Resend OTP',
- 'verify-screen-msg' => 'Your account is currently inactive.
To activate your account, please enter the OTP we\'ve sent on', - 'otp-sent' => 'We\'ve sent an OTP code on your number.', - 'verify-number' => 'Verify number', - 'get-verify-message' => 'Enter the OTP code we\'ve sent to your new number.', - 'number-verification-sussessfull' => 'Your number has been verified successfully, please wait we are updating your profile.', - 'enter_your_email_here' => 'Enter Your Email Here', + 'woops' => 'Whoops!', + 'theirisproblem' => 'There were some problems with your input.', + 'login' => 'Login', + 'e-mail' => 'Email', + 'reg_new_member' => 'Register a new membership', + 'this_account_is_currently_inactive' => 'This account is currently inactive!', + 'not-registered' => 'Email/username is not registered', + 'verify' => 'Verify', + 'enter-otp' => 'Enter OTP', + 'did-not-recive-code' => 'Didn\'t recieve code?', + 'resend_otp' => 'Resend OTP', + 'verify-screen-msg' => 'Your account is currently inactive.
To activate your account, please enter the OTP we\'ve sent on', + 'otp-sent' => 'We\'ve sent an OTP code on your number.', + 'verify-number' => 'Verify number', + 'get-verify-message' => 'Enter the OTP code we\'ve sent to your new number.', + 'number-verification-sussessfull' => 'Your number has been verified successfully, please wait we are updating your profile.', + 'enter_your_email_here' => 'Enter Your Email Here', /* |-------------------------------------- | Register Page @@ -466,7 +466,6 @@ return [ */ 'social-login' => 'Social login', - /* |------------------------------------------------ | Language page @@ -961,8 +960,6 @@ return [ 'reply_content_is_a_required_field' => 'Reply content is a required field', 'internal_content_is_a_required_field' => 'Internal content is a required field', - - /* |----------------------------------------------- | Profile @@ -1261,7 +1258,6 @@ return [ 'manage_status' => 'Manage status', 'notifications' => 'Notifications', - 'auto_close_workflow' => 'Auto-close workflow', 'close_ticket_workflow_settings' => 'Close ticket workflow settings', 'successfully_saved_your_settings' => 'Successfully saved your settings', @@ -1504,7 +1500,7 @@ return [ 'user_priority_status' => 'User priority status', 'current' => 'Current:', 'active_user_can_select_the_priority_while_creating_ticket' => 'Active user can select the priority while creating ticket', - + /* -------------------------------------------------------------------------------------------- * Approval Updated * -------------------------------------------------------------------------------------------- @@ -1567,7 +1563,7 @@ return [ /*** updates 28-11-2016***/ 'apply' => 'Apply', - /** updates 2-12-2016 **/ + /* updates 2-12-2016 **/ 'sort-by' => 'Sort by', 'created-at' => 'Created at', 'or' => 'OR', diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index de6da4b4e..d559da919 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -72,7 +72,6 @@ return [ 'we_have_e-mailed_your_password_reset_link' => 'We have emailed your password reset link!', "we_can't_find_a_user_with_that_e-mail_address" => "We can't find a user with that email address.", - /* |-------------------------------------- | Reset Password Page @@ -849,7 +848,6 @@ return [ 'group_deleted_successfully' => 'Groupe supprimé avec succès', 'failed_to_load_the_page' => 'Echec du chargement de la page', - /* |-------------------------------------- | SMTP Page @@ -924,8 +922,6 @@ return [ 'reply_content_is_a_required_field' => 'Le contenu de la réponse est un champ obligatoire', 'internal_content_is_a_required_field' => 'Le contenu interne est un champ obligatoire', - - /* |----------------------------------------------- | Profile @@ -1224,7 +1220,6 @@ return [ 'manage_status' => 'Gérer statut', 'notifications' => 'Notifications', - 'auto_close_workflow' => 'Workflow d\'auto fermeture', 'close_ticket_workflow_settings' => 'Fermer les paramètres de Workflow de ticket', 'successfully_saved_your_settings' => 'Paramètres enregistrés avec succès', @@ -1476,7 +1471,7 @@ return [ 'user_priority_status' => 'User priority status', 'current' => 'Current:', 'active_user_can_select_the_priority_while_creating_ticket' => 'Active user can select the priority while creating ticket', - + /* -------------------------------------------------------------------------------------------- * Approval Updated * -------------------------------------------------------------------------------------------- @@ -1539,7 +1534,7 @@ return [ /*** updates 28-11-2016***/ 'apply' => 'Apply', - /** updates 2-12-2016 **/ + /* updates 2-12-2016 **/ 'sort-by' => 'Sort by', 'created-at' => 'Created at', 'or' => 'OR', @@ -1558,5 +1553,4 @@ return [ 'restore-user' => 'Restore user account', 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', - ]; diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index a955b820c..1eac60dcb 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -1023,7 +1023,7 @@ return [ 'user_priority_status' => 'User priority status', 'current' => 'Current:', 'active_user_can_select_the_priority_while_creating_ticket' => 'Active user can select the priority while creating ticket', - + /* -------------------------------------------------------------------------------------------- * Approval Updated * -------------------------------------------------------------------------------------------- @@ -1086,7 +1086,7 @@ return [ /*** updates 28-11-2016***/ 'apply' => 'Apply', - /** updates 2-12-2016 **/ + /* updates 2-12-2016 **/ 'sort-by' => 'Sort by', 'created-at' => 'Created at', 'or' => 'OR', diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index da083a85b..852f5973e 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -1571,7 +1571,7 @@ return [ /************************************New updates*************************************/ /* Translation Required */ /************************************************************************************/ - 'deleted_user' => 'Deleted User', + 'deleted_user' => 'Deleted User', 'deleted_user_directory' => 'Deleted User Directory', 'restore' => 'Restore', 'user_restore_successfully' => 'User restore successfully', @@ -1579,7 +1579,7 @@ return [ /*** updates 28-11-2016***/ 'apply' => 'Apply', - /** updates 2-12-2016 **/ + /* updates 2-12-2016 **/ 'sort-by' => 'Sort by', 'created-at' => 'Created at', 'or' => 'OR', diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index 7e7cc9427..1e32a29ac 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -1461,7 +1461,7 @@ return [ 'user_priority_status' => 'User priority status', 'current' => 'Current:', 'active_user_can_select_the_priority_while_creating_ticket' => 'Active user can select the priority while creating ticket', - + /* -------------------------------------------------------------------------------------------- * Approval Updated * -------------------------------------------------------------------------------------------- @@ -1524,7 +1524,7 @@ return [ /*** updates 28-11-2016***/ 'apply' => 'Apply', - /** updates 2-12-2016 **/ + /* updates 2-12-2016 **/ 'sort-by' => 'Sort by', 'created-at' => 'Created at', 'or' => 'OR', diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php index dabf389ed..8bded83eb 100644 --- a/resources/lang/ru/lang.php +++ b/resources/lang/ru/lang.php @@ -970,7 +970,7 @@ return [ 'user_priority_status' => 'User priority status', 'current' => 'Current:', 'active_user_can_select_the_priority_while_creating_ticket' => 'Active user can select the priority while creating ticket', - + /* -------------------------------------------------------------------------------------------- * Approval Updated * -------------------------------------------------------------------------------------------- @@ -1033,7 +1033,7 @@ return [ /*** updates 28-11-2016***/ 'apply' => 'Apply', - /** updates 2-12-2016 **/ + /* updates 2-12-2016 **/ 'sort-by' => 'Sort by', 'created-at' => 'Created at', 'or' => 'OR',
\n"); } + return wordwrap($subject, 70, "
\n"); } - - - public function user(){ + + public function user() + { $related = 'App\User'; $foreignKey = 'user_id'; + return $this->belongsTo($related, $foreignKey); } - } diff --git a/app/Model/helpdesk/Ticket/Ticket_ThreadOld.php b/app/Model/helpdesk/Ticket/Ticket_ThreadOld.php index 54d74f2b3..34df1bd7d 100644 --- a/app/Model/helpdesk/Ticket/Ticket_ThreadOld.php +++ b/app/Model/helpdesk/Ticket/Ticket_ThreadOld.php @@ -3,21 +3,23 @@ namespace App\Model\helpdesk\Ticket; //use App\BaseModel; -use Illuminate\Database\Eloquent\Model; use File; +use Illuminate\Database\Eloquent\Model; -class Ticket_Thread extends Model { - +class Ticket_ThreadOld extends Model +{ protected $table = 'ticket_thread'; protected $fillable = [ 'id', 'ticket_id', 'staff_id', 'user_id', 'thread_type', 'poster', 'source', 'is_internal', 'title', 'body', 'format', 'ip_address', 'created_at', 'updated_at', ]; - public function attach() { + public function attach() + { return $this->hasMany('App\Model\helpdesk\Ticket\Ticket_attachments', 'thread_id'); } - public function delete() { + public function delete() + { $this->attach()->delete(); parent::delete(); } @@ -26,20 +28,23 @@ class Ticket_Thread extends Model { // $this->attributes['title'] = str_replace('"', "'", $value); // } - public function getTitleAttribute($value) { + public function getTitleAttribute($value) + { return str_replace('"', "'", $value); } - public function thread($content) { -// $porufi = $this->purify($content); + public function thread($content) + { + // $porufi = $this->purify($content); // dd($content,$porufi); //return $content; return $this->purify($content); } - public function purifyOld($value) { - require_once base_path('vendor' . DIRECTORY_SEPARATOR . 'htmlpurifier' . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'HTMLPurifier.auto.php'); - $path = base_path('vendor' . DIRECTORY_SEPARATOR . 'htmlpurifier' . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'HTMLPurifier' . DIRECTORY_SEPARATOR . 'DefinitionCache' . DIRECTORY_SEPARATOR . 'Serializer'); + public function purifyOld($value) + { + require_once base_path('vendor'.DIRECTORY_SEPARATOR.'htmlpurifier'.DIRECTORY_SEPARATOR.'library'.DIRECTORY_SEPARATOR.'HTMLPurifier.auto.php'); + $path = base_path('vendor'.DIRECTORY_SEPARATOR.'htmlpurifier'.DIRECTORY_SEPARATOR.'library'.DIRECTORY_SEPARATOR.'HTMLPurifier'.DIRECTORY_SEPARATOR.'DefinitionCache'.DIRECTORY_SEPARATOR.'Serializer'); if (!File::exists($path)) { File::makeDirectory($path, $mode = 0777, true, true); } @@ -51,27 +56,32 @@ class Ticket_Thread extends Model { if ($value != strip_tags($value)) { $value = $purifier->purify($value); } + return $value; } - public function purify() { + public function purify() + { $value = $this->attributes['body']; $str = str_replace("'", '"', $value); $html = preg_replace('#
\n"); } + return wordwrap($subject, 70, "
\n"); } - - public function labels($ticketid){ - $label = new \App\Model\helpdesk\Filters\Label(); + + public function labels($ticketid) + { + $label = new \App\Model\helpdesk\Filters\Label(); + return $label->assignedLabels($ticketid); } - } diff --git a/app/Model/helpdesk/Ticket/Ticket_attachments.php b/app/Model/helpdesk/Ticket/Ticket_attachments.php index d1ccccb55..23d0c01f0 100644 --- a/app/Model/helpdesk/Ticket/Ticket_attachments.php +++ b/app/Model/helpdesk/Ticket/Ticket_attachments.php @@ -4,14 +4,15 @@ namespace App\Model\helpdesk\Ticket; use Illuminate\Database\Eloquent\Model; -class Ticket_attachments extends Model { - +class Ticket_attachments extends Model +{ protected $table = 'ticket_attachment'; protected $fillable = [ 'id', 'thread_id', 'name', 'size', 'type', 'file', 'data', 'poster', 'updated_at', 'created_at', ]; - public function setFileAttribute($value) { + public function setFileAttribute($value) + { if ($value) { $this->attributes['file'] = base64_encode($value); } else { @@ -19,42 +20,43 @@ class Ticket_attachments extends Model { } } - public function getFileAttribute($value) { + public function getFileAttribute($value) + { $drive = $this->driver; $name = $this->name; $root = $this->path; - if (($drive=="database" || !$drive) && $value && base64_decode($value, true) === false) { - + if (($drive == 'database' || !$drive) && $value && base64_decode($value, true) === false) { $value = base64_encode($value); } - if($drive && $drive!=="database"){ - + if ($drive && $drive !== 'database') { $storage = new \App\FaveoStorage\Controllers\StorageController(); $content = $storage->getFile($drive, $name); $value = base64_encode($content); } + return $value; } - public function getFile() { + public function getFile() + { $size = $this->size; $drive = $this->driver; $name = $this->name; $root = $this->path; - $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'); + $units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']; $power = $size > 0 ? floor(log($size, 1024)) : 0; - $value = number_format($size / pow(1024, $power), 2, '.', ',') . ' ' . $units[$power]; + $value = number_format($size / pow(1024, $power), 2, '.', ',').' '.$units[$power]; if ($this->poster == 'ATTACHMENT') { - if (mime($this->type) == "image") { + if (mime($this->type) == 'image') { + $var = '
';
- $var = '';
- return 'Hello {!!$ticket_agent_name!!},
Ticket No: {!!$ticket_number!!}
Has been assigned to you by {!!$ticket_assigner!!}
Please check and resppond on the ticket.
Link: {!!$ticket_link!!}
Thank You
Kind Regards,
{!!$system_from!!}
', 'set_id' => '1']);
Template::create(['id' => '2', 'variable' => '1', 'name' => 'This template is for sending notice to client with ticket link to check ticket without logging in to system', 'type' => '2', 'subject' => 'Check your Ticket', 'message' => 'Ticket No: {!!$ticket_number!!}
Has been assigned to you by {!!$ticket_assigner!!}
Please check and resppond on the ticket.
Link: {!!$ticket_link!!}
Thank You
Kind Regards,
{!!$system_from!!}
Hello {!!$user!!},
Click the link below to view your requested ticket
{!!$ticket_link_with_number!!}
Kind Regards,
{!!$system_from!!}
', 'set_id' => '1']);
Template::create(['id' => '3', 'variable' => '0', 'name' => 'This template is for sending notice to client when ticket status is changed to close', 'type' => '3', 'message' => 'Click the link below to view your requested ticket
{!!$ticket_link_with_number!!}
Kind Regards,
{!!$system_from!!}
Hello,
This message is regarding your ticket ID {!!$ticket_number!!}. We are changing the status of this ticket to "Closed" as the issue appears to be resolved.
Thank you
Kind regards,
{!!$system_from!!}
', 'set_id' => '1']);
@@ -2012,9 +2006,8 @@ class DatabaseSeeder extends Seeder
Template::create(['id' => '9', 'variable' => '0', 'name' => 'This template is for sending notice to client when a reply made to his/her ticket', 'type' => '9', 'message' => 'This message is regarding your ticket ID {!!$ticket_number!!}. We are changing the status of this ticket to "Closed" as the issue appears to be resolved.
Thank you
Kind regards,
{!!$system_from!!}
{!!$content!!}
{!!$agent_sign!!}
Ticket Details
Ticket ID: {!!$ticket_number!!}
Hello {!!$ticket_agent_name!!},
A reply been made to ticket {!!$ticket_number!!}
From
Name: {!!$ticket_client_name!!}
E-mail: {!!$ticket_client_email!!}
{!!$content!!}
Kind Regards,
{!!$system_from!!}
', 'set_id' => '1']);
Template::create(['id' => '11', 'variable' => '1', 'name' => 'This template is for sending notice to client about registration confirmation link', 'type' => '11', 'subject' => 'Verify your email address', 'message' => 'A reply been made to ticket {!!$ticket_number!!}
From
Name: {!!$ticket_client_name!!}
E-mail: {!!$ticket_client_email!!}
{!!$content!!}
Kind Regards,
{!!$system_from!!}
Hello {!!$user!!},
This email is confirmation that you are now registered at our helpdesk.
Registered Email: {!!$email_address!!}
Please click on the below link to activate your account and Login to the system {!!$password_reset_link!!}
Thank You.
Kind Regards,
{!!$system_from!!}
', 'set_id' => '1']); - Template::create(['id' => '12', 'variable' => '1', 'name' => 'This template is for sending notice to team when ticket is assigned to team', 'type' => '12', 'message' => 'Hello {!!$ticket_agent_name!!},
Ticket No: {!!$ticket_number!!}
Has been assigned to your team : {!!$team!!} by {!!$ticket_assigner!!}
Thank You
Kind Regards,
{!!$system_from!!}
', 'set_id' => '1']);
- Template::create(['id' => '13', 'variable' => '1', 'name' => 'This template is for sending notice to client when password is changed', 'type' => '13', 'subject' => 'Verify your email address', 'message' => 'Hello {!!$user!!},Ticket No: {!!$ticket_number!!}
Has been assigned to your team : {!!$team!!} by {!!$ticket_assigner!!}
Thank You
Kind Regards,
{!!$system_from!!}
Your password is successfully changed.Your new password is : {!!$user_password!!}
Thank You.
Kind Regards,
{!!$system_from!!}', 'set_id' => '1']); - + Template::create(['id' => '12', 'variable' => '1', 'name' => 'This template is for sending notice to team when ticket is assigned to team', 'type' => '12', 'message' => '
Hello {!!$ticket_agent_name!!},
Ticket No: {!!$ticket_number!!}
Has been assigned to your team : {!!$team!!} by {!!$ticket_assigner!!}
Thank You
Kind Regards,
{!!$system_from!!}
', 'set_id' => '1']);
+ Template::create(['id' => '13', 'variable' => '1', 'name' => 'This template is for sending notice to client when password is changed', 'type' => '13', 'subject' => 'Verify your email address', 'message' => 'Hello {!!$user!!},Ticket No: {!!$ticket_number!!}
Has been assigned to your team : {!!$team!!} by {!!$ticket_assigner!!}
Thank You
Kind Regards,
{!!$system_from!!}
Your password is successfully changed.Your new password is : {!!$user_password!!}
Thank You.
Kind Regards,
{!!$system_from!!}', 'set_id' => '1']); /* * All the common settings will be listed here @@ -2032,7 +2025,6 @@ class DatabaseSeeder extends Seeder Rating::create(['id' => '1', 'name' => 'OverAll Satisfaction', 'display_order' => '1', 'allow_modification' => '1', 'rating_scale' => '5', 'rating_area' => 'Helpdesk Area']); Rating::create(['id' => '2', 'name' => 'Reply Rating', 'display_order' => '1', 'allow_modification' => '1', 'rating_scale' => '5', 'rating_area' => 'Comment Area']); - Limit_Login::create(['id' => '1']); } } diff --git a/public/ckeditor/samples/old/assets/posteddata.php b/public/ckeditor/samples/old/assets/posteddata.php index 7006ce62f..2baa84ed6 100644 --- a/public/ckeditor/samples/old/assets/posteddata.php +++ b/public/ckeditor/samples/old/assets/posteddata.php @@ -35,13 +35,10 @@ if (!empty($_POST)) { $value = htmlspecialchars(stripslashes((string) $value)); } else { $value = htmlspecialchars((string) $value); - } - ?> + } ?>
To activate your account, please enter the OTP we\'ve sent on', - 'otp-sent' => 'We\'ve sent an OTP code on your number.', - 'verify-number' => 'Verify number', - 'get-verify-message' => 'Enter the OTP code we\'ve sent to your new number.', - 'number-verification-sussessfull' => 'Your number has been verified successfully, please wait we are updating your profile.', - 'enter_your_email_here' => 'Enter Your Email Here', + 'woops' => 'Whoops!', + 'theirisproblem' => 'There were some problems with your input.', + 'login' => 'Login', + 'e-mail' => 'Email', + 'reg_new_member' => 'Register a new membership', + 'this_account_is_currently_inactive' => 'This account is currently inactive!', + 'not-registered' => 'Email/username is not registered', + 'verify' => 'Verify', + 'enter-otp' => 'Enter OTP', + 'did-not-recive-code' => 'Didn\'t recieve code?', + 'resend_otp' => 'Resend OTP', + 'verify-screen-msg' => 'Your account is currently inactive.
To activate your account, please enter the OTP we\'ve sent on', + 'otp-sent' => 'We\'ve sent an OTP code on your number.', + 'verify-number' => 'Verify number', + 'get-verify-message' => 'Enter the OTP code we\'ve sent to your new number.', + 'number-verification-sussessfull' => 'Your number has been verified successfully, please wait we are updating your profile.', + 'enter_your_email_here' => 'Enter Your Email Here', /* |-------------------------------------- | Register Page @@ -466,7 +466,6 @@ return [ */ 'social-login' => 'Social login', - /* |------------------------------------------------ | Language page @@ -961,8 +960,6 @@ return [ 'reply_content_is_a_required_field' => 'Reply content is a required field', 'internal_content_is_a_required_field' => 'Internal content is a required field', - - /* |----------------------------------------------- | Profile @@ -1261,7 +1258,6 @@ return [ 'manage_status' => 'Manage status', 'notifications' => 'Notifications', - 'auto_close_workflow' => 'Auto-close workflow', 'close_ticket_workflow_settings' => 'Close ticket workflow settings', 'successfully_saved_your_settings' => 'Successfully saved your settings', @@ -1504,7 +1500,7 @@ return [ 'user_priority_status' => 'User priority status', 'current' => 'Current:', 'active_user_can_select_the_priority_while_creating_ticket' => 'Active user can select the priority while creating ticket', - + /* -------------------------------------------------------------------------------------------- * Approval Updated * -------------------------------------------------------------------------------------------- @@ -1567,7 +1563,7 @@ return [ /*** updates 28-11-2016***/ 'apply' => 'Apply', - /** updates 2-12-2016 **/ + /* updates 2-12-2016 **/ 'sort-by' => 'Sort by', 'created-at' => 'Created at', 'or' => 'OR', diff --git a/resources/lang/fr/lang.php b/resources/lang/fr/lang.php index de6da4b4e..d559da919 100644 --- a/resources/lang/fr/lang.php +++ b/resources/lang/fr/lang.php @@ -72,7 +72,6 @@ return [ 'we_have_e-mailed_your_password_reset_link' => 'We have emailed your password reset link!', "we_can't_find_a_user_with_that_e-mail_address" => "We can't find a user with that email address.", - /* |-------------------------------------- | Reset Password Page @@ -849,7 +848,6 @@ return [ 'group_deleted_successfully' => 'Groupe supprimé avec succès', 'failed_to_load_the_page' => 'Echec du chargement de la page', - /* |-------------------------------------- | SMTP Page @@ -924,8 +922,6 @@ return [ 'reply_content_is_a_required_field' => 'Le contenu de la réponse est un champ obligatoire', 'internal_content_is_a_required_field' => 'Le contenu interne est un champ obligatoire', - - /* |----------------------------------------------- | Profile @@ -1224,7 +1220,6 @@ return [ 'manage_status' => 'Gérer statut', 'notifications' => 'Notifications', - 'auto_close_workflow' => 'Workflow d\'auto fermeture', 'close_ticket_workflow_settings' => 'Fermer les paramètres de Workflow de ticket', 'successfully_saved_your_settings' => 'Paramètres enregistrés avec succès', @@ -1476,7 +1471,7 @@ return [ 'user_priority_status' => 'User priority status', 'current' => 'Current:', 'active_user_can_select_the_priority_while_creating_ticket' => 'Active user can select the priority while creating ticket', - + /* -------------------------------------------------------------------------------------------- * Approval Updated * -------------------------------------------------------------------------------------------- @@ -1539,7 +1534,7 @@ return [ /*** updates 28-11-2016***/ 'apply' => 'Apply', - /** updates 2-12-2016 **/ + /* updates 2-12-2016 **/ 'sort-by' => 'Sort by', 'created-at' => 'Created at', 'or' => 'OR', @@ -1558,5 +1553,4 @@ return [ 'restore-user' => 'Restore user account', 'delete-account-caution-info' => 'Please note this account may still have open tickets in the system.', - ]; diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php index a955b820c..1eac60dcb 100644 --- a/resources/lang/it/lang.php +++ b/resources/lang/it/lang.php @@ -1023,7 +1023,7 @@ return [ 'user_priority_status' => 'User priority status', 'current' => 'Current:', 'active_user_can_select_the_priority_while_creating_ticket' => 'Active user can select the priority while creating ticket', - + /* -------------------------------------------------------------------------------------------- * Approval Updated * -------------------------------------------------------------------------------------------- @@ -1086,7 +1086,7 @@ return [ /*** updates 28-11-2016***/ 'apply' => 'Apply', - /** updates 2-12-2016 **/ + /* updates 2-12-2016 **/ 'sort-by' => 'Sort by', 'created-at' => 'Created at', 'or' => 'OR', diff --git a/resources/lang/nl/lang.php b/resources/lang/nl/lang.php index da083a85b..852f5973e 100644 --- a/resources/lang/nl/lang.php +++ b/resources/lang/nl/lang.php @@ -1571,7 +1571,7 @@ return [ /************************************New updates*************************************/ /* Translation Required */ /************************************************************************************/ - 'deleted_user' => 'Deleted User', + 'deleted_user' => 'Deleted User', 'deleted_user_directory' => 'Deleted User Directory', 'restore' => 'Restore', 'user_restore_successfully' => 'User restore successfully', @@ -1579,7 +1579,7 @@ return [ /*** updates 28-11-2016***/ 'apply' => 'Apply', - /** updates 2-12-2016 **/ + /* updates 2-12-2016 **/ 'sort-by' => 'Sort by', 'created-at' => 'Created at', 'or' => 'OR', diff --git a/resources/lang/pt/lang.php b/resources/lang/pt/lang.php index 7e7cc9427..1e32a29ac 100644 --- a/resources/lang/pt/lang.php +++ b/resources/lang/pt/lang.php @@ -1461,7 +1461,7 @@ return [ 'user_priority_status' => 'User priority status', 'current' => 'Current:', 'active_user_can_select_the_priority_while_creating_ticket' => 'Active user can select the priority while creating ticket', - + /* -------------------------------------------------------------------------------------------- * Approval Updated * -------------------------------------------------------------------------------------------- @@ -1524,7 +1524,7 @@ return [ /*** updates 28-11-2016***/ 'apply' => 'Apply', - /** updates 2-12-2016 **/ + /* updates 2-12-2016 **/ 'sort-by' => 'Sort by', 'created-at' => 'Created at', 'or' => 'OR', diff --git a/resources/lang/ru/lang.php b/resources/lang/ru/lang.php index dabf389ed..8bded83eb 100644 --- a/resources/lang/ru/lang.php +++ b/resources/lang/ru/lang.php @@ -970,7 +970,7 @@ return [ 'user_priority_status' => 'User priority status', 'current' => 'Current:', 'active_user_can_select_the_priority_while_creating_ticket' => 'Active user can select the priority while creating ticket', - + /* -------------------------------------------------------------------------------------------- * Approval Updated * -------------------------------------------------------------------------------------------- @@ -1033,7 +1033,7 @@ return [ /*** updates 28-11-2016***/ 'apply' => 'Apply', - /** updates 2-12-2016 **/ + /* updates 2-12-2016 **/ 'sort-by' => 'Sort by', 'created-at' => 'Created at', 'or' => 'OR',