X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContact%2FImport%2FForm%2FMapField.php;h=a6e0823133275194645c437e6b98362225bb3912;hb=51ccfbbea3adab11200800e01f1233cddc7e5272;hp=f242eea60519b18283d72933ce37bfa0a362e79f;hpb=00be918220e9ac8f6d25d12ed3c9c49fddd07ff7;p=civicrm-core.git diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php index f242eea605..a6e0823133 100644 --- a/CRM/Contact/Import/Form/MapField.php +++ b/CRM/Contact/Import/Form/MapField.php @@ -44,7 +44,6 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { * formatted custom field names. * * @var array - * @access protected */ protected $_formattedFieldNames; @@ -67,7 +66,6 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { * @param mapperFields * * @return string - * @access public */ public function defaultFromColumnName($columnName, &$patterns) { @@ -96,7 +94,6 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { * Set variables up before form is built * * @return void - * @access public */ public function preProcess() { $dataSource = $this->get('dataSource'); @@ -202,7 +199,6 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { * Build the form object * * @return void - * @access public */ public function buildQuickForm() { //to save the current mappings @@ -624,11 +620,11 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { /** * Global validation rules for the form * - * @param array $fields posted values of the form + * @param array $fields + * Posted values of the form. * * @return array list of errors to be posted back to the form * @static - * @access public */ public static function formRule($fields) { $errors = array(); @@ -665,7 +661,6 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { * preview the file and extract some summary statistics * * @return void - * @access public */ public function postProcess() { $params = $this->controller->exportValues('MapField'); @@ -704,11 +699,15 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { ); //set respective mapper params to array. - foreach (array_keys($mapperParams) as $mapperParam)$$mapperParam = array(); + foreach (array_keys($mapperParams) as $mapperParam) { + $$mapperParam = array(); + } for ($i = 0; $i < $this->_columnCount; $i++) { //set respective mapper value to null - foreach (array_values($mapperParams) as $mapperParam)$$mapperParam = NULL; + foreach (array_values($mapperParams) as $mapperParam) { + $$mapperParam = NULL; + } $fldName = CRM_Utils_Array::value(0, $mapperKeys[$i]); $selOne = CRM_Utils_Array::value(1, $mapperKeys[$i]); @@ -818,7 +817,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { for ($i = 0; $i < $this->_columnCount; $i++) { $updateMappingFields = new CRM_Core_DAO_MappingField(); - $updateMappingFields->id = CRM_Utils_Array::value($i,$mappingFieldsId); + $updateMappingFields->id = CRM_Utils_Array::value($i, $mappingFieldsId); $updateMappingFields->mapping_id = $params['mappingId']; $updateMappingFields->column_number = $i; @@ -983,7 +982,6 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { * @param $fields * * @return void - * @access public */ public function formatCustomFieldName(&$fields) { //CRM-2676, replacing the conflict for same custom field name from different custom group. @@ -1009,4 +1007,3 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { return $formattedFieldNames; } } -