forked from openemr/openemr
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request openemr#7248 from sjpadgett/modules_fixup
Module Manager Refactor
- Loading branch information
Showing
11 changed files
with
475 additions
and
317 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ | |
| * @author Vipin Kumar <[email protected]> | ||
| * @author Remesh Babu S <[email protected]> | ||
| * @author Jerry Padgett <[email protected]> | ||
| * @copyright Copyright (c) 2020 Jerry Padgett <[email protected]> | ||
| * @copyright Copyright (c) 2020-2024 Jerry Padgett <[email protected]> | ||
| * @copyright Copyright (c) 2013 Z&H Consultancy Services Private Limited <[email protected]> | ||
| * @license https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3 | ||
| */ | ||
|
|
@@ -50,6 +50,9 @@ public function __construct(InstModuleTable $installerTable) | |
| $this->dbAdapter = $adapter ?? null; | ||
| } | ||
|
|
||
| /** | ||
| * @return ViewModel | ||
| */ | ||
| public function nolayout() | ||
| { | ||
| // Turn off the layout, i.e. only render the view script. | ||
|
|
@@ -58,18 +61,21 @@ public function nolayout() | |
| return $viewModel; | ||
| } | ||
|
|
||
| /** | ||
| * @return ViewModel | ||
| */ | ||
| public function indexAction() | ||
| { | ||
| $this->scanAndRegisterCustomModules(); | ||
| //get the list of installed and new modules | ||
| $result = $this->getInstallerTable()->allModules(); | ||
|
|
||
| $allModules = array(); | ||
| foreach ($result as $dataArray) { | ||
| $mod = new InstModule(); | ||
| $mod->exchangeArray($dataArray); | ||
| $mod = $this->makeButtonForSqlAction($mod); | ||
| $mod = $this->makeButtonForAClAction($mod); | ||
| array_push($allModules, $mod); | ||
| $allModules[] = $mod; | ||
| } | ||
|
|
||
| return new ViewModel(array( | ||
|
|
@@ -82,6 +88,67 @@ public function indexAction() | |
| )); | ||
| } | ||
|
|
||
| /** | ||
| * @return void | ||
| */ | ||
| private function scanAndRegisterCustomModules(): void | ||
| { | ||
| $baseModuleDir = $GLOBALS['baseModDir']; | ||
| $customDir = $GLOBALS['customModDir']; | ||
| $zendModDir = $GLOBALS['zendModDir']; | ||
| $coreModules = ['Application', 'Acl', 'Installer', 'FHIR', 'PatientFlowBoard']; | ||
| $allModules = array(); | ||
|
|
||
| $result = $this->getInstallerTable()->allModules(); | ||
| foreach ($result as $dataArray) { | ||
| $mod = new InstModule(); | ||
| $mod->exchangeArray($dataArray); | ||
| $mod = $this->makeButtonForSqlAction($mod); | ||
| $mod = $this->makeButtonForAClAction($mod); | ||
| $allModules[] = $mod; | ||
| } | ||
|
|
||
| $dir_path = $GLOBALS['srcdir'] . "/../$baseModuleDir$customDir/"; | ||
| $dp = opendir($dir_path); | ||
| $inDirCustom = array(); | ||
| for ($i = 0; false != ($file_name = readdir($dp)); $i++) { | ||
| if ($file_name != "." && $file_name != ".." && $file_name != "Application" && is_dir($dir_path . $file_name)) { | ||
| $inDirCustom[$i] = $file_name; | ||
| } | ||
| } | ||
| /* Laminas directory Unregistered scan */ | ||
| $dir_path = $GLOBALS['srcdir'] . "/../$baseModuleDir$zendModDir/module"; | ||
| $dp = opendir($dir_path); | ||
| $inDirLaminas = array(); | ||
| for ($i = 0; false != ($file_name = readdir($dp)); $i++) { | ||
| if ($file_name != "." && $file_name != ".." && (!in_array($file_name, $coreModules)) && is_dir($dir_path . "/" . $file_name)) { | ||
| $inDirLaminas[$i] = $file_name; | ||
| } | ||
| } | ||
| // do not show registered modules in the unregistered list | ||
| if (sizeof($allModules) > 0) { | ||
| foreach ($allModules as $modules) { | ||
| $key = array_search($modules->modDirectory, $inDirLaminas); | ||
| if ($key !== false) { | ||
| unset($inDirLaminas[$key]); | ||
| continue; | ||
| } | ||
| $key = array_search($modules->modDirectory, $inDirCustom); | ||
| if ($key !== false) { | ||
| unset($inDirCustom[$key]); | ||
| } | ||
| } | ||
| } | ||
| foreach ($inDirLaminas as $file_name) { | ||
| $rel_path = $file_name . "/index.php"; | ||
| $status = $this->getInstallerTable()->register($file_name, $rel_path, 0, $zendModDir); | ||
| } | ||
| foreach ($inDirCustom as $file_name) { | ||
| $rel_path = $file_name . "/index.php"; | ||
| $status = $this->getInstallerTable()->register($file_name, $rel_path); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @return Installer\Model\InstModuleTable | ||
| */ | ||
|
|
@@ -90,6 +157,9 @@ public function getInstallerTable(): InstModuleTable | |
| return $this->InstallerTable; | ||
| } | ||
|
|
||
| /** | ||
| * @return void | ||
| */ | ||
| public function registerAction() | ||
| { | ||
| if (!AclMain::aclCheckCore('admin', 'manage_modules')) { | ||
|
|
@@ -126,6 +196,9 @@ public function registerAction() | |
| } | ||
| } | ||
|
|
||
| /** | ||
| * @return void | ||
| */ | ||
| public function manageAction() | ||
| { | ||
| if (!AclMain::aclCheckCore('admin', 'manage_modules')) { | ||
|
|
@@ -143,8 +216,13 @@ public function manageAction() | |
| // cleanup action. | ||
| if ($modType == InstModuleTable::MODULE_TYPE_CUSTOM) { | ||
| $status = $this->callModuleAfterAction("pre" . $request->getPost('modAction'), $modId, $dirModule, $status); | ||
| if ($status == 'bypass') { | ||
| // future use | ||
| if ($status == 'bypass_event') { | ||
| $output = ""; | ||
| if (!empty($div) && is_array($div)) { | ||
| $output = implode("<br />\n", $div); | ||
| } | ||
| echo json_encode(["status" => 'Success', "output" => $output]); | ||
| exit(0); | ||
| } | ||
| } | ||
| if ($request->getPost('modAction') == "enable") { | ||
|
|
@@ -283,6 +361,9 @@ private function getContent($data) | |
| return $string; | ||
| } | ||
|
|
||
| /** | ||
| * @return JsonModel | ||
| */ | ||
| public function SaveHooksAction() | ||
| { | ||
| $request = $this->getRequest(); | ||
|
|
@@ -305,6 +386,9 @@ public function SaveHooksAction() | |
| return $arr; | ||
| } | ||
|
|
||
| /** | ||
| * @return ViewModel | ||
| */ | ||
| public function configureAction() | ||
| { | ||
| $request = $this->getRequest(); | ||
|
|
@@ -377,6 +461,9 @@ public function configureAction() | |
| )); | ||
| } | ||
|
|
||
| /** | ||
| * @return JsonModel | ||
| */ | ||
| public function saveConfigAction() | ||
| { | ||
| $request = $this->getRequest(); | ||
|
|
@@ -396,6 +483,9 @@ public function saveConfigAction() | |
| return $return; | ||
| } | ||
|
|
||
| /** | ||
| * @return JsonModel | ||
| */ | ||
| public function DeleteAclAction() | ||
| { | ||
| $request = $this->getRequest(); | ||
|
|
@@ -405,6 +495,9 @@ public function DeleteAclAction() | |
| return $arr; | ||
| } | ||
|
|
||
| /** | ||
| * @return JsonModel | ||
| */ | ||
| public function DeleteHooksAction() | ||
| { | ||
| $request = $this->getRequest(); | ||
|
|
@@ -414,6 +507,9 @@ public function DeleteHooksAction() | |
| return $arr; | ||
| } | ||
|
|
||
| /** | ||
| * @return void | ||
| */ | ||
| public function nickNameAction() | ||
| { | ||
| $request = $this->getRequest(); | ||
|
|
@@ -422,6 +518,10 @@ public function nickNameAction() | |
| exit(0); | ||
| } | ||
|
|
||
| /** | ||
| * @param $modId | ||
| * @return false|string | ||
| */ | ||
| function getModuleVersionFromFile($modId) | ||
| { | ||
| //SQL version of Module | ||
|
|
@@ -442,6 +542,11 @@ function getModuleVersionFromFile($modId) | |
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * @param $modDirectory | ||
| * @param $sqldir | ||
| * @return array|false | ||
| */ | ||
| public function getFilesForUpgrade($modDirectory, $sqldir) | ||
| { | ||
| $ModulePath = $GLOBALS['srcdir'] . "/../" . $GLOBALS['baseModDir'] . "zend_modules/module/" . $modDirectory; | ||
|
|
@@ -470,6 +575,10 @@ public function getFilesForUpgrade($modDirectory, $sqldir) | |
| return $sortVersions; | ||
| } | ||
|
|
||
| /** | ||
| * @param InstModule $mod | ||
| * @return InstModule | ||
| */ | ||
| public function makeButtonForSqlAction(InstModule $mod) | ||
| { | ||
| $dirModule = $this->getInstallerTable()->getRegistryEntry($mod->modId, "mod_directory"); | ||
|
|
@@ -506,6 +615,10 @@ public function makeButtonForSqlAction(InstModule $mod) | |
| return $mod; | ||
| } | ||
|
|
||
| /** | ||
| * @param InstModule $mod | ||
| * @return InstModule | ||
| */ | ||
| public function makeButtonForACLAction(InstModule $mod) | ||
| { | ||
| $dirModule = $this->getInstallerTable()->getRegistryEntry($mod->modId, "mod_directory"); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ | |
| * @author Vipin Kumar <[email protected]> | ||
| * @author Remesh Babu S <[email protected]> | ||
| * @author Jerry Padgett <[email protected]> | ||
| * @copyright Copyright (c) 2020 Jerry Padgett <[email protected]> | ||
| * @copyright Copyright (c) 2020-2024 Jerry Padgett <[email protected]> | ||
| * @copyright Copyright (c) 2013 Z&H Consultancy Services Private Limited <[email protected]> | ||
| * @license https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3 | ||
| */ | ||
|
|
@@ -246,10 +246,6 @@ public function saveSettings($fieldName, $fieldValue, $moduleId) | |
| /** | ||
| * this will be used to register a module | ||
| * | ||
| * @param unknown_type $directory | ||
| * @param unknown_type $rel_path | ||
| * @param unknown_type $state | ||
| * @param unknown_type $base | ||
| * @return boolean | ||
| */ | ||
| public function register($directory, $rel_path, $state = 0, $base = "custom_modules") | ||
|
|
||
Oops, something went wrong.