Merge branch 'prega' into 'master'

Fix #664: Missed changes of Alert pre-requisite for CSV import ahead than silent failure

Fixed default csv selection import

See merge request !288

modules/Vtiger/views/Import.php

@@ -129,6 +129,13 @@ class Vtiger_Import_View extends Vtiger_Index_View {
 		}
 		//End
 
+		$fileFormat = $request->get('fileFormat');
+		if (!$fileFormat || !in_array($fileFormat, $supportedFileTypes)) {
+			$fileFormat = 'csv';
+		} else {
+			$fileFormat = strtolower($fileFormat);
+		}
+
 		// Pre-conditional check for CSV import.
 		if ($fileFormat == 'csv') {
 			$isLocalInfileEnabled = Vtiger_Util_Helper::checkDbLocalInfileSupport();
@@ -146,7 +153,7 @@ class Vtiger_Import_View extends Vtiger_Index_View {
 			$viewer->assign('CURRENCIES', getAllCurrencies());
 		}
 
-		$viewer->assign('FORMAT', $request->get('fileFormat'));
+		$viewer->assign('FORMAT', $fileFormat);
 		return $viewer->view('ImportBasicStep.tpl', 'Import');
 	}