PDFテンプレートモジュールにモジュール無効化やプロファイル設定で制限をかけてもアクセスができる不具合の修正

thinkingreed-inc · Mar 7, 2024 · a7911d8 · a7911d8
1 parent deb47c1
commit a7911d8
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 40 deletions.
diff --git a/include/utils/UserInfoUtil.php b/include/utils/UserInfoUtil.php
@@ -582,7 +582,11 @@ function isPermitted($module,$actionname,$record_id='')
 			$permission = "yes";
 		}
 	}else {
-		$permission = "no";
+		if($module === 'PDFTemplates' && $profileTabsPermission[$tabid] === 0) {
+			$permission = "yes";
+		}else {
+			$permission = "no";
+		}
 	}
 
 	$log->debug("Exiting isPermitted method ...");

diff --git a/modules/PDFTemplates/views/Detail.php b/modules/PDFTemplates/views/Detail.php
@@ -10,19 +10,16 @@
 
 class PDFTemplates_Detail_View extends Vtiger_Index_View {
 
-    public function requiresPermission(\Vtiger_Request $request) {
-		return array();
-	}
-
-    public function checkPermission($request) {
+	public function checkPermission($request) {
         $moduleName = $request->getModule();
 		$moduleModel = Vtiger_Module_Model::getInstance($moduleName);
-        if(!$moduleModel->isActive()){
-            return false;
-        }
-        return true;
+		if($moduleModel->isActive()) {
+			return parent::checkPermission($request);
+		}
+
+		throw new AppException(vtranslate('LBL_PERMISSION_DENIED'));
     }
-    
+
 	function preProcess(Vtiger_Request $request, $display=true) {
 		parent::preProcess($request, false);
 

diff --git a/modules/PDFTemplates/views/Edit.php b/modules/PDFTemplates/views/Edit.php
@@ -10,19 +10,16 @@
 
 Class PDFTemplates_Edit_View extends Vtiger_Index_View {
 
-	public function requiresPermission(\Vtiger_Request $request) {
-		return array();
-	}
-
-    public function checkPermission($request) {
+	public function checkPermission($request) {
         $moduleName = $request->getModule();
 		$moduleModel = Vtiger_Module_Model::getInstance($moduleName);
-        if(!$moduleModel->isActive()){
-            return false;
-        }
-        return true;
+		if($moduleModel->isActive()) {
+			return parent::checkPermission($request);
+		}
+
+		throw new AppException(vtranslate('LBL_PERMISSION_DENIED'));
     }
-    
+
     public function preProcess(Vtiger_Request $request, $display = true) {
 		$record = $request->get('record');
 		if (!empty($record)) {

diff --git a/modules/PDFTemplates/views/List.php b/modules/PDFTemplates/views/List.php
@@ -14,19 +14,16 @@ function __construct() {
 		parent::__construct();
 	}
 
-    public function requiresPermission(\Vtiger_Request $request) {
-		return array();
-	}
-
-    public function checkPermission($request) {
+	public function checkPermission($request) {
         $moduleName = $request->getModule();
 		$moduleModel = Vtiger_Module_Model::getInstance($moduleName);
-        if(!$moduleModel->isActive()){
-            return false;
-        }
-        return true;
+		if($moduleModel->isActive()) {
+			return parent::checkPermission($request);
+		}
+
+		throw new AppException(vtranslate('LBL_PERMISSION_DENIED'));
     }
-    
+
 	function preProcess(Vtiger_Request $request, $display = true) {
 		parent::preProcess($request, false);
 

diff --git a/modules/PDFTemplates/views/Popup.php b/modules/PDFTemplates/views/Popup.php
@@ -10,18 +10,16 @@
 
 class PDFTemplates_Popup_View extends Vtiger_Popup_View {
 
-	public function requiresPermission(\Vtiger_Request $request) {
-		return array();
-	}
-
-    public function checkPermission($request) {
+	public function checkPermission($request) {
         $moduleName = $request->getModule();
 		$moduleModel = Vtiger_Module_Model::getInstance($moduleName);
-        if(!$moduleModel->isActive()){
-            return false;
-        }
-        return true;
+		if($moduleModel->isActive()) {
+			return parent::checkPermission($request);
+		}
+
+		throw new AppException(vtranslate('LBL_PERMISSION_DENIED'));
     }
+
 	/*
 	 * Function to initialize the required data in smarty to display the List View Contents
 	 */