diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index b538b2a8f..202e877e9 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -54,7 +54,7 @@ class Handler extends ExceptionHandler */ public function render($request, Exception $e) { -// $phpmail = new PhpMailController; + // $phpmail = new PhpMailController; // if ($e instanceof \Tymon\JWTAuth\Exceptions\TokenExpiredException) { // return response()->json(['message' => $e->getMessage(), 'code' => $e->getStatusCode()]); // } elseif ($e instanceof \Tymon\JWTAuth\Exceptions\TokenInvalidException) { diff --git a/app/Http/Controllers/Admin/helpdesk/TemplateController.php b/app/Http/Controllers/Admin/helpdesk/TemplateController.php index 0547b6076..050c1f76a 100644 --- a/app/Http/Controllers/Admin/helpdesk/TemplateController.php +++ b/app/Http/Controllers/Admin/helpdesk/TemplateController.php @@ -24,14 +24,15 @@ use Mail; * * @author Ladybird */ -class TemplateController extends Controller { - +class TemplateController extends Controller +{ /** * Create a new controller instance. * * @return type void */ - public function __construct(PhpMailController $PhpMailController) { + public function __construct(PhpMailController $PhpMailController) + { $this->PhpMailController = $PhpMailController; SettingsController::smtp(); $this->middleware('auth'); @@ -45,7 +46,8 @@ class TemplateController extends Controller { * * @return type Response */ - public function index(Template $template) { + public function index(Template $template) + { try { $templates = $template->get(); @@ -63,7 +65,8 @@ class TemplateController extends Controller { * * @return type Response */ - public function create(Languages $language, Template $template) { + public function create(Languages $language, Template $template) + { try { $templates = $template->get(); $languages = $language->get(); @@ -82,7 +85,8 @@ class TemplateController extends Controller { * * @return type Response */ - public function store(Template $template, TemplateRequest $request) { + public function store(Template $template, TemplateRequest $request) + { try { /* Check whether function success or not */ if ($template->fill($request->input())->save() == true) { @@ -105,7 +109,8 @@ class TemplateController extends Controller { * * @return Response */ - public function show($id) { + public function show($id) + { // } @@ -118,7 +123,8 @@ class TemplateController extends Controller { * * @return type Response */ - public function listdirectories() { + public function listdirectories() + { $path = '../resources/views/emails/'; $directories = scandir($path); $directory = str_replace('/', '-', $path); @@ -126,29 +132,32 @@ class TemplateController extends Controller { return view('themes.default1.admin.helpdesk.emails.template.listdirectories', compact('directories', 'directory')); } - public function listtemplates($template, $path) { + public function listtemplates($template, $path) + { $paths = str_replace('-', '/', $path); - $directory2 = $paths . $template; + $directory2 = $paths.$template; $templates = scandir($directory2); - $directory = str_replace('/', '-', $directory2 . '/'); + $directory = str_replace('/', '-', $directory2.'/'); return view('themes.default1.admin.helpdesk.emails.template.listtemplates', compact('templates', 'directory')); } - public function readtemplate($template, $path) { + public function readtemplate($template, $path) + { $directory = str_replace('-', '/', $path); - $handle = fopen($directory . $template, 'r'); - $contents = fread($handle, filesize($directory . $template)); + $handle = fopen($directory.$template, 'r'); + $contents = fread($handle, filesize($directory.$template)); fclose($handle); return view('themes.default1.admin.helpdesk.emails.template.readtemplates', compact('contents', 'template', 'path')); } - public function createtemplate() { + public function createtemplate() + { $directory = '../resources/views/emails/'; $fname = Input::get('folder_name'); - $filename = $directory . $fname; + $filename = $directory.$fname; // images folder creation using php // $mydir = dirname( __FILE__ )."/html/images"; @@ -160,7 +169,7 @@ class TemplateController extends Controller { if (!file_exists($filename)) { mkdir($filename, 0777); } - $files = array_filter(scandir($directory . 'default')); + $files = array_filter(scandir($directory.'default')); foreach ($files as $file) { if ($file === '.' or $file === '..') { @@ -168,27 +177,29 @@ class TemplateController extends Controller { } if (!is_dir($file)) { // $file_to_go = str_replace("code/resources/views/emails/",'code/resources/views/emails/'.$fname,$file); - $destination = $directory . $fname . '/'; + $destination = $directory.$fname.'/'; - copy($directory . 'default/' . $file, $destination . $file); + copy($directory.'default/'.$file, $destination.$file); } } return \Redirect::back()->with('success', 'Successfully copied'); } - public function writetemplate($template, $path) { + public function writetemplate($template, $path) + { $directory = str_replace('-', '/', $path); $b = Input::get('templatedata'); - file_put_contents($directory . $template, print_r($b, true)); + file_put_contents($directory.$template, print_r($b, true)); return \Redirect::back()->with('success', 'Successfully updated'); } - public function deletetemplate($template, $path) { + public function deletetemplate($template, $path) + { $directory = str_replace('-', '/', $path); - $dir = $directory . $template; + $dir = $directory.$template; $status = \DB::table('settings_email')->first(); if ($template == 'default' or $template == $status->template) { return \Redirect::back()->with('fails', 'You cannot delete a default or active directory!'); @@ -197,7 +208,7 @@ class TemplateController extends Controller { $objects = scandir($dir); foreach ($objects as $object) { if ($object != '.' && $object != '..') { - unlink($dir . '/' . $object); + unlink($dir.'/'.$object); } } rmdir($dir); @@ -208,13 +219,15 @@ class TemplateController extends Controller { return \Redirect::back()->with('success', 'Successfully Deleted'); } - public function activateset($setname) { + public function activateset($setname) + { \DB::table('settings_email')->update(['template' => $setname]); return \Redirect::back()->with('success', 'You have Successfully Activated this Set'); } - public function edit($id, Template $template, Languages $language) { + public function edit($id, Template $template, Languages $language) + { try { $templates = $template->whereId($id)->first(); $languages = $language->get(); @@ -234,7 +247,8 @@ class TemplateController extends Controller { * * @return type Response */ - public function update($id, Template $template, TemplateUdate $request) { + public function update($id, Template $template, TemplateUdate $request) + { try { //TODO validation $templates = $template->whereId($id)->first(); @@ -260,7 +274,8 @@ class TemplateController extends Controller { * * @return type Response */ - public function destroy($id, Template $template) { + public function destroy($id, Template $template) + { try { $templates = $template->whereId($id)->first(); /* Check whether function success or not */ @@ -284,7 +299,8 @@ class TemplateController extends Controller { * * @return type Response */ - public function formDiagno(Emails $email) { + public function formDiagno(Emails $email) + { try { $emails = $email->get(); @@ -301,7 +317,8 @@ class TemplateController extends Controller { * * @return type */ - public function postDiagno(Request $request) { + public function postDiagno(Request $request) + { $email = $request->input('to'); if ($email == null) { return redirect('getdiagno')->with('fails', 'Please provide E-mail address !'); @@ -309,13 +326,10 @@ class TemplateController extends Controller { // sending mail via php mailer $mail = $this->PhpMailController->sendmail($from = $this->PhpMailController->mailfrom('1', '0'), $to = ['email' => $email], $message = ['subject' => 'Checking the connection', 'scenario' => 'error-report', 'content' => 'Email Received Successfully'], $template_variables = ['system_error' => 'hello']); - if($mail == null){ - return redirect('getdiagno')->with('fails', 'Please check your E-mail settings. Unable to send mails'); + if ($mail == null) { + return redirect('getdiagno')->with('fails', 'Please check your E-mail settings. Unable to send mails'); } else { - return redirect('getdiagno')->with('success', 'Please check your mail. An E-mail has been sent to your E-mail address'); + return redirect('getdiagno')->with('success', 'Please check your mail. An E-mail has been sent to your E-mail address'); } - - } - } diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index 7ede3d829..0aa9df39b 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -38,6 +38,7 @@ class UserController extends Controller * 1. authentication * 2. user roles * 3. roles must be agent. + * * @return void */ public function __construct() @@ -50,7 +51,9 @@ class UserController extends Controller /** * Display all list of the users. + * * @param type User $user + * * @return type view */ public function index() @@ -65,6 +68,7 @@ class UserController extends Controller /** * This function is used to display the list of users using chumper datatables. + * * @return datatable */ public function user_list() @@ -81,14 +85,14 @@ class UserController extends Controller $username = substr($model->user_name, 0, 30); $username = substr($username, 0, strrpos($username, ' ')).' ...'; } else { - $username = "id)."'>".$model->user_name.""; + $username = "id)."'>".$model->user_name.''; } return $username; }) /* column email */ ->addColumn('email', function ($model) { - $email = "id)."'>".$model->email.""; + $email = "id)."'>".$model->email.''; return $email; }) @@ -143,6 +147,7 @@ class UserController extends Controller /** * Show the form for creating a new users. + * * @return type view */ public function create() @@ -156,8 +161,10 @@ class UserController extends Controller /** * Store a newly created users in storage. + * * @param type User $user * @param type Sys_userRequest $request + * * @return type redirect */ public function store(User $user, Sys_userRequest $request) @@ -184,8 +191,10 @@ class UserController extends Controller /** * Display the specified users. + * * @param type int $id * @param type User $user + * * @return type view */ public function show($id, User $user) @@ -202,8 +211,10 @@ class UserController extends Controller /** * Show the form for editing the specified resource. + * * @param type int $id * @param type User $user + * * @return type Response */ public function edit($id, User $user) @@ -220,9 +231,11 @@ class UserController extends Controller /** * Update the specified user in storage. + * * @param type int $id * @param type User $user * @param type Sys_userUpdate $request + * * @return type Response */ public function update($id, User $user, Sys_userUpdate $request) @@ -243,6 +256,7 @@ class UserController extends Controller /** * get agent profile page. + * * @return type view */ public function getProfile() @@ -257,6 +271,7 @@ class UserController extends Controller /** * get profile edit page. + * * @return type view */ public function getProfileedit() @@ -271,8 +286,10 @@ class UserController extends Controller /** * post profile edit. + * * @param type int $id * @param type ProfileRequest $request + * * @return type Redirect */ public function postProfileedit(ProfileRequest $request) @@ -321,8 +338,10 @@ class UserController extends Controller /** * Post profile password. + * * @param type int $id * @param type ProfilePassword $request + * * @return type Redirect */ public function postProfilePassword($id, ProfilePassword $request) @@ -334,6 +353,7 @@ class UserController extends Controller $user->password = Hash::make($request->input('new_password')); try { $user->save(); + return redirect('profile-edit')->with('success1', 'Password Updated sucessfully'); } catch (Exception $e) { return redirect('profile-edit')->with('fails', $e->errorInfo[2]); @@ -345,7 +365,9 @@ class UserController extends Controller /** * Assigning an user to an organization. + * * @param type $id + * * @return type boolean */ public function UserAssignOrg($id) @@ -355,12 +377,15 @@ class UserController extends Controller $user_org->org_id = $org; $user_org->user_id = $id; $user_org->save(); + return 1; } /** * creating an organization in user profile page via modal popup. + * * @param type $id + * * @return type */ public function User_Create_Org($id) diff --git a/app/Http/Controllers/Api/v1/ApiExceptAuthController.php b/app/Http/Controllers/Api/v1/ApiExceptAuthController.php index 7480f60d6..9ade975b5 100644 --- a/app/Http/Controllers/Api/v1/ApiExceptAuthController.php +++ b/app/Http/Controllers/Api/v1/ApiExceptAuthController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\v1; use App\Http\Controllers\Controller; use Illuminate\Http\Request; + class ApiExceptAuthController extends Controller { public $api_controller; diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php index 283bc710a..b57fd33df 100644 --- a/app/Http/Controllers/Common/PhpMailController.php +++ b/app/Http/Controllers/Common/PhpMailController.php @@ -10,14 +10,16 @@ use App\Model\helpdesk\Settings\Email; use App\User; use Auth; -class PhpMailController extends Controller { - - public function fetch_smtp_details($id) { +class PhpMailController extends Controller +{ + public function fetch_smtp_details($id) + { $emails = Emails::where('id', '=', $id)->first(); if ($emails->sending_status == 1) { return $emails; } else { $emails = null; + return $emails; } } @@ -27,7 +29,8 @@ class PhpMailController extends Controller { * * @return Mail */ - public function sendmail($from, $to, $message, $template_variables) { + public function sendmail($from, $to, $message, $template_variables) + { // dd($from); $from_address = $this->fetch_smtp_details($from); if ($from_address == null) { @@ -179,10 +182,10 @@ class PhpMailController extends Controller { $path2 = \Config::get('view.paths'); - $directory = $path2[0] . '\emails' . DIRECTORY_SEPARATOR . $status->template . DIRECTORY_SEPARATOR; + $directory = $path2[0].'\emails'.DIRECTORY_SEPARATOR.$status->template.DIRECTORY_SEPARATOR; - $handle = fopen($directory . $template . '.blade.php', 'r'); - $contents = fread($handle, filesize($directory . $template . '.blade.php')); + $handle = fopen($directory.$template.'.blade.php', 'r'); + $contents = fread($handle, filesize($directory.$template.'.blade.php')); fclose($handle); $variables = ['{!!$user!!}', '{!!$agent!!}', '{!!$ticket_number!!}', '{!!$content!!}', '{!!$from!!}', '{!!$ticket_agent_name!!}', '{!!$ticket_client_name!!}', '{!!$ticket_client_email!!}', '{!!$ticket_body!!}', '{!!$ticket_assigner!!}', '{!!$ticket_link_with_number!!}', '{!!$system_error!!}', '{!!$agent_sign!!}', '{!!$department_sign!!}', '{!!$password_reset_link!!}', '{!!$email_address!!}', '{!!$user_password!!}', '{!!$system_from!!}', '{!!$system_link!!}']; @@ -241,7 +244,7 @@ class PhpMailController extends Controller { $mail->Subject = $subject; if ($template == 'ticket-reply-agent') { $line = '---Reply above this line---

'; - $mail->Body = $line . $messagebody; + $mail->Body = $line.$messagebody; } else { $mail->Body = $messagebody; } @@ -249,7 +252,7 @@ class PhpMailController extends Controller { // $mail->AltBody = $altbody; if (!$mail->send()) { - return null; + return; // echo 'Message could not be sent.'; // echo 'Mailer Error: '.$mail->ErrorInfo; } else { @@ -264,7 +267,8 @@ class PhpMailController extends Controller { * * @return type */ - public function company() { + public function company() + { $company = Company::Where('id', '=', '1')->first(); if ($company->company_name == null) { $company = 'Support Center'; @@ -326,7 +330,8 @@ class PhpMailController extends Controller { * * @return type integer */ - public function mailfrom($reg, $dept_id) { + public function mailfrom($reg, $dept_id) + { $email = Email::where('id', '=', '1')->first(); if ($reg == 1) { return $email->sys_email; @@ -339,5 +344,4 @@ class PhpMailController extends Controller { } } } - } diff --git a/app/Http/Controllers/Installer/helpdesk/InstallController.php b/app/Http/Controllers/Installer/helpdesk/InstallController.php index a35ca72ff..6f7061991 100644 --- a/app/Http/Controllers/Installer/helpdesk/InstallController.php +++ b/app/Http/Controllers/Installer/helpdesk/InstallController.php @@ -211,22 +211,22 @@ class InstallController extends Controller // $_ENV['DB_PASSWORD'] = $dbpassword; $ENV['APP_ENV'] = 'local'; - $ENV['APP_DEBUG'] = 'false'; - $ENV['APP_KEY'] = 'SomeRandomString'; - $ENV['DB_TYPE'] = $default; - $ENV['DB_HOST'] = $host; - $ENV['DB_PORT'] = $port; - $ENV['DB_DATABASE'] = $database; - $ENV['DB_USERNAME'] = $dbusername; - $ENV['DB_PASSWORD'] = $dbpassword; - $ENV['MAIL_DRIVER'] = 'smtp'; - $ENV['MAIL_HOST'] = 'mailtrap.io'; - $ENV['MAIL_PORT'] = '2525'; - $ENV['MAIL_USERNAME'] = 'null'; - $ENV['MAIL_PASSWORD'] = 'null'; - $ENV['CACHE_DRIVER'] = 'file'; - $ENV['SESSION_DRIVER'] = 'file'; - $ENV['QUEUE_DRIVER'] = 'sync'; + $ENV['APP_DEBUG'] = 'false'; + $ENV['APP_KEY'] = 'SomeRandomString'; + $ENV['DB_TYPE'] = $default; + $ENV['DB_HOST'] = $host; + $ENV['DB_PORT'] = $port; + $ENV['DB_DATABASE'] = $database; + $ENV['DB_USERNAME'] = $dbusername; + $ENV['DB_PASSWORD'] = $dbpassword; + $ENV['MAIL_DRIVER'] = 'smtp'; + $ENV['MAIL_HOST'] = 'mailtrap.io'; + $ENV['MAIL_PORT'] = '2525'; + $ENV['MAIL_USERNAME'] = 'null'; + $ENV['MAIL_PASSWORD'] = 'null'; + $ENV['CACHE_DRIVER'] = 'file'; + $ENV['SESSION_DRIVER'] = 'file'; + $ENV['QUEUE_DRIVER'] = 'sync'; $config = ''; foreach ($ENV as $key => $val) {