Merge branch '39806724_Security_Widgets_Generalized' into 'master'

Fixes #1149 ::Uma::Widgets security access has been generalized

See merge request !364

modules/Vtiger/dashboards/CalendarActivities.php

@@ -9,16 +9,6 @@
  *************************************************************************************/
 
 class Vtiger_CalendarActivities_Dashboard extends Vtiger_IndexAjax_View {
-	
-	function checkPermission(Vtiger_Request $request) {
-		$moduleName = 'Calendar';
-
-		$modulePermission = Users_Privileges_Model::isPermitted($moduleName, 'DetailView');
-		if(!$modulePermission) {
-			throw new AppException(vtranslate('LBL_PERMISSION_DENIED'));
-		}
-		return true;
-	}
 
 	public function process(Vtiger_Request $request) {
 		$currentUser = Users_Record_Model::getCurrentUserModel();

modules/Vtiger/views/ShowWidget.php

@@ -53,9 +53,15 @@ class Vtiger_ShowWidget_View extends Vtiger_IndexAjax_View {
 				}
 				$request->set('createdtime', $dates);
 				
-				$classInstance = new $className();
-				if($classInstance->checkPermission($request)){
+				if($componentName == 'CalendarActivities' || $componentName == 'OverdueActivities') {
+					$moduleName = 'Calendar';
+				}
+				$currentUserPrivilegeModel = Users_Privileges_Model::getCurrentUserPrivilegesModel();
+				if($currentUserPrivilegeModel->hasModulePermission(getTabid($moduleName)) && !Vtiger_Runtime::isRestricted('modules', $moduleName)){
+					$classInstance = new $className();
 					$classInstance->process($request, $widget);
+				}else{
+					throw new AppException(vtranslate('LBL_PERMISSION_DENIED'));
 				}
 				return;
 			}