FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add ability to launch acars for flight/bid #1272 (#1273)

Browse Source 
* Add ability to launch acars for flight/bid #1272

* Check for module active/inactive status

* Just some formatting
This commit is contained in:
Nabeel S
2021-08-06 14:53:04 -04:00
committed by GitHub
parent 95e1df619e
commit 564f9ec06e
3 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Services/ModuleService.php
View File

@@ -120,13 +120,14 @@ class ModuleService extends Service
*
* @return bool
*/
public function moduleActive(string $name): bool
public function isModuleActive(string $name): bool
{
$module = Module::where('name', $name);
if (!$module->exists()) {
$module = Module::where('name', $name)->first();
if (empty($module)) {
return false;
}
/** @var \Nwidart\Modules\Module $moduleInstance */
$moduleInstance = \Nwidart\Modules\Facades\Module::find($module->name);
if (empty($moduleInstance)) {
return false;
@@ -136,7 +137,7 @@ class ModuleService extends Service
return false;
}
return true;
return $moduleInstance->isEnabled();
}
/**
@@ -144,7 +145,7 @@ class ModuleService extends Service
*
* @param $id
*
* @return object
* @return Module
*/
public function getModule($id): Module
{
@@ -190,17 +191,14 @@ class ModuleService extends Service
*/
public function installModule(UploadedFile $file): FlashNotifier
{
$file_ext = $file->getClientOriginalExtension();
$file_ext = strtolower($file->getClientOriginalExtension());
$allowed_extensions = ['zip', 'tar', 'gz'];
if (!in_array($file_ext, $allowed_extensions, true)) {
throw new ModuleInvalidFileType();
}
$module = null;
$new_dir = rand();
File::makeDirectory(
storage_path('app/tmp/modules/'.$new_dir),
0777,