From 5003f9ab1d8969a2244f4e8e7a1a337747984bb4 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 12 Apr 2022 14:49:22 +1200
Subject: [PATCH] Simplify more variables

---
 CRM/Contribute/Import/Form/MapField.php | 3 ++-
 CRM/Event/Import/Form/MapField.php      | 7 +------
 CRM/Import/Form/DataSource.php          | 5 ++---
 CRM/Import/Forms.php                    | 3 +++
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/CRM/Contribute/Import/Form/MapField.php b/CRM/Contribute/Import/Form/MapField.php
index 5297f4fd5b..10c4144cb1 100644
--- a/CRM/Contribute/Import/Form/MapField.php
+++ b/CRM/Contribute/Import/Form/MapField.php
@@ -144,7 +144,8 @@ class CRM_Contribute_Import_Form_MapField extends CRM_Import_Form_MapField {
    * @throws \CiviCRM_API3_Exception
    */
   public function buildQuickForm() {
-    $savedMappingID = $this->get('savedMapping');
+    $savedMappingID = $this->getSubmittedValue('savedMapping');
+
     $this->buildSavedMappingFields($savedMappingID);
 
     $this->addFormRule([
diff --git a/CRM/Event/Import/Form/MapField.php b/CRM/Event/Import/Form/MapField.php
index 10cb022d38..239769addc 100644
--- a/CRM/Event/Import/Form/MapField.php
+++ b/CRM/Event/Import/Form/MapField.php
@@ -366,11 +366,6 @@ class CRM_Event_Import_Form_MapField extends CRM_Import_Form_MapField {
       return;
     }
 
-    $fileName = $this->controller->exportValue('DataSource', 'uploadFile');
-    $separator = $this->controller->exportValue('DataSource', 'fieldSeparator');
-    $skipColumnHeader = $this->controller->exportValue('DataSource', 'skipColumnHeader');
-
-    $mapperKeys = [];
     $mapper = [];
     $mapperKeys = $this->controller->exportValue($this->_name, 'mapper');
     $mapperKeysMain = [];
@@ -429,7 +424,7 @@ class CRM_Event_Import_Form_MapField extends CRM_Import_Form_MapField {
     }
 
     $parser = new CRM_Event_Import_Parser_Participant($mapperKeysMain);
-    $parser->run($fileName, $separator, $mapper, $skipColumnHeader,
+    $parser->run($this->getSubmittedValue('uploadFile'), $this->getSubmittedValue('fieldSeparator'), $mapper, $this->getSubmittedValue('skipColumnHeader'),
       CRM_Import_Parser::MODE_PREVIEW, $this->get('contactType')
     );
     // add all the necessary variables to the form
diff --git a/CRM/Import/Form/DataSource.php b/CRM/Import/Form/DataSource.php
index 78c7d2c35b..29370472bb 100644
--- a/CRM/Import/Form/DataSource.php
+++ b/CRM/Import/Form/DataSource.php
@@ -132,8 +132,7 @@ abstract class CRM_Import_Form_DataSource extends CRM_Import_Forms {
    */
   protected function submitFileForMapping($parserClassName, $entity = NULL) {
     $this->controller->resetPage('MapField');
-    $session = CRM_Core_Session::singleton();
-    $session->set("dateTypes", $this->get('dateFormats'));
+    CRM_Core_Session::singleton()->set('dateTypes', $this->getSubmittedValue('dateFormats'));
 
     $mapper = [];
 
@@ -148,7 +147,7 @@ abstract class CRM_Import_Form_DataSource extends CRM_Import_Forms {
       [],
       $this->getSubmittedValue('skipColumnHeader'),
       CRM_Import_Parser::MODE_MAPFIELD,
-      $this->get('contactType')
+      $this->getSubmittedValue('contactType')
     );
 
     // add all the necessary variables to the form
diff --git a/CRM/Import/Forms.php b/CRM/Import/Forms.php
index 2e08493e39..69f683774d 100644
--- a/CRM/Import/Forms.php
+++ b/CRM/Import/Forms.php
@@ -31,6 +31,9 @@ class CRM_Import_Forms extends CRM_Core_Form {
       'skipColumnHeader' => 'DataSource',
       'fieldSeparator' => 'DataSource',
       'uploadFile' => 'DataSource',
+      'contactType' => 'DataSource',
+      'dateFormats' => 'DataSource',
+      'savedMapping' => 'DataSource',
     ];
     if (array_key_exists($fieldName, $mappedValues)) {
       return $this->controller->exportValue($mappedValues[$fieldName], $fieldName);
-- 
2.25.1