Apply fixes from StyleCI
This commit is contained in:

committed by
StyleCI Bot

parent
a79c2176d3
commit
01700a00bd
@@ -30,7 +30,6 @@ class Kernel extends ConsoleKernel
|
|||||||
protected function schedule(Schedule $schedule)
|
protected function schedule(Schedule $schedule)
|
||||||
{
|
{
|
||||||
if (env('DB_INSTALL') == 1) {
|
if (env('DB_INSTALL') == 1) {
|
||||||
|
|
||||||
if ($this->getCurrentQueue() != 'sync') {
|
if ($this->getCurrentQueue() != 'sync') {
|
||||||
$schedule->command('queue:listen '.$this->getCurrentQueue().' --sleep 60')->everyMinute();
|
$schedule->command('queue:listen '.$this->getCurrentQueue().' --sleep 60')->everyMinute();
|
||||||
}
|
}
|
||||||
|
@@ -11,9 +11,10 @@ use Lang;
|
|||||||
use RecursiveDirectoryIterator;
|
use RecursiveDirectoryIterator;
|
||||||
use RecursiveIteratorIterator;
|
use RecursiveIteratorIterator;
|
||||||
|
|
||||||
class SettingsController extends Controller {
|
class SettingsController extends Controller
|
||||||
|
{
|
||||||
public function settingsIcon() {
|
public function settingsIcon()
|
||||||
|
{
|
||||||
return ' <div class="col-md-2 col-sm-6">
|
return ' <div class="col-md-2 col-sm-6">
|
||||||
<div class="settingiconblue">
|
<div class="settingiconblue">
|
||||||
<div class="settingdivblue">
|
<div class="settingdivblue">
|
||||||
@@ -28,7 +29,8 @@ class SettingsController extends Controller {
|
|||||||
</div>';
|
</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function settings() {
|
public function settings()
|
||||||
|
{
|
||||||
try {
|
try {
|
||||||
$settings = new CommonSettings();
|
$settings = new CommonSettings();
|
||||||
$directories = $this->directories();
|
$directories = $this->directories();
|
||||||
@@ -49,7 +51,8 @@ class SettingsController extends Controller {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function postSettings(Request $request) {
|
public function postSettings(Request $request)
|
||||||
|
{
|
||||||
try {
|
try {
|
||||||
$requests = $request->except('_token');
|
$requests = $request->except('_token');
|
||||||
$this->delete();
|
$this->delete();
|
||||||
@@ -67,7 +70,8 @@ class SettingsController extends Controller {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function delete() {
|
public function delete()
|
||||||
|
{
|
||||||
$settings = CommonSettings::where('option_name', 'storage')->get();
|
$settings = CommonSettings::where('option_name', 'storage')->get();
|
||||||
if ($settings->count() > 0) {
|
if ($settings->count() > 0) {
|
||||||
foreach ($settings as $setting) {
|
foreach ($settings as $setting) {
|
||||||
@@ -76,7 +80,8 @@ class SettingsController extends Controller {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function save($key, $value) {
|
public function save($key, $value)
|
||||||
|
{
|
||||||
CommonSettings::create([
|
CommonSettings::create([
|
||||||
'option_name' => 'storage',
|
'option_name' => 'storage',
|
||||||
'optional_field' => $key,
|
'optional_field' => $key,
|
||||||
@@ -84,7 +89,8 @@ class SettingsController extends Controller {
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function directories($root = '') {
|
public function directories($root = '')
|
||||||
|
{
|
||||||
if ($root == '') {
|
if ($root == '') {
|
||||||
$root = base_path();
|
$root = base_path();
|
||||||
}
|
}
|
||||||
@@ -103,12 +109,12 @@ class SettingsController extends Controller {
|
|||||||
return $paths;
|
return $paths;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function attachment() {
|
public function attachment()
|
||||||
|
{
|
||||||
$storage = new StorageController();
|
$storage = new StorageController();
|
||||||
$storage->upload();
|
$storage->upload();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function activate()
|
public function activate()
|
||||||
{
|
{
|
||||||
if (!\Schema::hasColumn('ticket_attachment', 'driver')) {
|
if (!\Schema::hasColumn('ticket_attachment', 'driver')) {
|
||||||
@@ -119,5 +125,4 @@ class SettingsController extends Controller {
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -338,6 +338,7 @@ class TemplateController extends Controller
|
|||||||
];
|
];
|
||||||
|
|
||||||
$this->PhpMailController->sendmail($from, $to_address, $message, [], []);
|
$this->PhpMailController->sendmail($from, $to_address, $message, [], []);
|
||||||
|
|
||||||
return redirect()->back()->with('success', 'Mail has send successfully');
|
return redirect()->back()->with('success', 'Mail has send successfully');
|
||||||
} catch (Exception $e) {
|
} catch (Exception $e) {
|
||||||
return redirect()->back()->with('fails', $e->getMessage());
|
return redirect()->back()->with('fails', $e->getMessage());
|
||||||
|
@@ -35,15 +35,16 @@ use Redirect;
|
|||||||
*
|
*
|
||||||
* @author Ladybird <info@ladybirdweb.com>
|
* @author Ladybird <info@ladybirdweb.com>
|
||||||
*/
|
*/
|
||||||
class FormController extends Controller {
|
class FormController extends Controller
|
||||||
|
{
|
||||||
/**
|
/**
|
||||||
* Create a new controller instance.
|
* Create a new controller instance.
|
||||||
* Constructor to check.
|
* Constructor to check.
|
||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function __construct(TicketWorkflowController $TicketWorkflowController) {
|
public function __construct(TicketWorkflowController $TicketWorkflowController)
|
||||||
|
{
|
||||||
$this->middleware('board');
|
$this->middleware('board');
|
||||||
// creating a TicketController instance
|
// creating a TicketController instance
|
||||||
$this->TicketWorkflowController = $TicketWorkflowController;
|
$this->TicketWorkflowController = $TicketWorkflowController;
|
||||||
@@ -56,7 +57,8 @@ class FormController extends Controller {
|
|||||||
*
|
*
|
||||||
* @return type
|
* @return type
|
||||||
*/
|
*/
|
||||||
public function getForm(Help_topic $topic, CountryCode $code) {
|
public function getForm(Help_topic $topic, CountryCode $code)
|
||||||
|
{
|
||||||
if (\Config::get('database.install') == '%0%') {
|
if (\Config::get('database.install') == '%0%') {
|
||||||
return \Redirect::route('licence');
|
return \Redirect::route('licence');
|
||||||
}
|
}
|
||||||
@@ -90,13 +92,13 @@ class FormController extends Controller {
|
|||||||
*
|
*
|
||||||
* @return type string
|
* @return type string
|
||||||
*/
|
*/
|
||||||
public function postForm($id, Help_topic $topic) {
|
public function postForm($id, Help_topic $topic)
|
||||||
|
{
|
||||||
if ($id != 0) {
|
if ($id != 0) {
|
||||||
$helptopic = $topic->where('id', '=', $id)->first();
|
$helptopic = $topic->where('id', '=', $id)->first();
|
||||||
$custom_form = $helptopic->custom_form;
|
$custom_form = $helptopic->custom_form;
|
||||||
$values = Fields::where('forms_id', '=', $custom_form)->get();
|
$values = Fields::where('forms_id', '=', $custom_form)->get();
|
||||||
if (!$values) {
|
if (!$values) {
|
||||||
|
|
||||||
}
|
}
|
||||||
if ($values) {
|
if ($values) {
|
||||||
foreach ($values as $form_data) {
|
foreach ($values as $form_data) {
|
||||||
@@ -142,7 +144,8 @@ class FormController extends Controller {
|
|||||||
* @param type Request $request
|
* @param type Request $request
|
||||||
* @param type User $user
|
* @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 {
|
try {
|
||||||
$form_extras = $request->except('Name', 'Phone', 'Email', 'Subject', 'Details', 'helptopic', '_wysihtml5_mode', '_token', 'mobile', 'Code', 'priority', 'attachment');
|
$form_extras = $request->except('Name', 'Phone', 'Email', 'Subject', 'Details', 'helptopic', '_wysihtml5_mode', '_token', 'mobile', 'Code', 'priority', 'attachment');
|
||||||
$name = $request->input('Name');
|
$name = $request->input('Name');
|
||||||
@@ -255,7 +258,8 @@ class FormController extends Controller {
|
|||||||
*
|
*
|
||||||
* @return type view
|
* @return type view
|
||||||
*/
|
*/
|
||||||
public function post_ticket_reply($id, Request $request) {
|
public function post_ticket_reply($id, Request $request)
|
||||||
|
{
|
||||||
try {
|
try {
|
||||||
if ($comment != null) {
|
if ($comment != null) {
|
||||||
$tickets = Tickets::where('id', '=', $id)->first();
|
$tickets = Tickets::where('id', '=', $id)->first();
|
||||||
@@ -295,7 +299,8 @@ class FormController extends Controller {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getCustomForm(Request $request) {
|
public function getCustomForm(Request $request)
|
||||||
|
{
|
||||||
$html = '';
|
$html = '';
|
||||||
$helptopic_id = $request->input('helptopic');
|
$helptopic_id = $request->input('helptopic');
|
||||||
$helptopics = new Help_topic();
|
$helptopics = new Help_topic();
|
||||||
@@ -313,5 +318,4 @@ class FormController extends Controller {
|
|||||||
|
|
||||||
return $html;
|
return $html;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user