Merge pull request #4770 from AllskyTeam/4768-module-manager-failing-due-to-corrupted-module

#4768 Fix for modules with corrupt or missing metadata

Author: EricClaeys

html/includes/moduleutil.php

@@ -106,19 +106,31 @@ private function readModuleData($moduleDirectory, $type, $event) {
                         }
 
                         $decoded = json_decode($metaData);
-                        if (in_array($event, $decoded->events)) {
-                            if (isset($decoded->experimental)) {
-                                $experimental = strtolower($decoded->experimental) == "true"? true: false;
-                            } else {
-                                $experimental = false;
+                        if ($decoded !== null) {
+                            if (in_array($event, $decoded->events)) {
+                                if (isset($decoded->experimental)) {
+                                    $experimental = strtolower($decoded->experimental) == "true"? true: false;
+                                } else {
+                                    $experimental = false;
+                                }
+
+                                $arrFiles[$entry] = [
+                                    'module' => $entry,
+                                    'metadata' => $decoded,
+                                    'type' => $type
+                                ];
+                                $arrFiles[$entry]['metadata']->experimental = $experimental;
                             }
-
+                        } else {
+                            $decoded = new stdClass();
+                            $decoded->name = "Module " . $entry . " is currupted";
+                            $decoded->description = "The metadata in the module file is invalid. Please contact Allsky support.";
+                            $decoded->events = ["day", "night", "periodic", "daynight", "nightday"];
                             $arrFiles[$entry] = [
                                 'module' => $entry,
                                 'metadata' => $decoded,
                                 'type' => $type
-                            ];
-                            $arrFiles[$entry]['metadata']->experimental = $experimental;
+                            ];                         
                         }
                     }
                 }
@@ -252,7 +264,9 @@ private function readModules() {
         $selectedResult = [];
         foreach($configData as $selectedName=>$data) {
             $moduleName = "allsky_" . $selectedName . ".py";
-            // TODO: check if  $allModules[$moduleName]  exists.
+            if (!isset($allModules[$moduleName])) {
+                continue;
+            }
             $moduleData = $allModules[$moduleName];
 
             if (isset($data->metadata->arguments)) {
@@ -402,3 +416,4 @@ public function getReset() {
 
 $overlayUtil = new MODULEUTIL();
 $overlayUtil->run();
+