diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index c4d9126d3..3a5c7c21c 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -30,7 +30,6 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule) { if (env('DB_INSTALL') == 1) { - if ($this->getCurrentQueue() != 'sync') { $schedule->command('queue:listen '.$this->getCurrentQueue().' --sleep 60')->everyMinute(); } diff --git a/app/FaveoStorage/Controllers/SettingsController.php b/app/FaveoStorage/Controllers/SettingsController.php index 2a9612304..a1fd6f5e4 100644 --- a/app/FaveoStorage/Controllers/SettingsController.php +++ b/app/FaveoStorage/Controllers/SettingsController.php @@ -11,24 +11,26 @@ use Lang; use RecursiveDirectoryIterator; use RecursiveIteratorIterator; -class SettingsController extends Controller { - - public function settingsIcon() { +class SettingsController extends Controller +{ + public function settingsIcon() + { return '
-

' . Lang::get('storage::lang.storage') . '

+

'.Lang::get('storage::lang.storage').'

'; } - public function settings() { + public function settings() + { try { $settings = new CommonSettings(); $directories = $this->directories(); @@ -49,7 +51,8 @@ class SettingsController extends Controller { } } - public function postSettings(Request $request) { + public function postSettings(Request $request) + { try { $requests = $request->except('_token'); $this->delete(); @@ -67,7 +70,8 @@ class SettingsController extends Controller { } } - public function delete() { + public function delete() + { $settings = CommonSettings::where('option_name', 'storage')->get(); if ($settings->count() > 0) { foreach ($settings as $setting) { @@ -76,15 +80,17 @@ class SettingsController extends Controller { } } - public function save($key, $value) { + public function save($key, $value) + { CommonSettings::create([ - 'option_name' => 'storage', + 'option_name' => 'storage', 'optional_field' => $key, - 'option_value' => $value, + 'option_value' => $value, ]); } - public function directories($root = '') { + public function directories($root = '') + { if ($root == '') { $root = base_path(); } @@ -103,12 +109,12 @@ class SettingsController extends Controller { return $paths; } - public function attachment() { + public function attachment() + { $storage = new StorageController(); $storage->upload(); } - public function activate() { if (!\Schema::hasColumn('ticket_attachment', 'driver')) { @@ -119,5 +125,4 @@ class SettingsController extends Controller { ]); } } - } diff --git a/app/Http/Controllers/Admin/helpdesk/TemplateController.php b/app/Http/Controllers/Admin/helpdesk/TemplateController.php index 5b3a02d80..6158ac4ed 100644 --- a/app/Http/Controllers/Admin/helpdesk/TemplateController.php +++ b/app/Http/Controllers/Admin/helpdesk/TemplateController.php @@ -338,6 +338,7 @@ class TemplateController extends Controller ]; $this->PhpMailController->sendmail($from, $to_address, $message, [], []); + return redirect()->back()->with('success', 'Mail has send successfully'); } catch (Exception $e) { return redirect()->back()->with('fails', $e->getMessage()); diff --git a/app/Http/Controllers/Client/helpdesk/FormController.php b/app/Http/Controllers/Client/helpdesk/FormController.php index 7e1f94e94..2f95ee986 100644 --- a/app/Http/Controllers/Client/helpdesk/FormController.php +++ b/app/Http/Controllers/Client/helpdesk/FormController.php @@ -35,15 +35,16 @@ use Redirect; * * @author Ladybird */ -class FormController extends Controller { - +class FormController extends Controller +{ /** * Create a new controller instance. * Constructor to check. * * @return void */ - public function __construct(TicketWorkflowController $TicketWorkflowController) { + public function __construct(TicketWorkflowController $TicketWorkflowController) + { $this->middleware('board'); // creating a TicketController instance $this->TicketWorkflowController = $TicketWorkflowController; @@ -56,7 +57,8 @@ class FormController extends Controller { * * @return type */ - public function getForm(Help_topic $topic, CountryCode $code) { + public function getForm(Help_topic $topic, CountryCode $code) + { if (\Config::get('database.install') == '%0%') { return \Redirect::route('licence'); } @@ -90,13 +92,13 @@ class FormController extends Controller { * * @return type string */ - public function postForm($id, Help_topic $topic) { + public function postForm($id, Help_topic $topic) + { if ($id != 0) { $helptopic = $topic->where('id', '=', $id)->first(); $custom_form = $helptopic->custom_form; $values = Fields::where('forms_id', '=', $custom_form)->get(); if (!$values) { - } if ($values) { foreach ($values as $form_data) { @@ -104,29 +106,29 @@ class FormController extends Controller { $form_fields = explode(',', $form_data->value); $var = ''; foreach ($form_fields as $form_field) { - $var .= ''; + $var .= ''; } - echo '
'; + 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') { $type3 = $form_data->value; - echo '

'; + 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,7 +144,8 @@ 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) { + public function postedForm(User $user, ClientRequest $request, Ticket $ticket_settings, Ticket_source $ticket_source, Ticket_attachments $ta, CountryCode $code) + { try { $form_extras = $request->except('Name', 'Phone', 'Email', 'Subject', 'Details', 'helptopic', '_wysihtml5_mode', '_token', 'mobile', 'Code', 'priority', 'attachment'); $name = $request->input('Name'); @@ -200,8 +203,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, ]; @@ -210,8 +213,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, ]; @@ -238,7 +241,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')); } @@ -255,13 +258,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(); @@ -295,7 +299,8 @@ class FormController extends Controller { } } - public function getCustomForm(Request $request) { + public function getCustomForm(Request $request) + { $html = ''; $helptopic_id = $request->input('helptopic'); $helptopics = new Help_topic(); @@ -313,5 +318,4 @@ class FormController extends Controller { return $html; } - }