ItGuild/igfs
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some fix

Browse Source
This commit is contained in:
Kavalar 2024-11-05 13:24:04 +03:00
parent f7838ea665
commit b9e1a5382b
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/modules/module_shop/controllers/ModuleShopController.php
View File

@ -5,7 +5,6 @@ namespace app\modules\module_shop\controllers;
use app\modules\module_shop\models\forms\CreateModuleShopForm; use app\modules\module_shop\models\forms\CreateModuleShopForm;
use app\modules\module_shop\models\ModuleShop; use app\modules\module_shop\models\ModuleShop;
use app\modules\module_shop\services\ModuleShopService; use app\modules\module_shop\services\ModuleShopService;
use Cassandra\Date;
use JetBrains\PhpStorm\NoReturn; use JetBrains\PhpStorm\NoReturn;
use kernel\AdminController; use kernel\AdminController;
use kernel\app_modules\tag\services\TagService; use kernel\app_modules\tag\services\TagService;
@ -13,7 +12,6 @@ use kernel\FileUpload;
use kernel\Flash; use kernel\Flash;
use kernel\helpers\Debug; use kernel\helpers\Debug;
use kernel\services\ModuleService; use kernel\services\ModuleService;
use mysql_xdevapi\Exception;
use ZipArchive; use ZipArchive;
class ModuleShopController extends AdminController class ModuleShopController extends AdminController
@ -41,7 +39,7 @@ class ModuleShopController extends AdminController
$moduleShopForm->load($_REQUEST); $moduleShopForm->load($_REQUEST);
if (isset($_FILES['path_to_archive']) && $_FILES['path_to_archive']['error'] === UPLOAD_ERR_OK) { if (isset($_FILES['path_to_archive']) && $_FILES['path_to_archive']['error'] === UPLOAD_ERR_OK) {
$file = new FileUpload($_FILES['path_to_archive'], ['zip', 'rar', 'itguild']); $file = new FileUpload($_FILES['path_to_archive'], ['zip', 'rar', 'igm']);
$file->upload(); $file->upload();
$moduleShopForm->setItem('path_to_archive', $file->getUploadFile()); $moduleShopForm->setItem('path_to_archive', $file->getUploadFile());
} }
@ -90,7 +88,7 @@ class ModuleShopController extends AdminController
$module = ModuleShop::find($id); $module = ModuleShop::find($id);
if (!$module) { if (!$module) {
throw new Exception("The module not found"); throw new \Exception("The module not found");
} }
$this->cgView->render("view.php", ['module' => $module]); $this->cgView->render("view.php", ['module' => $module]);
} }
@ -100,7 +98,7 @@ class ModuleShopController extends AdminController
{ {
$module = ModuleShop::find($id); $module = ModuleShop::find($id);
if (!$module) { if (!$module) {
throw new Exception("The module not found"); throw new \Exception("The module not found");
} }
$name = $module->name; $name = $module->name;
@ -113,7 +111,7 @@ class ModuleShopController extends AdminController
{ {
$module = ModuleShop::find($id); $module = ModuleShop::find($id);
if (!$module) { if (!$module) {
throw new Exception("The module not found"); throw new \Exception("The module not found");
} }
$this->moduleShopService->packModule($module); $this->moduleShopService->packModule($module);
} }

4
kernel/helpers/Files.php
View File

@ -82,11 +82,11 @@ class Files
if(is_dir($include)) { if(is_dir($include)) {
if ($include->getFilename() === 'app_modules') continue; if ($include->getFilename() === 'app_modules') continue;
$tmpFolder = $folder . '/' . $include->getFilename() . '/'; $tmpFolder = $folder . '/' . $include->getFilename();
$this->recursiveAddFile($zip, $include, $tmpFolder); $this->recursiveAddFile($zip, $include, $tmpFolder);
} }
if (is_file($include)) { if (is_file($include)) {
$zip->addFile($include->getPathName(), $folder . $include->getFilename()); $zip->addFile($include->getPathName(), $folder . "/" . $include->getFilename());
} }
} }
} }

2
kernel/modules/post/manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name": "Post", "name": "Post",
"version": "0.1", "version": "0.2",
"author": "ITGuild", "author": "ITGuild",
"slug": "post", "slug": "post",
"description": "Post module", "description": "Post module",

11
kernel/services/ModuleService.php
View File

@ -342,15 +342,20 @@ class ModuleService
$tmpModuleDirFull = RESOURCES_DIR . '/tmp/ad/' . $moduleName . "/"; $tmpModuleDirFull = RESOURCES_DIR . '/tmp/ad/' . $moduleName . "/";
$fileHelper = new Files(); $fileHelper = new Files();
$fileHelper->copy_folder(APP_DIR . '/modules/' . $moduleName, $tmpModuleDirFull . 'app/'); $fileHelper->copy_folder(ROOT_DIR . $path, $tmpModuleDirFull . 'app/');
$fileHelper->copy_folder(KERNEL_APP_MODULES_DIR . '/' . $moduleName, $tmpModuleDirFull . 'kernel/'); if (file_exists(KERNEL_APP_MODULES_DIR . '/' . $moduleName)){
$fileHelper->copy_folder(KERNEL_APP_MODULES_DIR . '/' . $moduleName, $tmpModuleDirFull . 'kernel/');
}
else {
mkdir($tmpModuleDirFull . 'kernel/');
}
if (!is_dir(RESOURCES_DIR . '/tmp/modules')) { if (!is_dir(RESOURCES_DIR . '/tmp/modules')) {
mkdir(RESOURCES_DIR . '/tmp/modules', 0777, true); mkdir(RESOURCES_DIR . '/tmp/modules', 0777, true);
} }
$fileHelper->pack($tmpModuleDirFull, RESOURCES_DIR . '/tmp/modules/' . $moduleName . '.igm'); $fileHelper->pack($tmpModuleDirFull, RESOURCES_DIR . '/tmp/modules/' . $moduleName . '.igm');
$fileHelper->recursiveRemoveDir($tmpModuleDirFull); //$fileHelper->recursiveRemoveDir($tmpModuleDirFull);
} }
/** /**