Users exportdata without sensitive fields has been fixed and respective module...

Users exportdata without sensitive fields has been fixed and respective module export is navigated to particular module ExportData api

layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl

@@ -148,7 +148,7 @@
 												<a	{if stripos($SETTING->getUrl(), 'javascript:') === 0}
 														onclick='{$SETTING->getUrl()|substr:strlen("javascript:")};'
 													{else}
-														onclick='window.location.href="{$SETTING->getUrl()}"'
+														href="{$SETTING->getUrl()}"
 													{/if}>
 													{vtranslate($SETTING->getLabel(), $QUALIFIEDMODULE)}</a>
 											</li>

modules/Calendar/actions/ExportData.php

@@ -44,6 +44,7 @@ class Calendar_ExportData_Action extends Vtiger_ExportData_Action {
 	 * @param Vtiger_Request $request
 	 */
 	public function ExportData(Vtiger_Request $request) {
+		$this->moduleCall = true;
 		if ($request->get('type') == 'csv') {
 			parent::ExportData($request);
 			return;

modules/Users/actions/ExportData.php

@@ -31,6 +31,7 @@ class Users_ExportData_Action extends Vtiger_ExportData_Action {
 	 * @param Vtiger_Request $request
 	 */
 	function ExportData(Vtiger_Request $request) {
+		$this->moduleCall = true;
 		$db = PearDatabase::getInstance();
 		$moduleName = $request->get('source_module');
 		if ($moduleName) {
@@ -72,5 +73,8 @@ class Users_ExportData_Action extends Vtiger_ExportData_Action {
 		$queryGenerator->setFields($acceptedFields);
 		return $queryGenerator->getQuery();
 	}
-
+	
+	public function validateRequest(Vtiger_Request $request) {
+        $request->validateReadAccess();
+    }
 }

modules/Vtiger/actions/ExportData.php

@@ -10,6 +10,7 @@
 
 class Vtiger_ExportData_Action extends Vtiger_Mass_Action {
 
+	var $moduleCall = false;
 	function checkPermission(Vtiger_Request $request) {
 		$moduleName = $request->getModule();
 		$sourceModule = $request->get('source_module');
@@ -49,6 +50,13 @@ class Vtiger_ExportData_Action extends Vtiger_Mass_Action {
 		$query = $this->getExportQuery($request);
 		$result = $db->pquery($query, array());
 
+		$redirectedModules = array('Users', 'Calendar');
+		if($request->getModule() != $moduleName && in_array($moduleName, $redirectedModules) && !$this->moduleCall){
+			$handlerClass = Vtiger_Loader::getComponentClassName('Action', 'ExportData', $moduleName);
+			$handler = new $handlerClass();
+			$handler->ExportData($request);
+			return;
+		}
 		$translatedHeaders = $this->getHeaders();
 		$entries = array();
 		for ($j = 0; $j < $db->num_rows($result); $j++) {