cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #368 from ladybirdweb/analysis-X0yOKm

Browse Source 
Apply fixes from StyleCI
This commit is contained in:
Manish Verma
2017-01-05 17:26:17 +05:30
committed by GitHub
parent f99aa6f185 673e549bae
commit 108577c738
3 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Kernel.php
View File

@@ -30,7 +30,7 @@ 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();
} }
$this->execute($schedule, 'fetching'); $this->execute($schedule, 'fetching');

29
app/FaveoStorage/Controllers/SettingsController.php
View File

@@ -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,14 @@ 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')) {
$path = 'app'.DIRECTORY_SEPARATOR.'FaveoStorage'.DIRECTORY_SEPARATOR.'database'.DIRECTORY_SEPARATOR.'migrations'; $path = 'app'.DIRECTORY_SEPARATOR.'FaveoStorage'.DIRECTORY_SEPARATOR.'database'.DIRECTORY_SEPARATOR.'migrations';
Artisan::call('migrate', [ Artisan::call('migrate', [
@@ -117,5 +125,4 @@ class SettingsController extends Controller {
]); ]);
} }
} }
} }

7
app/Http/Controllers/Admin/helpdesk/TemplateController.php
View File

@@ -327,16 +327,17 @@ class TemplateController extends Controller
throw new Exception('Sorry! We can not find your request'); throw new Exception('Sorry! We can not find your request');
} }
$to_address = [ $to_address = [
'name' => "", 'name' => '',
'email' => $to 'email' => $to,
]; ];
$message = [ $message = [
'subject' => $subject, 'subject' => $subject,
'scenario' => null, 'scenario' => null,
'body' => $msg 'body' => $msg,
]; ];
$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());