dev/core#2164 Exporting in localized civicrm crashes due to long translations in columns T_Boolean

CRM/Contact/Form/DedupeRules.php

@@ -140,11 +140,11 @@ public static function formRule($fields, $files, $self) {
     for ($count = 0; $count < self::RULES_COUNT; $count++) {
       if (!empty($fields["where_$count"]) || (isset($self->_defaults['is_reserved']) && !empty($self->_defaults["where_$count"]))) {
         $fieldSelected = TRUE;
+        if (!empty($fields["weight_$count"])) {
+          $actualThreshold += $fields["weight_$count"];
+        }
         break;
       }
-      if (!empty($self->_defaults["weight_$count"])) {
-        $actualThreshold += $self->_defaults["weight_$count"];
-      }
     }
     if (empty($fields['threshold'])) {
       // CRM-20607 - Don't validate the threshold of hard-coded rules

CRM/Contact/Form/Task.php

@@ -86,7 +86,7 @@ public static function preProcessCommon(&$form) {
     $form->_contactIds = [];
     $form->_contactTypes = [];
 
-    $isStandAlone = in_array('task', $form->urlPath) || in_array('standalone', $form->urlPath);
+    $isStandAlone = in_array('task', $form->urlPath) || in_array('standalone', $form->urlPath) || in_array('map', $form->urlPath);
     if ($isStandAlone) {
       [$form->_task, $title] = CRM_Contact_Task::getTaskAndTitleByClass(get_class($form));
       if (!array_key_exists($form->_task, CRM_Contact_Task::permissionedTaskTitles(CRM_Core_Permission::getPermission()))) {

CRM/Contact/Form/Task/Useradd.php

@@ -64,14 +64,20 @@ public function setDefaultValues() {
    * Build the form object.
    */
   public function buildQuickForm() {
+    $config = CRM_Core_Config::singleton();
+
     $element = $this->add('text', 'name', ts('Full Name'), ['class' => 'huge']);
     $element->freeze();
     $this->add('text', 'cms_name', ts('Username'), ['class' => 'huge']);
     $this->addRule('cms_name', 'Username is required', 'required');
-    $this->add('password', 'cms_pass', ts('Password'), ['class' => 'huge']);
-    $this->add('password', 'cms_confirm_pass', ts('Confirm Password'), ['class' => 'huge']);
-    $this->addRule('cms_pass', 'Password is required', 'required');
-    $this->addRule(['cms_pass', 'cms_confirm_pass'], 'ERROR: Password mismatch', 'compare');
+
+    if (!$config->userSystem->isUserRegistrationPermitted()) {
+      $this->add('password', 'cms_pass', ts('Password'), ['class' => 'huge']);
+      $this->add('password', 'cms_confirm_pass', ts('Confirm Password'), ['class' => 'huge']);
+      $this->addRule('cms_pass', 'Password is required', 'required');
+      $this->addRule(['cms_pass', 'cms_confirm_pass'], 'ERROR: Password mismatch', 'compare');
+    }
+
     $this->add('text', 'email', ts('Email:'), ['class' => 'huge'])->freeze();
     $this->addRule('email', 'Email is required', 'required');
     $this->add('hidden', 'contactID');

CRM/Contact/Task.php

@@ -228,6 +228,8 @@ public static function tasks() {
           'title' => ts('Map contacts'),
           'class' => 'CRM_Contact_Form_Task_Map',
           'result' => FALSE,
+          'url' => 'civicrm/contact/map',
+          'icon' => 'fa-map',
         );
       }
 

CRM/Contribute/BAO/ContributionPage.php

@@ -483,7 +483,7 @@ protected static function getProfileNameAndFields($gid, $cid, $params, $fieldTyp
         $fields = CRM_Core_BAO_UFGroup::getFields($gid, FALSE, CRM_Core_Action::VIEW, NULL, NULL, FALSE, NULL, FALSE, NULL, CRM_Core_Permission::CREATE, NULL);
         foreach ($fields as $k => $v) {
           if (!$groupTitle) {
-            $groupTitle = $v['groupTitle'];
+            $groupTitle = $v['groupDisplayTitle'];
           }
           // suppress all file fields from display and formatting fields
           if (

CRM/Dedupe/MergeHandler.php

@@ -359,4 +359,113 @@ protected function getSelectedType($entity, $blockIndex) {
     return $this->getMigrationInfo()['location_blocks'][$entity][$blockIndex]['typeTypeId'] ?? NULL;
   }
 
+  /**
+   * Merge location.
+   *
+   * Based on the data in the $locationMigrationInfo merge the locations for 2 contacts.
+   *
+   * The data is in the format received from the merge form (which is a fairly confusing format).
+   *
+   * It is converted into an array of DAOs which is passed to the alterLocationMergeData hook
+   * before saving or deleting the DAOs. A new hook is added to allow these to be altered after they have
+   * been calculated and before saving because
+   * - the existing format & hook combo is so confusing it is hard for developers to change & inherently fragile
+   * - passing to a hook right before save means calculations only have to be done once
+   * - the existing pattern of passing dissimilar data to the same (merge) hook with a different 'type' is just
+   *  ugly.
+   *
+   * The use of the new hook is tested, including the fact it is called before contributions are merged, as this
+   * is likely to be significant data in merge hooks.
+   *
+   * @throws \CRM_Core_Exception
+   */
+  public function mergeLocations(): void {
+    $mergeHandler = $this;
+    $locBlocks = $mergeHandler->getLocationBlocksToMerge();
+    $blocksDAO = [];
+    $migrationInfo = $mergeHandler->getMigrationInfo();
+
+    // @todo Handle OpenID (not currently in API).
+    if (!empty($locBlocks)) {
+      $locationBlocks = CRM_Dedupe_Merger::getLocationBlockInfo();
+
+      $primaryBlockIds = CRM_Contact_BAO_Contact::getLocBlockIds($mergeHandler->getToKeepID(), ['is_primary' => 1]);
+      $billingBlockIds = CRM_Contact_BAO_Contact::getLocBlockIds($mergeHandler->getToKeepID(), ['is_billing' => 1]);
+
+      foreach ($locBlocks as $name => $block) {
+        $blocksDAO[$name] = ['delete' => [], 'update' => []];
+        $daoName = 'CRM_Core_DAO_' . $locationBlocks[$name]['label'];
+        $changePrimary = FALSE;
+        $primaryDAOId = (array_key_exists($name, $primaryBlockIds)) ? array_pop($primaryBlockIds[$name]) : NULL;
+        $billingDAOId = (array_key_exists($name, $billingBlockIds)) ? array_pop($billingBlockIds[$name]) : NULL;
+
+        foreach ($block as $blkCount => $values) {
+          $otherBlockId = $migrationInfo['other_details']['location_blocks'][$name][$blkCount]['id'] ?? NULL;
+          $mainBlockId = CRM_Utils_Array::value('mainContactBlockId', $migrationInfo['location_blocks'][$name][$blkCount], 0);
+          if (!$otherBlockId) {
+            continue;
+          }
+          $otherBlockDAO = $mergeHandler->copyDataToNewBlockDAO($otherBlockId, $name, $blkCount);
+
+          // If we're deliberately setting this as primary then add the flag
+          // and remove it from the current primary location (if there is one).
+          // But only once for each entity.
+          $set_primary = $migrationInfo['location_blocks'][$name][$blkCount]['set_other_primary'] ?? NULL;
+          if (!$changePrimary && $set_primary == "1") {
+            $otherBlockDAO->is_primary = 1;
+            if ($primaryDAOId) {
+              $removePrimaryDAO = $mergeHandler->getDAOForLocationEntity($name);
+              $removePrimaryDAO->id = $primaryDAOId;
+              $removePrimaryDAO->is_primary = 0;
+              $blocksDAO[$name]['update'][$primaryDAOId] = $removePrimaryDAO;
+            }
+            $changePrimary = TRUE;
+          }
+          // Otherwise, if main contact already has primary, set it to 0.
+          elseif ($primaryDAOId) {
+            $otherBlockDAO->is_primary = 0;
+          }
+
+          // If the main contact already has a billing location, set this to 0.
+          if ($billingDAOId) {
+            $otherBlockDAO->is_billing = 0;
+          }
+
+          // overwrite - need to delete block which belongs to main-contact.
+          if (!empty($mainBlockId) && $values['is_replace']) {
+            $deleteDAO = $mergeHandler->getDAOForLocationEntity($name);
+            $deleteDAO->id = $mainBlockId;
+            $deleteDAO->find(TRUE);
+
+            // if we about to delete a primary / billing block, set the flags for new block
+            // that we going to assign to main-contact
+            if ($primaryDAOId && ($primaryDAOId == $deleteDAO->id)) {
+              $otherBlockDAO->is_primary = 1;
+            }
+            if ($billingDAOId && ($billingDAOId == $deleteDAO->id)) {
+              $otherBlockDAO->is_billing = 1;
+            }
+            $blocksDAO[$name]['delete'][$deleteDAO->id] = $deleteDAO;
+          }
+          $blocksDAO[$name]['update'][$otherBlockDAO->id] = $otherBlockDAO;
+        }
+        $blocksDAO[$name]['update'] += $mergeHandler->getBlocksToUpdateForDeletedContact($name);
+      }
+    }
+
+    CRM_Utils_Hook::alterLocationMergeData($blocksDAO, $mergeHandler->getToKeepID(), $mergeHandler->getToRemoveID(), $migrationInfo);
+    foreach ($blocksDAO as $blockDAOs) {
+      if (!empty($blockDAOs['update'])) {
+        foreach ($blockDAOs['update'] as $blockDAO) {
+          $blockDAO->save();
+        }
+      }
+      if (!empty($blockDAOs['delete'])) {
+        foreach ($blockDAOs['delete'] as $blockDAO) {
+          $blockDAO->delete();
+        }
+      }
+    }
+  }
+
 }

CRM/Dedupe/Merger.php

@@ -657,7 +657,7 @@ protected static function createContact($contactID, $params) {
     // This parameter causes blank fields to be be emptied out.
     // We can probably remove.
     $params['updateBlankLocInfo'] = TRUE;
-    list($data) = CRM_Contact_BAO_Contact::formatProfileContactParams($params, [], $contactID);
+    [$data] = CRM_Contact_BAO_Contact::formatProfileContactParams($params, [], $contactID);
     CRM_Contact_BAO_Contact::create($data);
   }
 
@@ -994,7 +994,7 @@ public static function merge($dupePairs = [], $cacheParams = [], $mode = 'safe',
    */
   public static function skipMerge($mainId, $otherId, &$migrationInfo, $mode = 'safe', &$conflicts = []) {
 
-    $conflicts = self::getConflicts($migrationInfo, $mainId, $otherId, $mode)['conflicts'];
+    $conflicts = self::getConflicts($migrationInfo, (int) $mainId, (int) $otherId, $mode)['conflicts'];
     // A hook could have set skip_merge in order to alter merge behaviour.
     // This is a something we might ideally deprecate since they really 'should'
     // mess with the conflicts array instead.
@@ -1209,7 +1209,7 @@ public static function getRowsElementsAndInfo($mainId, $otherId, $checkPermissio
     $locations = ['main' => [], 'other' => []];
 
     foreach ($locationBlocks as $blockName => $blockInfo) {
-      list($locations, $rows, $elements, $migrationInfo) = self::addLocationFieldInfo($mainId, $otherId, $blockInfo, $blockName, $locations, $rows, $elements, $migrationInfo);
+      [$locations, $rows, $elements, $migrationInfo] = self::addLocationFieldInfo($mainId, $otherId, $blockInfo, $blockName, $locations, $rows, $elements, $migrationInfo);
     } // End loop through each location block entity
 
     // add the related tables and unset the ones that don't sport any of the duplicate contact's info
@@ -1374,7 +1374,7 @@ public static function moveAllBelongings($mainId, $otherId, $migrationInfo, $che
     }
     $mergeHandler = new CRM_Dedupe_MergeHandler((int) $mainId, (int) $otherId);
     $mergeHandler->setMigrationInfo($migrationInfo);
-    self::mergeLocations($mergeHandler);
+    $mergeHandler->mergeLocations();
 
     // **** Do contact related migrations
     // @todo - move all custom field processing to the move class & eventually have an
@@ -1427,7 +1427,7 @@ public static function moveAllBelongings($mainId, $otherId, $migrationInfo, $che
       $submitted = [];
     }
     foreach ($submitted as $key => $value) {
-      list($cFields, $submitted) = self::processCustomFields($mainId, $key, $cFields, $submitted, $value);
+      [$cFields, $submitted] = self::processCustomFields($mainId, $key, $cFields, $submitted, $value);
     }
 
     // move view only custom fields CRM-5362
@@ -1743,114 +1743,6 @@ public static function getMergeContactDetails($contact_id) {
     return $result['values'][$contact_id];
   }
 
-  /**
-   * Merge location.
-   *
-   * Based on the data in the $locationMigrationInfo merge the locations for 2 contacts.
-   *
-   * The data is in the format received from the merge form (which is a fairly confusing format).
-   *
-   * It is converted into an array of DAOs which is passed to the alterLocationMergeData hook
-   * before saving or deleting the DAOs. A new hook is added to allow these to be altered after they have
-   * been calculated and before saving because
-   * - the existing format & hook combo is so confusing it is hard for developers to change & inherently fragile
-   * - passing to a hook right before save means calculations only have to be done once
-   * - the existing pattern of passing dissimilar data to the same (merge) hook with a different 'type' is just
-   *  ugly.
-   *
-   * The use of the new hook is tested, including the fact it is called before contributions are merged, as this
-   * is likely to be significant data in merge hooks.
-   *
-   * @param \CRM_Dedupe_MergeHandler $mergeHandler
-   */
-  public static function mergeLocations($mergeHandler) {
-    $locBlocks = $mergeHandler->getLocationBlocksToMerge();
-    $blocksDAO = [];
-    $migrationInfo = $mergeHandler->getMigrationInfo();
-
-    // @todo Handle OpenID (not currently in API).
-    if (!empty($locBlocks)) {
-      $locationBlocks = self::getLocationBlockInfo();
-
-      $primaryBlockIds = CRM_Contact_BAO_Contact::getLocBlockIds($mergeHandler->getToKeepID(), ['is_primary' => 1]);
-      $billingBlockIds = CRM_Contact_BAO_Contact::getLocBlockIds($mergeHandler->getToKeepID(), ['is_billing' => 1]);
-
-      foreach ($locBlocks as $name => $block) {
-        $blocksDAO[$name] = ['delete' => [], 'update' => []];
-        $daoName = 'CRM_Core_DAO_' . $locationBlocks[$name]['label'];
-        $changePrimary = FALSE;
-        $primaryDAOId = (array_key_exists($name, $primaryBlockIds)) ? array_pop($primaryBlockIds[$name]) : NULL;
-        $billingDAOId = (array_key_exists($name, $billingBlockIds)) ? array_pop($billingBlockIds[$name]) : NULL;
-
-        foreach ($block as $blkCount => $values) {
-          $otherBlockId = $migrationInfo['other_details']['location_blocks'][$name][$blkCount]['id'] ?? NULL;
-          $mainBlockId = CRM_Utils_Array::value('mainContactBlockId', $migrationInfo['location_blocks'][$name][$blkCount], 0);
-          if (!$otherBlockId) {
-            continue;
-          }
-          $otherBlockDAO = $mergeHandler->copyDataToNewBlockDAO($otherBlockId, $name, $blkCount);
-
-          // If we're deliberately setting this as primary then add the flag
-          // and remove it from the current primary location (if there is one).
-          // But only once for each entity.
-          $set_primary = $migrationInfo['location_blocks'][$name][$blkCount]['set_other_primary'] ?? NULL;
-          if (!$changePrimary && $set_primary == "1") {
-            $otherBlockDAO->is_primary = 1;
-            if ($primaryDAOId) {
-              $removePrimaryDAO = $mergeHandler->getDAOForLocationEntity($name);
-              $removePrimaryDAO->id = $primaryDAOId;
-              $removePrimaryDAO->is_primary = 0;
-              $blocksDAO[$name]['update'][$primaryDAOId] = $removePrimaryDAO;
-            }
-            $changePrimary = TRUE;
-          }
-          // Otherwise, if main contact already has primary, set it to 0.
-          elseif ($primaryDAOId) {
-            $otherBlockDAO->is_primary = 0;
-          }
-
-          // If the main contact already has a billing location, set this to 0.
-          if ($billingDAOId) {
-            $otherBlockDAO->is_billing = 0;
-          }
-
-          // overwrite - need to delete block which belongs to main-contact.
-          if (!empty($mainBlockId) && $values['is_replace']) {
-            $deleteDAO = $mergeHandler->getDAOForLocationEntity($name);
-            $deleteDAO->id = $mainBlockId;
-            $deleteDAO->find(TRUE);
-
-            // if we about to delete a primary / billing block, set the flags for new block
-            // that we going to assign to main-contact
-            if ($primaryDAOId && ($primaryDAOId == $deleteDAO->id)) {
-              $otherBlockDAO->is_primary = 1;
-            }
-            if ($billingDAOId && ($billingDAOId == $deleteDAO->id)) {
-              $otherBlockDAO->is_billing = 1;
-            }
-            $blocksDAO[$name]['delete'][$deleteDAO->id] = $deleteDAO;
-          }
-          $blocksDAO[$name]['update'][$otherBlockDAO->id] = $otherBlockDAO;
-        }
-        $blocksDAO[$name]['update'] += $mergeHandler->getBlocksToUpdateForDeletedContact($name);
-      }
-    }
-
-    CRM_Utils_Hook::alterLocationMergeData($blocksDAO, $mergeHandler->getToKeepID(), $mergeHandler->getToRemoveID(), $migrationInfo);
-    foreach ($blocksDAO as $blockDAOs) {
-      if (!empty($blockDAOs['update'])) {
-        foreach ($blockDAOs['update'] as $blockDAO) {
-          $blockDAO->save();
-        }
-      }
-      if (!empty($blockDAOs['delete'])) {
-        foreach ($blockDAOs['delete'] as $blockDAO) {
-          $blockDAO->delete();
-        }
-      }
-    }
-  }
-
   /**
    * Dedupe a pair of contacts.
    *
@@ -2092,7 +1984,7 @@ protected static function getCustomFieldMetadata($contactType) {
    * @throws \CRM_Core_Exception
    * @throws \CiviCRM_API3_Exception
    */
-  public static function getConflicts(&$migrationInfo, $mainId, $otherId, $mode) {
+  public static function getConflicts(array &$migrationInfo, int $mainId, int $otherId, string $mode): array {
     $conflicts = [];
     // Generate var $migrationInfo. The variable structure is exactly same as
     // $formValues submitted during a UI merge for a pair of contacts.
@@ -2111,8 +2003,8 @@ public static function getConflicts(&$migrationInfo, $mainId, $otherId, $mode) {
         continue;
       }
       elseif ((in_array(substr($key, 5), CRM_Dedupe_Merger::getContactFields()) or
-          substr($key, 0, 12) === 'move_custom_'
-        ) and $val != NULL
+          strpos($key, 'move_custom_') === 0
+        ) and $val !== NULL
       ) {
         // Rule: If both main-contact, and other-contact have a field with a
         // different value, then let $mode decide if to merge it or not

CRM/Event/BAO/Event.php

@@ -1320,7 +1320,7 @@ public static function buildCustomDisplay(
         $groupTitle = NULL;
         foreach ($fields as $k => $v) {
           if (!$groupTitle) {
-            $groupTitle = $v['groupTitle'];
+            $groupTitle = $v['groupDisplayTitle'];
           }
           // suppress all file fields from display
           if (

CRM/Export/BAO/ExportProcessor.php

@@ -1458,7 +1458,9 @@ public function getSqlColumnDefinition($fieldName, $columnName) {
           if (in_array(CRM_Utils_Array::value('data_type', $fieldSpec), ['Country', 'StateProvince', 'ContactReference'])) {
             return "`$fieldName` varchar(255)";
           }
-          return "`$fieldName` varchar(16)";
+          // some of those will be exported as a (localisable) string
+          // @see https://lab.civicrm.org/dev/core/-/issues/2164
+          return "`$fieldName` varchar(64)";
 
         case CRM_Utils_Type::T_STRING:
           if (isset($fieldSpec['maxlength'])) {