update v1.0.7.5

This commit is contained in:
Sujit Prasad
2016-06-14 14:45:24 +05:30
parent 32a73e76d1
commit 050086df09
46 changed files with 2009 additions and 1437 deletions

View File

@@ -143,7 +143,7 @@ class DepartmentController extends Controller
public function edit($id, User $user, Group_assign_department $group_assign_department, Template $template, Teams $team, Department $department, Sla_plan $sla, Emails $email, Groups $group)
{
try {
$sys_department = \DB::table('settings_system')
$sys_department = \DB::table('settings_system')
->select('department')
->where('id', '=', 1)
->first();
@@ -175,6 +175,7 @@ class DepartmentController extends Controller
{
// dd($id);
try {
$table = $group_assign_department->where('department_id', $id);
$table->delete();
$requests = $request->input('group_id');

View File

@@ -28,15 +28,14 @@ use Lang;
*
* @author Ladybird <info@ladybirdweb.com>
*/
class EmailsController extends Controller
{
class EmailsController extends Controller {
/**
* Defining constructor variables.
*
* @return type
*/
public function __construct()
{
public function __construct() {
$this->middleware('auth');
$this->middleware('roles');
}
@@ -48,8 +47,7 @@ class EmailsController extends Controller
*
* @return type view
*/
public function index(Emails $email)
{
public function index(Emails $email) {
try {
// fetch all the emails from emails table
$emails = $email->get();
@@ -70,8 +68,7 @@ class EmailsController extends Controller
*
* @return type Response
*/
public function create(Department $department, Help_topic $help, Ticket_Priority $ticket_priority, MailboxProtocol $mailbox_protocol)
{
public function create(Department $department, Help_topic $help, Ticket_Priority $ticket_priority, MailboxProtocol $mailbox_protocol) {
try {
// fetch all the departments from the department table
$departments = $department->get();
@@ -96,17 +93,16 @@ class EmailsController extends Controller
*
* @return int
*/
public function validatingEmailSettings(Request $request)
{
public function validatingEmailSettings(Request $request) {
$validator = \Validator::make(
[
'email_address' => $request->input('email_address'),
'email_name' => $request->input('email_name'),
'password' => $request->input('password'),
'email_name' => $request->input('email_name'),
'password' => $request->input('password'),
], [
'email_address' => 'required|email|unique:emails',
'email_name' => 'required',
'password' => 'required',
'email_name' => 'required',
'password' => 'required',
]
);
if ($validator->fails()) {
@@ -177,8 +173,7 @@ class EmailsController extends Controller
*
* @return type Redirect
*/
public function store($request, $imap_check)
{
public function store($request, $imap_check) {
$email = new Emails();
try {
// saving all the fields to the database
@@ -260,8 +255,7 @@ class EmailsController extends Controller
*
* @return type Response
*/
public function edit($id, Department $department, Help_topic $help, Emails $email, Ticket_Priority $ticket_priority, MailboxProtocol $mailbox_protocol)
{
public function edit($id, Department $department, Help_topic $help, Emails $email, Ticket_Priority $ticket_priority, MailboxProtocol $mailbox_protocol) {
try {
$sys_email = \DB::table('settings_email')->select('sys_email')->where('id', '=', 1)->first();
// dd($sys_email);
@@ -292,17 +286,16 @@ class EmailsController extends Controller
*
* @return int
*/
public function validatingEmailSettingsUpdate($id, Request $request)
{
public function validatingEmailSettingsUpdate($id, Request $request) {
$validator = \Validator::make(
[
'email_address' => $request->input('email_address'),
'email_name' => $request->input('email_name'),
'password' => $request->input('password'),
'email_name' => $request->input('email_name'),
'password' => $request->input('password'),
], [
'email_address' => 'email',
'email_name' => 'required',
'password' => 'required',
'email_name' => 'required',
'password' => 'required',
]
);
if ($validator->fails()) {
@@ -375,8 +368,7 @@ class EmailsController extends Controller
*
* @return type Response
*/
public function update($id, $request, $imap_check)
{
public function update($id, $request, $imap_check) {
try {
// fetch the selected emails
$emails = Emails::whereId($id)->first();
@@ -426,12 +418,12 @@ class EmailsController extends Controller
// $emails->password = Crypt::encrypt($request->input('password'));
$emails->save();
//dd($request->sys_email);
if ($request->sys_email == 'on') {
if($request->sys_email == 'on') {
$system = \DB::table('settings_email')
->where('id', '=', 1)
->update(['sys_email' => $id]);
} elseif ($request->input('count') <= 1 && $request->sys_email == null) {
$system = \DB::table('settings_email')
$system = \DB::table('settings_email')
->where('id', '=', 1)
->update(['sys_email' => null]);
}
@@ -453,8 +445,7 @@ class EmailsController extends Controller
*
* @return type Redirect
*/
public function destroy($id, Emails $email)
{
public function destroy($id, Emails $email) {
// fetching the details on the basis of the $id passed to the function
$default_system_email = Email::where('id', '=', '1')->first();
if ($default_system_email->sys_email) {
@@ -485,26 +476,25 @@ class EmailsController extends Controller
*
* @return type int
*/
public function getImapStream($request, $validate)
{
public function getImapStream($request, $validate) {
$fetching_status = $request->input('fetching_status');
$username = $request->input('email_address');
$password = $request->input('password');
$protocol_id = $request->input('mailbox_protocol');
$fetching_protocol = '/'.$request->input('fetching_protocol');
$fetching_encryption = '/'.$request->input('fetching_encryption');
$fetching_protocol = '/' . $request->input('fetching_protocol');
$fetching_encryption = '/' . $request->input('fetching_encryption');
if ($fetching_encryption == '/none') {
$fetching_encryption2 = '/novalidate-cert';
$mailbox_protocol = $fetching_encryption2;
$host = $request->input('fetching_host');
$port = $request->input('fetching_port');
$mailbox = '{'.$host.':'.$port.$mailbox_protocol.'}INBOX';
$mailbox = '{' . $host . ':' . $port . $mailbox_protocol . '}INBOX';
} else {
$mailbox_protocol = $fetching_protocol.$fetching_encryption;
$mailbox_protocol = $fetching_protocol . $fetching_encryption;
$host = $request->input('fetching_host');
$port = $request->input('fetching_port');
$mailbox = '{'.$host.':'.$port.$mailbox_protocol.$validate.'}INBOX';
$mailbox_protocol = $fetching_encryption.$validate;
$mailbox = '{' . $host . ':' . $port . $mailbox_protocol . $validate . '}INBOX';
$mailbox_protocol = $fetching_encryption . $validate;
}
try {
$imap_stream = imap_open($mailbox, $username, $password);
@@ -528,8 +518,7 @@ class EmailsController extends Controller
*
* @return type int
*/
public function checkImapStream($imap_stream)
{
public function checkImapStream($imap_stream) {
$check_imap_stream = imap_check($imap_stream);
if ($check_imap_stream) {
$imap_stream = 1;
@@ -547,8 +536,7 @@ class EmailsController extends Controller
*
* @return int
*/
public function getSmtp($request)
{
public function getSmtp($request) {
$sending_status = $request->input('sending_status');
// cheking for the sending protocol
if ($request->input('sending_protocol') == 'smtp') {
@@ -564,8 +552,8 @@ class EmailsController extends Controller
$mail->SMTPAuth = true; // Enable SMTP authentication
$mail->SMTPOptions = [
'ssl' => [
'verify_peer' => false,
'verify_peer_name' => false,
'verify_peer' => false,
'verify_peer_name' => false,
'allow_self_signed' => true,
],
];
@@ -597,8 +585,7 @@ class EmailsController extends Controller
*
* @return type string or null
*/
public function departmentValue($dept)
{
public function departmentValue($dept) {
if ($dept) {
$email_department = $dept;
} else {
@@ -615,8 +602,7 @@ class EmailsController extends Controller
*
* @return type string or null
*/
public function priorityValue($priority)
{
public function priorityValue($priority) {
if ($priority) {
$email_priority = $priority;
} else {
@@ -633,8 +619,7 @@ class EmailsController extends Controller
*
* @return type string or null
*/
public function helpTopicValue($help_topic)
{
public function helpTopicValue($help_topic) {
if ($help_topic) {
$email_help_topic = $help_topic;
} else {
@@ -643,4 +628,5 @@ class EmailsController extends Controller
return $email_help_topic;
}
}

View File

@@ -3,21 +3,22 @@
namespace App\Http\Controllers\Admin\helpdesk;
// controller
use App\Http\Controllers\Common\PhpMailController;
use App\Http\Controllers\Controller;
// request
use Exception;
use File;
use Lang;
use File;
/**
* ErrorAndDebuggingController.
* ErrorAndDebuggingController
*
* @author Ladybird <info@ladybirdweb.com>
*/
class ErrorAndDebuggingController extends Controller
{
/**
/**
* Create a new controller instance.
*
* @return void
@@ -30,76 +31,68 @@ class ErrorAndDebuggingController extends Controller
}
/**
* function to show error and debugging setting page.
*
* function to show error and debugging setting page
* @param void
*
* @return response
* @return response
*/
public function showSettings()
{
$debug = \Config::get('app.debug');
$bugsnag = \Config::get('app.bugsnag_reporting');
public function showSettings()
{
$debug = \Config::get('app.debug');
$bugsnag = \Config::get('app.bugsnag_reporting');
return view('themes.default1.admin.helpdesk.settings.error-and-logs.error-debug')->with(['debug'=> $debug, 'bugsnag' => $bugsnag]);
}
return view('themes.default1.admin.helpdesk.settings.error-and-logs.error-debug')->with(['debug' => $debug, 'bugsnag' => $bugsnag]);
}
/**
* funtion to update error and debugging settings.
*
* @param void
*
* @return
*/
public function postSettings()
{
try {
$debug = \Config::get('app.debug');
$debug = ($debug) ? 'true' : 'false';
$bugsnag_debug = \Config::get('app.bugsnag_reporting');
$bugsnag_debug = ($bugsnag_debug) ? 'true' : 'false';
if ($debug != \Input::get('debug') || $bugsnag_debug != \Input::get('bugsnag')) {
// dd($request->input());
$debug_new = base_path()
.DIRECTORY_SEPARATOR.
'config'
.DIRECTORY_SEPARATOR.
'app.php';
$datacontent = File::get($debug_new);
$datacontent = str_replace("'debug' => ".$debug,
"'debug' => ".\Input::get('debug'),
$datacontent);
File::put($debug_new, $datacontent);
// dd($request->input());
$bugsnag_debug_new = base_path()
.DIRECTORY_SEPARATOR.
'config'
.DIRECTORY_SEPARATOR.
'app.php';
$datacontent2 = File::get($bugsnag_debug_new);
$datacontent2 = str_replace("'bugsnag_reporting' => ".$bugsnag_debug,
"'bugsnag_reporting' => ".\Input::get('bugsnag'),
$datacontent2);
File::put($bugsnag_debug_new, $datacontent2);
return redirect()->back()->with('success',
Lang::get('lang.error-debug-settings-saved-message'));
} else {
return redirect()->back()->with('fails',
Lang::get('lang.error-debug-settings-error-message'));
}
/**
* funtion to update error and debugging settings
* @param void
* @return
*/
public function postSettings()
{
try{
$debug = \Config::get('app.debug');
$debug = ($debug) ? 'true' : 'false';
$bugsnag_debug = \Config::get('app.bugsnag_reporting');
$bugsnag_debug = ($bugsnag_debug) ? 'true' : 'false';
if ($debug != \Input::get('debug') || $bugsnag_debug != \Input::get('bugsnag')) {
// dd($request->input());
$debug_new = base_path()
.DIRECTORY_SEPARATOR.
'config'
.DIRECTORY_SEPARATOR.
'app.php';
$datacontent = File::get($debug_new);
$datacontent = str_replace("'debug' => ".$debug,
"'debug' => ".\Input::get('debug'),
$datacontent);
File::put($debug_new, $datacontent);
// dd($request->input());
$bugsnag_debug_new = base_path()
.DIRECTORY_SEPARATOR.
'config'
.DIRECTORY_SEPARATOR.
'app.php';
$datacontent2 = File::get($bugsnag_debug_new);
$datacontent2 = str_replace("'bugsnag_reporting' => ".$bugsnag_debug,
"'bugsnag_reporting' => ".\Input::get('bugsnag'),
$datacontent2);
File::put($bugsnag_debug_new, $datacontent2);
return redirect()->back()->with('success',
Lang::get('lang.error-debug-settings-saved-message'));
} else {
return redirect()->back()->with('fails',
Lang::get('lang.error-debug-settings-error-message'));
}
} catch (Exception $e) {
/* redirect to Index page with Fails Message */
return redirect()->back()->with('fails', $e->getMessage());
}
}
}
}
/**
* function to show error log table page.
*
* function to show error log table page
* @param void
*
* @return response view
*/
public function showErrorLogs()

View File

@@ -152,7 +152,7 @@ class HelptopicController extends Controller
$sys_help_topic = \DB::table('settings_ticket')
->select('help_topic')
->where('id', '=', 1)->first();
return view('themes.default1.admin.helpdesk.manage.helptopic.edit', compact('priority', 'departments', 'topics', 'forms', 'agents', 'slas', 'sys_help_topic'));
} catch (Exception $e) {
return redirect('helptopic')->with('fails', '<li>'.$e->getMessage().'</li>');

View File

@@ -182,7 +182,7 @@ class SettingsController extends Controller
/* Check whether function success or not */
$systems->fill($request->input())->save();
/* redirect to Index page with Success Message */
// dd($datacontent);
//\Config::set('app.debug', $request->input('debug'));
return redirect('getsystem')->with('success', Lang::get('lang.system_updated_successfully'));

View File

@@ -104,8 +104,7 @@ class SlaController extends Controller
$slas = Sla_plan::whereId($id)->first();
$slas->get();
$sla = \DB::table('settings_ticket')->select('sla')->where('id', '=', 1)->first();
return view('themes.default1.admin.helpdesk.manage.sla.edit', compact('slas', 'sla'));
return view('themes.default1.admin.helpdesk.manage.sla.edit', compact('slas','sla'));
} catch (Exception $e) {
return redirect()->back()->with('fails', $e->getMessage());
}
@@ -138,7 +137,6 @@ class SlaController extends Controller
->where('id', '=', 1)
->update(['sla' => $id]);
}
return redirect('sla')->with('success', Lang::get('lang.sla_plan_updated_successfully'));
} catch (Exception $e) {
/* redirect to Index page with Fails Message */

View File

@@ -24,15 +24,14 @@ use Lang;
*
* @author Ladybird <info@ladybirdweb.com>
*/
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;
$this->middleware('auth');
$this->middleware('roles');
@@ -45,8 +44,7 @@ class TemplateController extends Controller
*
* @return type Response
*/
public function index(Template $template)
{
public function index(Template $template) {
try {
$templates = $template->get();
@@ -64,8 +62,7 @@ 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();
@@ -84,8 +81,7 @@ 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) {
@@ -108,8 +104,7 @@ class TemplateController extends Controller
*
* @return Response
*/
public function show($id)
{
public function show($id) {
//
}
@@ -122,41 +117,37 @@ class TemplateController extends Controller
*
* @return type Response
*/
public function listdirectories()
{
$path = \Config::get('view.paths')[0].'/emails/';
public function listdirectories() {
$path = \Config::get('view.paths')[0] . '/emails/';
$directories = scandir($path);
$directory = str_replace('/', '-', $path);
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";
@@ -168,7 +159,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 === '..') {
@@ -176,29 +167,27 @@ 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!');
@@ -207,7 +196,7 @@ class TemplateController extends Controller
$objects = scandir($dir);
foreach ($objects as $object) {
if ($object != '.' && $object != '..') {
unlink($dir.'/'.$object);
unlink($dir . '/' . $object);
}
}
rmdir($dir);
@@ -218,15 +207,13 @@ 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();
@@ -246,8 +233,7 @@ 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();
@@ -273,8 +259,7 @@ 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 */
@@ -298,8 +283,7 @@ class TemplateController extends Controller
*
* @return type Response
*/
public function formDiagno(Emails $email)
{
public function formDiagno(Emails $email) {
try {
$emails = $email->get();
@@ -316,8 +300,7 @@ class TemplateController extends Controller
*
* @return type
*/
public function postDiagno(DiagnosRequest $request)
{
public function postDiagno(DiagnosRequest $request) {
try {
$email_details = Emails::where('id', '=', $request->from)->first();
if ($email_details->sending_protocol == 'mail') {
@@ -325,12 +308,12 @@ class TemplateController extends Controller
$mail->IsSendmail(); // telling the class to use SendMail transport
$mail->SetFrom($email_details->email_address, $email_details->email_name); // sender details
$address = $request->to; // receiver email
$mail->AddAddress($address);
$mail->AddAddress($address);
$mail->Subject = $request->subject; // subject of the email
$body = $request->message; // body of the email
$mail->MsgHTML($body);
if (!$mail->Send()) {
$return = Lang::get('lang.mailer_error').': '.$mail->ErrorInfo;
$mail->MsgHTML($body);
if (!$mail->Send()) {
$return = Lang::get('lang.mailer_error') . ': ' . $mail->ErrorInfo;
} else {
$return = Lang::get('lang.message_has_been_sent');
}
@@ -340,8 +323,8 @@ class TemplateController extends Controller
if ($email_details->smtp_validate == '1') {
$mail->SMTPOptions = [
'ssl' => [
'verify_peer' => false,
'verify_peer_name' => false,
'verify_peer' => false,
'verify_peer_name' => false,
'allow_self_signed' => true,
],
];
@@ -358,15 +341,15 @@ class TemplateController extends Controller
$mail->Subject = $request->subject;
$mail->Body = utf8_decode($request->message);
if (!$mail->send()) {
$return = Lang::get('lang.mailer_error').': '.$mail->ErrorInfo;
$return = Lang::get('lang.mailer_error') . ': ' . $mail->ErrorInfo;
} else {
$return = Lang::get('lang.message_has_been_sent');
}
}
return redirect()->back()->with('success', $return);
} catch (Exception $e) {
return redirect()->back()->with('fails', $e->getMessage());
}
}
}

View File

@@ -166,7 +166,7 @@ class WorkflowController extends Controller
{
try {
// store a new workflow credentials in to the system
$workflow_name = new WorkflowName();
$workflow_name = new WorkflowName;
$workflow_name->name = $request->name;
$workflow_name->status = $request->status;
$workflow_name->order = $request->execution_order;