stasbilay02/MicroFrameWork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: stasbilay02:5ec081022d3f9f236853d7f76214b0126757fde2
Branches Tags
stasbilay02:master
...
compare: stasbilay02:8eae9773572e21e5783c2cebbe7d9ad863dacbe6
Branches Tags
stasbilay02:master

3 Commits
5ec081022d ... 8eae977357

Author SHA1 Message Date
Kavalar
8eae977357 module service fix 2024-10-25 16:36:48 +03:00
Kavalar
42aca3c1c0 Merge branch 'master' of https://git.itguild.info/stasbilay02/MicroFrameWork 2024-10-25 16:09:33 +03:00
Kavalar
0ca330a9f0 merge 2024-10-25 16:09:26 +03:00
4 changed files with 12 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
app/modules/tag/manifest.json
View File

@ -1,6 +1,6 @@
{ {
"name": "Tags", "name": "Tags",
"version": "0.1", "version": "0.2",
"author": "ITGuild", "author": "ITGuild",
"slug": "tag", "slug": "tag",
"description": "Tags module", "description": "Tags 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",

9
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/');
if (file_exists(KERNEL_APP_MODULES_DIR . '/' . $moduleName)){
$fileHelper->copy_folder(KERNEL_APP_MODULES_DIR . '/' . $moduleName, $tmpModuleDirFull . 'kernel/'); $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);
} }
/** /**