Merge branch 'master' into 38276053_checkPermission_Overall

modules/Settings/Leads/actions/MappingDelete.php

@@ -9,6 +9,12 @@
  *************************************************************************************/
 
 class Settings_Leads_MappingDelete_Action extends Settings_Vtiger_Index_Action {
+    
+    public function requiresPermission(\Vtiger_Request $request) {
+		$permissions = parent::requiresPermission($request);
+		$permissions[] = array('module_parameter' => 'module', 'action' => 'DetailView');
+		return $permissions;
+	}
 
 	public function process(Vtiger_Request $request) {
 		$recordId = $request->get('mappingId');

modules/Settings/Leads/actions/MappingSave.php

@@ -9,6 +9,12 @@
  *************************************************************************************/
 
 class Settings_Leads_MappingSave_Action extends Settings_Vtiger_Index_Action {
+    
+    public function requiresPermission(\Vtiger_Request $request) {
+		$permissions = parent::requiresPermission($request);
+		$permissions[] = array('module_parameter' => 'module', 'action' => 'DetailView');
+		return $permissions;
+	}
 
 	public function process(Vtiger_Request $request) {
 		$qualifiedModuleName = $request->getModule(false);

modules/Settings/Leads/views/MappingDetail.php

@@ -10,7 +10,7 @@
 
 class Settings_Leads_MappingDetail_View extends Settings_Vtiger_Index_View {
 
-    public function requiresPermission(\Vtiger_Request $request) {
+   public function requiresPermission(\Vtiger_Request $request) {
 		$permissions = parent::requiresPermission($request);
 		$permissions[] = array('module_parameter' => 'module', 'action' => 'DetailView');
 		return $permissions;

modules/Settings/Potentials/actions/MappingDelete.php

@@ -9,6 +9,12 @@
  *************************************************************************************/
 
 class Settings_Potentials_MappingDelete_Action extends Settings_Vtiger_Index_Action {
+    
+    public function requiresPermission(\Vtiger_Request $request) {
+		$permissions = parent::requiresPermission($request);
+		$permissions[] = array('module_parameter' => 'module', 'action' => 'DetailView');
+		return $permissions;
+	}
 
 	public function process(Vtiger_Request $request) {
 		$recordId = $request->get('mappingId');

modules/Settings/Potentials/actions/MappingSave.php

@@ -9,6 +9,12 @@
  *************************************************************************************/
 
 class Settings_Potentials_MappingSave_Action extends Settings_Vtiger_Index_Action {
+    
+    public function requiresPermission(\Vtiger_Request $request) {
+		$permissions = parent::requiresPermission($request);
+		$permissions[] = array('module_parameter' => 'module', 'action' => 'DetailView');
+		return $permissions;
+	}
 
 	public function process(Vtiger_Request $request) {
 		$qualifiedModuleName = $request->getModule(false);

modules/Settings/Potentials/views/MappingDetail.php

@@ -10,12 +10,10 @@
 
 class Settings_Potentials_MappingDetail_View extends Settings_Vtiger_Index_View {
 
-	function checkPermission(Vtiger_Request $request) {
-		parent::checkPermission($request);
-		$sourceModule = 'Potentials';
-		if(!vtlib_isModuleActive($sourceModule)){
-			throw new AppException(vtranslate('LBL_PERMISSION_DENIED', $sourceModule));
-		}
+	public function requiresPermission(\Vtiger_Request $request) {
+		$permissions = parent::requiresPermission($request);
+		$permissions[] = array('module_parameter' => 'module', 'action' => 'DetailView');
+		return $permissions;
 	}
 
 	public function process(Vtiger_Request $request) {

modules/Settings/Potentials/views/MappingEdit.php

@@ -10,6 +10,12 @@
 
 class Settings_Potentials_MappingEdit_View extends Settings_Vtiger_Index_View {
 
+    public function requiresPermission(\Vtiger_Request $request) {
+		$permissions = parent::requiresPermission($request);
+		$permissions[] = array('module_parameter' => 'module', 'action' => 'DetailView');
+		return $permissions;
+	}
+    
 	public function process(Vtiger_Request $request) {
 		$qualifiedModuleName = $request->getModule(false);
 		$viewer = $this->getViewer($request);

modules/Settings/Vtiger/models/ConfigModule.php

@@ -136,8 +136,12 @@ class Settings_Vtiger_ConfigModule_Model extends Settings_Vtiger_Module_Model {
 		$fileContent = $this->completeData;
 		$updatedFields = $this->get('updatedFields');
 		$validationInfo = $this->validateFieldValues($updatedFields);
+        $editableFields = $this->getEditableFields();
 		if ($validationInfo === true) {
 			foreach ($updatedFields as $fieldName => $fieldValue) {
+                if(!in_array($fieldName, array_keys($editableFields))){
+                    continue;
+                }
 				$patternString = "\$%s = '%s';";
 				if ($fieldName === 'upload_maxsize') {
 					$fieldValue = $fieldValue * 1048576; //(1024 * 1024)