fix(WebService) catch invalid module error

tsolucio · Aug 7, 2022 · daca0ac · daca0ac
1 parent fee5f75
commit daca0ac
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/include/Webservices/GetViewsByModule.php b/include/Webservices/GetViewsByModule.php
@@ -21,16 +21,23 @@ function getViewsByModule($module, $user) {
 	$result = array();
 	$types = vtws_listtypes(null, $user);
 	foreach ($modules as $module) {
-		// pickup meta data of module
-		$webserviceObject = VtigerWebserviceObject::fromName($adb, $module);
-		$handlerPath = $webserviceObject->getHandlerPath();
-		$handlerClass = $webserviceObject->getHandlerClass();
-		require_once $handlerPath;
-		$handler = new $handlerClass($webserviceObject, $user, $adb, $log);
-		$meta = $handler->getMeta();
-		$mainModule = $meta->getTabName();  // normalize module name
-		// check modules
-		if (!$meta->isModuleEntity()) {
+		try {
+			// pickup meta data of module
+			$webserviceObject = VtigerWebserviceObject::fromName($adb, $module);
+			$handlerPath = $webserviceObject->getHandlerPath();
+			$handlerClass = $webserviceObject->getHandlerClass();
+			require_once $handlerPath;
+			$handler = new $handlerClass($webserviceObject, $user, $adb, $log);
+			$meta = $handler->getMeta();
+			$mainModule = $meta->getTabName();  // normalize module name
+			// check modules
+			if (!$meta->isModuleEntity()) {
+				if ($isMoreThanOne) {
+					continue;
+				}
+				throw new WebServiceException('INVALID_MODULE', "Given module ($module) cannot be found");
+			}
+		} catch (\Throwable $th) {
 			if ($isMoreThanOne) {
 				continue;
 			}