Fix Zend module SQL upgrade (#6809)

* Fix Zend module SQL upgrade add custom module pathing * more pathing
openemr · Aug 31, 2023 · 4f52c1c · 4f52c1c
1 parent 089daca
commit 4f52c1c
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/...ce/modules/zend_modules/module/Installer/src/Installer/Controller/InstallerController.php b/...ce/modules/zend_modules/module/Installer/src/Installer/Controller/InstallerController.php
@@ -268,11 +268,11 @@ public function configureAction()
         //INSERT MODULE HOOKS IF NOT EXISTS
         $moduleDirectory = $this->getInstallerTable()->getModuleDirectory($modId);
         //GET MODULE HOOKS FROM A FUNCTION IN CONFIGURATION MODEL CLASS
-        $hooksArr = $this->getInstallerTable()->getModuleHooks($moduleDirectory);
+        $hooksArr = $this->getInstallerTable()->getModuleHooks($moduleDirectory) ?: [];
 
         if (count($hooksArr) > 0) {
             foreach ($hooksArr as $hook) {
-                if (count($hook) > 0) {
+                if (count($hook ?? []) > 0) {
                     if ($this->getInstallerTable()->checkModuleHookExists($modId, $hook['name']) == "0") {
                         $this->getInstallerTable()->saveModuleHooks($modId, $hook['name'], $hook['title'], $hook['path']);
                     }
@@ -375,7 +375,9 @@ function getModuleVersionFromFile($modId)
         //SQL version of Module
         $dirModule = $this->getInstallerTable()->getRegistryEntry($modId, "mod_directory");
         $ModulePath = $GLOBALS['srcdir'] . "/../" . $GLOBALS['baseModDir'] . "zend_modules/module/" . $dirModule->modDirectory;
-
+        if (!is_dir($ModulePath)) {
+            $ModulePath = $GLOBALS['srcdir'] . "/../" . $GLOBALS['baseModDir'] . "custom_modules/" . $dirModule->modDirectory;
+        }
         $version_of_module = $ModulePath . "/version.php";
         $table_sql = $ModulePath . "/table.sql";
         $install_sql = $ModulePath . "/sql/install.sql";
@@ -424,14 +426,21 @@ public function makeButtonForSqlAction(InstModule $mod)
         if (!is_dir($sqldir)) {
             $sqldir = $ModulePath;
         }
+        if (!is_dir($sqldir)) {
+            $ModulePath = $GLOBALS['srcdir'] . "/../" . $GLOBALS['baseModDir'] . "custom_modules/" . $dirModule->modDirectory;
+            $sqldir = $ModulePath . "/sql";
+            if (!is_dir($sqldir)) {
+                $sqldir = $ModulePath;
+            }
+        }
         $mod->sql_action = "";
 
         if (file_exists($sqldir . "/install.sql") && file_exists($ModulePath . "/version.php") && empty($mod->sql_version)) {
             $mod->sql_action = "install";
         }
 
         if (!empty($mod->sql_version) && $mod->sqlRun == 1) {
-            $versions = $this->getFilesForUpgrade($mod->modDirectory, $sqldir);
+            $versions = $this->getFilesForUpgrade($mod->modDirectory, $sqldir) ?: [];
 
             if (count($versions) > 0) {
                 foreach ($versions as $version => $sfname) {
@@ -561,7 +570,7 @@ public function UpgradeModuleSQL($modId = '')
                     $div[] = $string;
                     $add_query_string++;
                 }
-                if (count($matches[1]) == (count($div) - $add_ended_divs) && (!$prev_html_tag && !$curr_html_tag)) {
+                if (count($matches[1]) == (count($div ?? []) - $add_ended_divs) && (!$prev_html_tag && !$curr_html_tag)) {
                     $div[] = "</div>";
                 }
                 $k++;
@@ -626,7 +635,7 @@ public function DisableModule($modId = '')
         $resp = $this->getInstallerTable()->updateRegistered($modId, "mod_active=1");
         if ($resp['status'] == 'failure' && $resp['code'] == '200') {
             $plural = "Module";
-            if (count($resp['value']) > 1) {
+            if (count($resp['value'] ?? []) > 1) {
                 $plural = "Modules";
             }