From 96167e1b4ea22b40bfda240ba36cfe0e0557f71c Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Wed, 1 Aug 2018 16:38:33 -0300
Subject: [PATCH 01/23] PCHR-3681: Remove unnecessary store param in calls to
 CRM_Utils_Request::retrieve()

The main reason for this is that `$this` was being passed as the store param
in places that we didn't have a context object (i.e. outside of a instance
method). Up to PHP 7.0, this would work without a problem, but starting
from PHP 7.1, this now results in an error: https://3v4l.org/QXYLB

In a few places, instead of $this, `CRM_Core_DAO::$_nullObject` was being
used. This is a risky approach, as it's possible for $_nullObject to not
be null (it is just an public static property of the DAO class). This
has been removed as well
---
 contactsummary/contactsummary.php | 6 +++---
 hrcareer/hrcareer.php             | 4 ++--
 hrident/hrident.php               | 4 ++--
 hrmed/hrmed.php                   | 4 ++--
 hrqual/hrqual.php                 | 6 +++---
 hrstaffdir/hrstaffdir.php         | 2 +-
 hrui/hrui.php                     | 2 +-
 hrvisa/hrvisa.php                 | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/contactsummary/contactsummary.php b/contactsummary/contactsummary.php
index 0fe22fd666c..6db6eac90c5 100644
--- a/contactsummary/contactsummary.php
+++ b/contactsummary/contactsummary.php
@@ -128,9 +128,9 @@ function contactsummary_civicrm_alterSettingsFolders(&$metaDataFolders = NULL) {
 function contactsummary_civicrm_pageRun($page) {
   if ($page instanceof CRM_Contact_Page_View_Summary) {
     CRM_Core_Resources::singleton()
-      ->addSetting(array(
-        'tabSettings' => array('active' => CRM_Utils_Request::retrieve('selectedChild', 'String', $this, FALSE, 'contactsummary')),
-      ))
+      ->addSetting([
+        'tabSettings' => ['active' => CRM_Utils_Request::retrieve('selectedChild', 'String') ?: 'contactsummary'],
+      ])
       ->addVars('leaveAndAbsences', [
         'baseURL' => CRM_Core_Resources::singleton()->getUrl('uk.co.compucorp.civicrm.hrleaveandabsences'),
         'attachmentToken' => CRM_Core_Page_AJAX_Attachment::createToken()
diff --git a/hrcareer/hrcareer.php b/hrcareer/hrcareer.php
index b4ccc91b659..6ecb62e219c 100644
--- a/hrcareer/hrcareer.php
+++ b/hrcareer/hrcareer.php
@@ -149,7 +149,7 @@ function hrcareer_getUFGroupID() {
  */
 function hrcareer_civicrm_buildProfile($name) {
   if ($name == 'hrcareer_tab') {
-    $isDialog = ('multiProfileDialog' == CRM_Utils_Request::retrieve('context', 'String', CRM_Core_DAO::$_nullObject));
+    $isDialog = ('multiProfileDialog' == CRM_Utils_Request::retrieve('context', 'String'));
 
     // To fix validation alert issue
     $smarty = CRM_Core_Smarty::singleton();
@@ -167,7 +167,7 @@ function hrcareer_civicrm_buildProfile($name) {
 
     $config = CRM_Core_Config::singleton();
     if ($config->logging && ! $isDialog) {
-      $contactID = CRM_Utils_Request::retrieve('id', 'Positive', $this);
+      $contactID = CRM_Utils_Request::retrieve('id', 'Positive');
       CRM_Core_Region::instance('profile-form-hrcareer_tab')->add(array(
         'template' => 'CRM/common/logButton.tpl',
         'instance_id' => CRM_Report_Utils_Report::getInstanceIDForValue('logging/contact/summary'),
diff --git a/hrident/hrident.php b/hrident/hrident.php
index 64756d8839e..5c193e5a0c3 100644
--- a/hrident/hrident.php
+++ b/hrident/hrident.php
@@ -140,8 +140,8 @@ function hrident_civicrm_buildProfile($name) {
     $smarty->assign('urlIsPublic', FALSE);
 
     $config = CRM_Core_Config::singleton();
-    if ($config->logging && 'multiProfileDialog' !== CRM_Utils_Request::retrieve('context', 'String', CRM_Core_DAO::$_nullObject)) {
-      $contactID = CRM_Utils_Request::retrieve('id', 'Positive', $this);
+    if ($config->logging && 'multiProfileDialog' !== CRM_Utils_Request::retrieve('context', 'String')) {
+      $contactID = CRM_Utils_Request::retrieve('id', 'Positive');
       CRM_Core_Region::instance('profile-form-hrident_tab')->add(array(
         'template' => 'CRM/common/logButton.tpl',
         'instance_id' => CRM_Report_Utils_Report::getInstanceIDForValue('logging/contact/summary'),
diff --git a/hrmed/hrmed.php b/hrmed/hrmed.php
index d1633938a91..2a8ff68308e 100644
--- a/hrmed/hrmed.php
+++ b/hrmed/hrmed.php
@@ -141,8 +141,8 @@ function hrmed_civicrm_buildProfile($name) {
     $smarty->assign('urlIsPublic', FALSE);
 
     $config = CRM_Core_Config::singleton();
-    if ($config->logging && 'multiProfileDialog' !== CRM_Utils_Request::retrieve('context', 'String', CRM_Core_DAO::$_nullObject)) {
-      $contactID = CRM_Utils_Request::retrieve('id', 'Positive', $this);
+    if ($config->logging && 'multiProfileDialog' !== CRM_Utils_Request::retrieve('context', 'String')) {
+      $contactID = CRM_Utils_Request::retrieve('id', 'Positive');
       CRM_Core_Region::instance('profile-form-hrmed_tab')->add(array(
         'template' => 'CRM/common/logButton.tpl',
         'instance_id' => CRM_Report_Utils_Report::getInstanceIDForValue('logging/contact/summary'),
diff --git a/hrqual/hrqual.php b/hrqual/hrqual.php
index 7d6d8f84ae3..14ffa1add9c 100644
--- a/hrqual/hrqual.php
+++ b/hrqual/hrqual.php
@@ -36,7 +36,7 @@ function hrqual_civicrm_buildProfile($name) {
     $smarty = CRM_Core_Smarty::singleton();
     $smarty->assign('urlIsPublic', FALSE);
 
-    $action = CRM_Utils_Request::retrieve('multiRecord', 'String', $this);
+    $action = CRM_Utils_Request::retrieve('multiRecord', 'String');
     // display the select box only in add and update mode
     if (in_array($action, array("add", "update"))) {
       $regionParams = array(
@@ -46,8 +46,8 @@ function hrqual_civicrm_buildProfile($name) {
     }
 
     $config = CRM_Core_Config::singleton();
-    if ($config->logging && 'multiProfileDialog' !== CRM_Utils_Request::retrieve('context', 'String', CRM_Core_DAO::$_nullObject)) {
-      $contactID = CRM_Utils_Request::retrieve('id', 'Positive', $this);
+    if ($config->logging && 'multiProfileDialog' !== CRM_Utils_Request::retrieve('context', 'String')) {
+      $contactID = CRM_Utils_Request::retrieve('id', 'Positive');
       CRM_Core_Region::instance('profile-form-hrqual_tab')->add(array(
         'template' => 'CRM/common/logButton.tpl',
         'instance_id' => CRM_Report_Utils_Report::getInstanceIDForValue('logging/contact/summary'),
diff --git a/hrstaffdir/hrstaffdir.php b/hrstaffdir/hrstaffdir.php
index 82535652f92..57c2e035076 100644
--- a/hrstaffdir/hrstaffdir.php
+++ b/hrstaffdir/hrstaffdir.php
@@ -50,7 +50,7 @@ function hrstaffdir_civicrm_searchColumns($objectName, &$headers, &$values, &$se
   if ($objectName == 'profile') {
     $profileId = hrstaffdir_getUFGroupID();
     $session = CRM_Core_Session::singleton();
-    $gid = CRM_Utils_Request::retrieve('gid', 'Positive', CRM_Core_DAO::$_nullObject);
+    $gid = CRM_Utils_Request::retrieve('gid', 'Positive');
     // Note: This protocol is not safe when concurrently browsing multiple profile-listings, but
     // that doesn't work anyway, so we can't implement/test a better protocol.
     if ($gid) {
diff --git a/hrui/hrui.php b/hrui/hrui.php
index 76f4a424ec1..b97a73d62f8 100644
--- a/hrui/hrui.php
+++ b/hrui/hrui.php
@@ -72,7 +72,7 @@ function hrui_civicrm_buildForm($formName, &$form) {
   }
 
   if ($formName == 'CRM_Admin_Form_Extensions') {
-    $extensionKey= CRM_Utils_Request::retrieve('key', 'String', $this);
+    $extensionKey= CRM_Utils_Request::retrieve('key', 'String');
     if ($extensionKey == 'uk.co.compucorp.civicrm.hrsampledata') {
       $title = ts("Be Careful");
       $message = ts("Installing/Uninstalling this extension will remove all existing data, so make sure to create a backup first !");
diff --git a/hrvisa/hrvisa.php b/hrvisa/hrvisa.php
index 711e681bbe5..50f46136989 100644
--- a/hrvisa/hrvisa.php
+++ b/hrvisa/hrvisa.php
@@ -36,10 +36,10 @@ function hrvisa_civicrm_buildProfile($name) {
     $smarty = CRM_Core_Smarty::singleton();
     $smarty->assign('urlIsPublic', FALSE);
 
-    $contactID = CRM_Utils_Request::retrieve('id', 'Positive', $this);
+    $contactID = CRM_Utils_Request::retrieve('id', 'Positive');
 
     $config = CRM_Core_Config::singleton();
-    if ($config->logging && 'multiProfileDialog' !== CRM_Utils_Request::retrieve('context', 'String', CRM_Core_DAO::$_nullObject)) {
+    if ($config->logging && 'multiProfileDialog' !== CRM_Utils_Request::retrieve('context', 'String')) {
       CRM_Core_Region::instance('profile-form-hrvisa_tab')->add(array(
         'template' => 'CRM/common/logButton.tpl',
         'instance_id' => CRM_Report_Utils_Report::getInstanceIDForValue('logging/contact/summary'),

From 90c2df094e21745e012925eecdfbf2fdaa934b97 Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Tue, 23 Oct 2018 11:52:52 -0300
Subject: [PATCH 02/23] PCHR-4346: Run tests on CiviCRM 5.7

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 36ce3da4f31..2c64f90bedf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,7 +49,7 @@ pipeline {
       steps {
         script {
           // Build site with CV Buildkit
-          sh "civibuild create ${params.CIVIHR_BUILDNAME} --type drupal-clean --civi-ver 5.3.1 --url $WEBURL --admin-pass $ADMIN_PASS"
+          sh "civibuild create ${params.CIVIHR_BUILDNAME} --type drupal-clean --civi-ver 5.7 --url $WEBURL --admin-pass $ADMIN_PASS"
 
           // Get target and PR branches name
           def prBranch = env.CHANGE_BRANCH

From 1e26062741a211a7a55b4854c68fd976e19cdc61 Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Tue, 23 Oct 2018 15:38:33 -0300
Subject: [PATCH 03/23] PCHR-4346: Fix undefined index error when using the
 HRJobContract.getFullDetails API

This API call is an optimized way to fetch all the information for a Job Contract,
which is stored in multiple different database tables. It does that by running
a single SQL query, joining all the tables and the necessary fields.

In the resultset, in order to differentiate which field belongs to which entity,
each field is prefixed with the entity name (examplei: details__<field_name>). After
the data is fetched from the database, the `HRJobContractRevision::normalizeFullDetailsResult()`
was used to loop through all the fields in the resultset, detect to which entity they
belong to and organize the data in a proper way.

Besides the fields returned by the query, the resultset object also contains some internal
fields. In the past, all of these fields were prefixed with an underscore, but on
https://github.com/civicrm/civicrm-core/pull/12276 a new `resultCopies` field was added,
and since it does not start with an underscore, the logic to filter out the internal
fields stopped working. To fix that, instead of looping through all of the fields from
the resultset, we call the `toArray()` method which will return a list of fields and
values containing only those returned by the SQL query.
---
 .../CRM/Hrjobcontract/BAO/HRJobContractRevision.php        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/hrjobcontract/CRM/Hrjobcontract/BAO/HRJobContractRevision.php b/hrjobcontract/CRM/Hrjobcontract/BAO/HRJobContractRevision.php
index 5882f849763..3d2322d574d 100755
--- a/hrjobcontract/CRM/Hrjobcontract/BAO/HRJobContractRevision.php
+++ b/hrjobcontract/CRM/Hrjobcontract/BAO/HRJobContractRevision.php
@@ -335,10 +335,9 @@ private static function buildEntityQueryArray($entity, $revision, $query) {
   protected static function normalizeFullDetailsResult($result) {
     $normalized = [];
 
-    foreach ($result as $key => $value) {
-      if ($key[0] == '_' || $key == 'N') { continue; } // ignores "internal" fields
-
-      list($entity, $field) = explode('__', $key);
+    $allFields = $result->toArray();
+    foreach ($allFields as $entityField => $value) {
+      list($entity, $field) = explode('__', $entityField);
 
       // This is necessary because some fields are stored in the DB as strings
       // although the content is actually a JSON. It is done automatically when

From 6d079d32e073a744e1d58bd3ef8f7f2d8f3686a3 Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Wed, 24 Oct 2018 09:46:53 -0300
Subject: [PATCH 04/23] PCHR-4346: Sync CRM_Hrjobcontract_Dedupe_Merger with
 Civi 5.7.0

---
 .../CRM/Hrjobcontract/Dedupe/Merger.php       | 57 ++++---------------
 1 file changed, 12 insertions(+), 45 deletions(-)

diff --git a/hrjobcontract/CRM/Hrjobcontract/Dedupe/Merger.php b/hrjobcontract/CRM/Hrjobcontract/Dedupe/Merger.php
index e3f85ff3f3c..c13c8eef2c0 100644
--- a/hrjobcontract/CRM/Hrjobcontract/Dedupe/Merger.php
+++ b/hrjobcontract/CRM/Hrjobcontract/Dedupe/Merger.php
@@ -203,35 +203,23 @@ public static function getActiveRelTables($cid) {
   /**
    * Get array tables and fields that reference civicrm_contact.id.
    *
-   * This includes core tables, custom group tables, tables added by the merge
-   * hook and (somewhat randomly) the entity_tag table.
+   * This function calls the merge hook and only exists to wrap the DAO function to support that deprecated call.
+   * The entityTypes hook is the recommended way to add tables to this result.
    *
-   * Refer to CRM-17454 for information on the danger of querying the information
-   * schema to derive this.
-   *
-   * This function calls the merge hook but the entityTypes hook is the recommended
-   * way to add tables to this result.
+   * I thought about adding another hook to alter tableReferences but decided it was unclear if there
+   * are use cases not covered by entityTables and instead we should wait & see.
    */
   public static function cidRefs() {
     if (isset(\Civi::$statics[__CLASS__]) && isset(\Civi::$statics[__CLASS__]['contact_references'])) {
       return \Civi::$statics[__CLASS__]['contact_references'];
     }
-    $contactReferences = array();
-    $coreReferences = CRM_Core_DAO::getReferencesToTable('civicrm_contact');
-    foreach ($coreReferences as $coreReference) {
-      if (!is_a($coreReference, 'CRM_Core_Reference_Dynamic')) {
-        $contactReferences[$coreReference->getReferenceTable()][] = $coreReference->getReferenceKey();
-      }
-    }
-    self::addCustomTablesExtendingContactsToCidRefs($contactReferences);
 
-    // FixME for time being adding below line statically as no Foreign key constraint defined for table 'civicrm_entity_tag'
-    $contactReferences['civicrm_entity_tag'][] = 'entity_id';
+    $contactReferences = $coreReferences = CRM_Core_DAO::getReferencesToContactTable();
 
-    // Allow hook_civicrm_merge() to adjust $cidRefs.
-    // Note that if entities are registered using the entityTypes hook there
-    // is no need to use this hook.
     CRM_Utils_Hook::merge('cidRefs', $contactReferences);
+    if ($contactReferences !== $coreReferences) {
+      Civi::log()->warning("Deprecated hook ::merge in context of 'cidRefs. Use entityTypes instead.", array('civi.tag' => 'deprecated'));
+    }
     \Civi::$statics[__CLASS__]['contact_references'] = $contactReferences;
     return \Civi::$statics[__CLASS__]['contact_references'];
   }
@@ -486,7 +474,8 @@ public static function moveContactBelongings($mainId, $otherId, $tables = FALSE,
     // getting all custom tables
     $customTables = array();
     if ($customTableToCopyFrom !== NULL) {
-      self::addCustomTablesExtendingContactsToCidRefs($customTables);
+      // @todo this duplicates cidRefs?
+      CRM_Core_DAO::appendCustomTablesExtendingContacts($customTables);
       $customTables = array_keys($customTables);
     }
 
@@ -1457,7 +1446,6 @@ public static function getRowsElementsAndInfo($mainId, $otherId, $checkPermissio
     $otherTree = CRM_Core_BAO_CustomGroup::getTree($main['contact_type'], NULL, $otherId, -1,
       CRM_Utils_Array::value('contact_sub_type', $other), NULL, TRUE, NULL, TRUE, $checkPermissions
     );
-    CRM_Core_DAO::freeResult();
 
     foreach ($otherTree as $gid => $group) {
       $foundField = FALSE;
@@ -2018,26 +2006,6 @@ public static function addMembershipToRealtedContacts($contactID) {
     }
   }
 
-  /**
-   * Add custom tables that extend contacts to the list of contact references.
-   *
-   * CRM_Core_BAO_CustomGroup::getAllCustomGroupsByBaseEntity seems like a safe-ish
-   * function to be sure all are retrieved & we don't miss subtypes or inactive or multiples
-   * - the down side is it is not cached.
-   *
-   * Further changes should be include tests in the CRM_Core_MergerTest class
-   * to ensure that disabled, subtype, multiple etc groups are still captured.
-   *
-   * @param array $cidRefs
-   */
-  public static function addCustomTablesExtendingContactsToCidRefs(&$cidRefs) {
-    $customValueTables = CRM_Core_BAO_CustomGroup::getAllCustomGroupsByBaseEntity('Contact');
-    $customValueTables->find();
-    while ($customValueTables->fetch()) {
-      $cidRefs[$customValueTables->table_name] = array('entity_id');
-    }
-  }
-
   /**
    * Create activities tracking the merge on affected contacts.
    *
@@ -2078,6 +2046,7 @@ public static function createMergeActivities($mainId, $otherId) {
    * @param int $rule_group_id
    * @param int $group_id
    * @param bool $reloadCacheIfEmpty
+   *   Should the cache be reloaded if empty - this must be false when in a dedupe action!
    * @param int $batchLimit
    * @param bool $isSelected
    *   Limit to selected pairs.
@@ -2127,7 +2096,7 @@ public static function getDuplicatePairs($rule_group_id, $group_id, $reloadCache
    */
   public static function getMergeCacheKeyString($rule_group_id, $group_id, $criteria = array(), $checkPermissions = TRUE) {
     $contactType = CRM_Dedupe_BAO_RuleGroup::getContactTypeForRuleGroup($rule_group_id);
-    $cacheKeyString = "merge {$contactType}";
+    $cacheKeyString = "merge_{$contactType}";
     $cacheKeyString .= $rule_group_id ? "_{$rule_group_id}" : '_0';
     $cacheKeyString .= $group_id ? "_{$group_id}" : '_0';
     $cacheKeyString .= !empty($criteria) ? md5(serialize($criteria)) : '_0';
@@ -2420,8 +2389,6 @@ protected static function dedupePair(&$migrationInfo, &$resultStats, &$deletedCo
       // pair may have been flipped, so make sure we delete using both orders
       CRM_Core_BAO_PrevNextCache::deletePair($mainId, $otherId, $cacheKeyString, TRUE);
     }
-
-    CRM_Core_DAO::freeResult();
   }
 
 }

From ebc2f44d13222366fc92b255590d6f8f38a3b18c Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Wed, 24 Oct 2018 10:00:58 -0300
Subject: [PATCH 05/23] PCHR-4346: Sync
 templates/CRM/Hrjobcontract/Form/Merge.tpl with Civi 5.7.0

---
 hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.tpl b/hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.tpl
index 022e555f687..510c9745d90 100644
--- a/hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.tpl
+++ b/hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.tpl
@@ -67,9 +67,9 @@
   </div>
 
   <div class="action-link">
-    {if $prev}<a href="{$prev|escape}" class="crm-hover-button action-item"><i class="crm-i fa-chevron-left"></i> {ts}Previous{/ts}</a>{/if}
-    {if $next}<a href="{$next|escape}" class="crm-hover-button action-item">{ts}Next{/ts} <i class="crm-i fa-chevron-right"></i></a>{/if}
-    <a href="{$flip|escape}" class="action-item crm-hover-button">
+    {if $prev}<a href="{$prev}" class="crm-hover-button action-item"><i class="crm-i fa-chevron-left"></i> {ts}Previous{/ts}</a>{/if}
+    {if $next}<a href="{$next}" class="crm-hover-button action-item">{ts}Next{/ts} <i class="crm-i fa-chevron-right"></i></a>{/if}
+    <a href="{$flip}" class="action-item crm-hover-button">
       <i class="crm-i fa-random"></i>
       {ts}Flip between original and duplicate contacts.{/ts}
     </a>

From 2cea29a8fbfe600f5e4fc9ffc253b2179f0a67a2 Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Mon, 29 Oct 2018 14:55:04 -0300
Subject: [PATCH 06/23] PCHR-4346: Sync CRM_Core_BAO_Navigation.php with
 CiviCRM 5.7.0

---
 hrui/CRM/Core/BAO/Navigation.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hrui/CRM/Core/BAO/Navigation.php b/hrui/CRM/Core/BAO/Navigation.php
index 7fc88acc657..40d105823df 100755
--- a/hrui/CRM/Core/BAO/Navigation.php
+++ b/hrui/CRM/Core/BAO/Navigation.php
@@ -50,8 +50,8 @@ public function __construct() {
    * @param bool $is_active
    *   Value we want to set the is_active field.
    *
-   * @return CRM_Core_DAO_Navigation|NULL
-   *   DAO object on success, NULL otherwise
+   * @return bool
+   *   true if we found and updated the object, else false
    */
   public static function setIsActive($id, $is_active) {
     return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_Navigation', $id, 'is_active', $is_active);
@@ -70,6 +70,7 @@ public static function add(&$params) {
     if (empty($params['id'])) {
       $params['is_active'] = CRM_Utils_Array::value('is_active', $params, FALSE);
       $params['has_separator'] = CRM_Utils_Array::value('has_separator', $params, FALSE);
+      $params['domain_id'] = CRM_Utils_Array::value('domain_id', $params, CRM_Core_Config::domainID());
     }
 
     if (!isset($params['id']) ||
@@ -93,8 +94,6 @@ public static function add(&$params) {
 
     $navigation->copyValues($params);
 
-    $navigation->domain_id = CRM_Core_Config::domainID();
-
     $navigation->save();
     return $navigation;
   }
@@ -494,8 +493,9 @@ public static function getMenuName(&$value, &$skipMenuItems) {
     $config = CRM_Core_Config::singleton();
 
     $makeLink = FALSE;
-    if (isset($url) && $url) {
-      if (substr($url, 0, 4) !== 'http') {
+    if (!empty($url)) {
+      // Skip processing fully-formed urls
+      if (substr($url, 0, 4) !== 'http' && $url[0] !== '/') {
         //CRM-7656 --make sure to separate out url path from url params,
         //as we'r going to validate url path across cross-site scripting.
         $parsedUrl = parse_url($url);

From 5d05e88a70b89415a3fba944204bcde7f9b33a02 Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Tue, 30 Oct 2018 10:23:44 -0300
Subject: [PATCH 07/23] PCHR-4346: Sync overridden Summary.tpl file in hrui
 with CiviCRM 5.7.0

In https://github.com/civicrm/civicrm-core/commit/4aced66, the Summary.tpl
file has been refactored in core and part of it was extracted to the
Basic.tpl template.

Our customization was located exactly in the piece of code that has been
extracted, so the sync was done by:

- Overridding the Basic.tpl template in hrui
- Moving the custom code from the Summary.tpl file to the new Basic.tpl one
- Deleting the old Summary.tpl file, as it didn't contain any custom code anymore

As part of this, I also did some small refactoring in the custom code,
removing some unecessary ifs and custom variables to make it less different
from the original file as possible
---
 hrui/hrui.php                                 |   1 -
 .../CRM/Contact/Page/Inline/Basic.tpl         |  47 +++
 .../CRM/Contact/Page/View/Summary.tpl         | 353 ------------------
 3 files changed, 47 insertions(+), 354 deletions(-)
 create mode 100644 hrui/templates/CRM/Contact/Page/Inline/Basic.tpl
 delete mode 100644 hrui/templates/CRM/Contact/Page/View/Summary.tpl

diff --git a/hrui/hrui.php b/hrui/hrui.php
index bfa0bd6ad3f..ee6b311ce78 100644
--- a/hrui/hrui.php
+++ b/hrui/hrui.php
@@ -405,7 +405,6 @@ function hrui_civicrm_summary($contactId, &$content, &$contentPlacement) {
     return;
   }
 
-  $content['userid'] = $result['values'][0]['id'];
   $content['username'] = $result['values'][0]['name'];
   $contentPlacement = NULL;
 }
diff --git a/hrui/templates/CRM/Contact/Page/Inline/Basic.tpl b/hrui/templates/CRM/Contact/Page/Inline/Basic.tpl
new file mode 100644
index 00000000000..54cc352115b
--- /dev/null
+++ b/hrui/templates/CRM/Contact/Page/Inline/Basic.tpl
@@ -0,0 +1,47 @@
+<div class="crm-clear crm-inline-block-content">
+  <div class="crm-summary-row">
+    <div class="crm-label" id="tagLink">
+      <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$contactId&selectedChild=tag"}"
+         title="{ts}Edit Tags{/ts}">{ts}Tags{/ts}</a>
+    </div>
+    <div class="crm-content" id="tags">
+      {foreach from=$contactTag item=tagName key=tagId}
+        <span class="crm-tag-item" {if !empty($allTags.$tagId.color)}style="background-color: {$allTags.$tagId.color}; color: {$allTags.$tagId.color|colorContrast};"{/if} title="{$allTags.$tagId.description|escape}">
+          {$tagName}
+        </span>
+      {/foreach}
+    </div>
+  </div>
+  <div class="crm-summary-row">
+    <div class="crm-label">{ts}Contact Type{/ts}</div>
+    <div class="crm-content crm-contact_type_label">
+      {if isset($contact_type_label)}{$contact_type_label}{/if}
+    </div>
+  </div>
+  <div class="crm-summary-row">
+    <div class="crm-label">
+      {ts}Contact ID{/ts}{if !empty($userRecordUrl)} / {ts}User ID{/ts}{/if}
+      {if !empty($hookContent.username)} / {ts}Username{/ts}{/if}
+    </div>
+    <div class="crm-content">
+      <span class="crm-contact-contact_id">{$contactId}</span>
+      {if !empty($userRecordUrl)}
+        <span class="crm-contact-user_record_id">
+          &nbsp;/&nbsp;<a title="View user record" class="user-record-link"
+                          href="{$userRecordUrl}">{$userRecordId}</a>
+        </span>
+      {/if}
+      {if !empty($hookContent.username)}
+        <span class="crm-contact-username">&nbsp;/&nbsp;
+          <a title="View user record" class="user-record-link" href="{$userRecordUrl}">{$hookContent.username|escape}</a>
+        </span>
+      {/if}
+    </div>
+  </div>
+  <div class="crm-summary-row">
+    <div class="crm-label">{ts}External ID{/ts}</div>
+    <div class="crm-content crm-contact_external_identifier_label">
+      {if isset($external_identifier)}{$external_identifier}{/if}
+    </div>
+  </div>
+</div>
diff --git a/hrui/templates/CRM/Contact/Page/View/Summary.tpl b/hrui/templates/CRM/Contact/Page/View/Summary.tpl
deleted file mode 100644
index c36215e9407..00000000000
--- a/hrui/templates/CRM/Contact/Page/View/Summary.tpl
+++ /dev/null
@@ -1,353 +0,0 @@
-{*
- +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
-*}
-{* Contact Summary template for new tabbed interface. Replaces Basic.tpl *}
-{if $action eq 2}
-  {include file="CRM/Contact/Form/Contact.tpl"}
-{else}
-
-  <div class="crm-summary-contactname-block crm-inline-edit-container">
-    <div class="crm-summary-block" id="contactname-block">
-      {include file="CRM/Contact/Page/Inline/ContactName.tpl"}
-    </div>
-  </div>
-
-  {if !$summaryPrint}
-    <div class="crm-actions-ribbon">
-      <ul id="actions">
-        {assign var='urlParams' value="reset=1"}
-        {if $searchKey}
-          {assign var='urlParams' value=$urlParams|cat:"&key=$searchKey"}
-        {/if}
-        {if $context}
-          {assign var='urlParams' value=$urlParams|cat:"&context=$context"}
-        {/if}
-
-        {* CRM-12735 - Conditionally include the Actions and Edit buttons if contact is NOT in trash.*}
-        {if !$isDeleted}
-          {if call_user_func(array('CRM_Core_Permission','check'), 'access CiviCRM')}
-            <li class="crm-contact-activity crm-summary-block">
-              {include file="CRM/Contact/Page/Inline/Actions.tpl"}
-            </li>
-          {/if}
-          {* Include Edit button if contact has 'edit contacts' permission OR user is viewing their own contact AND has 'edit my contact' permission. CRM_Contact_Page_View::checkUserPermission handles this and assigns $permission true as needed. *}
-          {if $permission EQ 'edit'}
-            <li>
-              {crmButton p='civicrm/contact/add' q="$urlParams&action=update&cid=$contactId" class="edit"}
-                {ts}Edit{/ts}
-              {/crmButton}
-            </li>
-          {/if}
-        {/if}
-
-        {* Check for permissions to provide Restore and Delete Permanently buttons for contacts that are in the trash. *}
-        {if call_user_func(array('CRM_Core_Permission','check'), 'access deleted contacts') and $is_deleted}
-          <li class="crm-contact-restore">
-            {crmButton p='civicrm/contact/view/delete' q="reset=1&cid=$contactId&restore=1" class="delete" icon="undo"}
-              {ts}Restore from Trash{/ts}
-            {/crmButton}
-          </li>
-
-          {if call_user_func(array('CRM_Core_Permission','check'), 'delete contacts')}
-            <li class="crm-contact-permanently-delete">
-              {crmButton p='civicrm/contact/view/delete' q="reset=1&delete=1&cid=$contactId&skip_undelete=1" class="delete" icon="trash"}
-                {ts}Delete Permanently{/ts}
-              {/crmButton}
-            </li>
-          {/if}
-
-        {elseif call_user_func(array('CRM_Core_Permission','check'), 'delete contacts')}
-          <li class="crm-delete-action crm-contact-delete">
-            {crmButton p='civicrm/contact/view/delete' q="&reset=1&delete=1&cid=$contactId" class="delete" icon="trash"}
-              {ts}Delete Contact{/ts}
-            {/crmButton}
-          </li>
-        {/if}
-
-        {* Previous and Next contact navigation when accessing contact summary from search results. *}
-        {if $nextPrevError}
-          <li class="crm-next-action">
-            {help id="id-next-prev-buttons"}&nbsp;
-          </li>
-        {else}
-          {if $nextContactID}
-            <li class="crm-next-action">
-              {crmButton p='civicrm/contact/view' q="$urlParams&cid=$nextContactID" class="view" title=$nextContactName icon="chevron-right"}
-                {ts}Next{/ts}
-              {/crmButton}
-            </li>
-          {/if}
-          {if $prevContactID}
-            <li class="crm-previous-action">
-              {crmButton p='civicrm/contact/view' q="$urlParams&cid=$prevContactID" class="view" title=$prevContactName icon="chevron-left"}
-                {ts}Previous{/ts}
-              {/crmButton}
-            </li>
-          {/if}
-        {/if}
-
-        {if !empty($groupOrganizationUrl)}
-          <li class="crm-contact-associated-groups">
-            {crmButton href=$groupOrganizationUrl class="associated-groups" icon="cubes"}
-              {ts}Associated Multi-Org Group{/ts}
-            {/crmButton}
-          </li>
-        {/if}
-      </ul>
-      <div class="clear"></div>
-    </div><!-- .crm-actions-ribbon -->
-  {/if}
-
-  <div class="crm-block crm-content-block crm-contact-page crm-inline-edit-container">
-    <div id="mainTabContainer">
-      <ul class="crm-contact-tabs-list">
-        {foreach from=$allTabs key=tabName item=tabValue}
-          <li id="tab_{$tabValue.id}" class="crm-tab-button ui-corner-all crm-count-{$tabValue.count}{if isset($tabValue.class)} {$tabValue.class}{/if}">
-            <a href="{$tabValue.url}" title="{$tabValue.title|escape}">
-              {$tabValue.title}
-              {if empty($tabValue.hideCount)}<em>{$tabValue.count}</em>{/if}
-            </a>
-          </li>
-        {/foreach}
-      </ul>
-
-      <div id="contact-summary" class="ui-tabs-panel ui-widget-content ui-corner-bottom">
-        {if (isset($hookContentPlacement) and ($hookContentPlacement neq 3)) or empty($hookContentPlacement)}
-
-          {if !empty($hookContent) and isset($hookContentPlacement) and $hookContentPlacement eq 2}
-            {include file="CRM/Contact/Page/View/SummaryHook.tpl"}
-          {/if}
-
-          <div class="contactTopBar contact_panel">
-            <div class="contactCardLeft">
-              {crmRegion name="contact-basic-info-left"}
-                <div class="crm-summary-contactinfo-block">
-                  <div class="crm-summary-block" id="contactinfo-block">
-                    {include file="CRM/Contact/Page/Inline/ContactInfo.tpl"}
-                  </div>
-                </div>
-              {/crmRegion}
-            </div> <!-- end of left side -->
-            <div class="contactCardRight">
-              {crmRegion name="contact-basic-info-right"}
-              {if !empty($imageURL)}
-                <div id="crm-contact-thumbnail">
-                  {include file="CRM/Contact/Page/ContactImage.tpl"}
-                </div>
-              {/if}
-                <div class="{if !empty($imageURL)} float-left{/if}">
-                  <div class="crm-clear crm-summary-block">
-                    <div class="crm-summary-row">
-                      <div class="crm-label" id="tagLink">
-                        <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=$contactId&selectedChild=tag"}"
-                           title="{ts}Edit Tags{/ts}">{ts}Tags{/ts}</a>
-                      </div>
-                      <div class="crm-content" id="tags">
-                        {foreach from=$contactTag item=tagName key=tagId}
-                          <span class="crm-tag-item" {if !empty($allTags.$tagId.color)}style="background-color: {$allTags.$tagId.color}; color: {$allTags.$tagId.color|colorContrast};"{/if} title="{$allTags.$tagId.description|escape}">
-                            {$tagName}
-                          </span>
-                        {/foreach}
-                      </div>
-                    </div>
-                    <div class="crm-summary-row">
-                      <div class="crm-label">{ts}Contact Type{/ts}</div>
-                      <div class="crm-content crm-contact_type_label">
-                        {if isset($contact_type_label)}{$contact_type_label}{/if}
-                      </div>
-                    </div>
-                    <div class="crm-summary-row">
-                      <div class="crm-label">
-                        {ts}Contact ID{/ts}
-                        {if !empty($hookContent.userid)} / {ts}User ID{/ts}{/if}
-                        {if !empty($hookContent.username)} / {ts}Username{/ts}{/if}
-                      </div>
-                      <div class="crm-content">
-                        <span class="crm-contact-contact_id">{$contactId}</span>
-                        {if !empty($hookContent.userid)}
-                          <span class="crm-contact-user_record_id">
-                            &nbsp;/&nbsp;<a title="View user record" class="user-record-link"
-                                            href="/user/{$hookContent.userid}">{$hookContent.userid}</a>
-                          </span>
-                        {/if}
-                        {if !empty($hookContent.username)}
-                          <span class="crm-contact-username">
-                            &nbsp;/&nbsp;
-                            {if !empty($hookContent.userid)}
-                              <a title="View user record" class="user-record-link" href="/user/{$hookContent.userid}">
-                            {/if}
-                              {$hookContent.username|escape}
-                            {if !empty($hookContent.userid)}
-                              </a>
-                            {/if}
-                          </span>
-                        {/if}
-                      </div>
-                    </div>
-                    <div class="crm-summary-row">
-                      <div class="crm-label">{ts}External ID{/ts}</div>
-                      <div class="crm-content crm-contact_external_identifier_label">
-                        {if isset($external_identifier)}{$external_identifier}{/if}
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              {/crmRegion}
-            </div>
-            <!-- end of right side -->
-        </div>
-        <div class="contact_details">
-          <div class="contact_panel">
-            <div class="contactCardLeft">
-              {crmRegion name="contact-details-left"}
-                <div >
-                  {if $showEmail}
-                    <div class="crm-summary-email-block crm-summary-block" id="email-block">
-                      {include file="CRM/Contact/Page/Inline/Email.tpl"}
-                    </div>
-                  {/if}
-                  {if $showWebsite}
-                    <div class="crm-summary-website-block crm-summary-block" id="website-block">
-                      {include file="CRM/Contact/Page/Inline/Website.tpl"}
-                    </div>
-                  {/if}
-                </div>
-              {/crmRegion}
-            </div><!-- #contactCardLeft -->
-
-            <div class="contactCardRight">
-              {crmRegion name="contact-details-right"}
-                <div>
-                  {if $showPhone}
-                    <div class="crm-summary-phone-block crm-summary-block" id="phone-block">
-                      {include file="CRM/Contact/Page/Inline/Phone.tpl"}
-                    </div>
-                  {/if}
-                  {if $showIM}
-                    <div class="crm-summary-im-block crm-summary-block" id="im-block">
-                      {include file="CRM/Contact/Page/Inline/IM.tpl"}
-                    </div>
-                  {/if}
-                  {if $showOpenID}
-                    <div class="crm-summary-openid-block crm-summary-block" id="openid-block">
-                      {include file="CRM/Contact/Page/Inline/OpenID.tpl"}
-                    </div>
-                  {/if}
-                </div>
-              {/crmRegion}
-            </div><!-- #contactCardRight -->
-
-            <div class="clear"></div>
-          </div><!-- #contact_panel -->
-          {if $showAddress}
-            <div class="contact_panel">
-              {crmRegion name="contact-addresses"}
-              {assign var='locationIndex' value=1}
-              {if $address}
-                {foreach from=$address item=add key=locationIndex}
-                  <div class="{if $locationIndex is odd}contactCardLeft{else}contactCardRight{/if} crm-address_{$locationIndex} crm-address-block crm-summary-block">
-                    {include file="CRM/Contact/Page/Inline/Address.tpl"}
-                  </div>
-                {/foreach}
-                {assign var='locationIndex' value=$locationIndex+1}
-              {/if}
-              {* add new link *}
-              {if $permission EQ 'edit'}
-                {assign var='add' value=0}
-                <div class="{if $locationIndex is odd}contactCardLeft{else}contactCardRight{/if} crm-address-block crm-summary-block">
-                  {include file="CRM/Contact/Page/Inline/Address.tpl"}
-                </div>
-              {/if}
-              {/crmRegion}
-              </div> <!-- end of contact panel -->
-            {/if}
-            <div class="contact_panel">
-              {if $showCommunicationPreferences}
-                <div class="contactCardLeft">
-                  {crmRegion name="contact-comm-pref"}
-                  <div class="crm-summary-comm-pref-block">
-                    <div class="crm-summary-block" id="communication-pref-block" >
-                      {include file="CRM/Contact/Page/Inline/CommunicationPreferences.tpl"}
-                    </div>
-                  </div>
-                  {/crmRegion}
-                </div> <!-- contactCardLeft -->
-              {/if}
-              {if $contact_type eq 'Individual' AND $showDemographics}
-                <div class="contactCardRight">
-                  {crmRegion name="contact-demographic"}
-                  <div class="crm-summary-demographic-block">
-                    <div class="crm-summary-block" id="demographic-block">
-                      {include file="CRM/Contact/Page/Inline/Demographics.tpl"}
-                    </div>
-                  </div>
-                  {/crmRegion}
-                </div> <!-- contactCardRight -->
-              {/if}
-              <div class="clear"></div>
-                <div class="separator"></div>
-              </div> <!-- contact panel -->
-            </div><!--contact_details-->
-
-            {if $showCustomData}
-              <div id="customFields">
-                <div class="contact_panel">
-                  <div class="contactCardLeft">
-                    {include file="CRM/Contact/Page/View/CustomDataView.tpl" side='1'}
-                  </div><!--contactCardLeft-->
-                  <div class="contactCardRight">
-                    {include file="CRM/Contact/Page/View/CustomDataView.tpl" side='0'}
-                  </div>
-
-                  <div class="clear"></div>
-                </div>
-              </div>
-            {/if}
-
-            {if !empty($hookContent) and isset($hookContentPlacement) and $hookContentPlacement eq 1}
-              {include file="CRM/Contact/Page/View/SummaryHook.tpl"}
-            {/if}
-          {else}
-             {include file="CRM/Contact/Page/View/SummaryHook.tpl"}
-          {/if}
-        </div>
-      <div class="clear"></div>
-    </div>
-    <div class="clear"></div>
-  </div><!-- /.crm-content-block -->
-{/if}
-
-{* CRM-10560 *}
-{literal}
-<script type="text/javascript">
-CRM.$(function($) {
-  $('.crm-inline-edit-container').crmFormContactLock({
-    ignoreLabel: "{/literal}{ts escape='js'}Ignore{/ts}{literal}",
-    saveAnywayLabel: "{/literal}{ts escape='js'}Save Anyway{/ts}{literal}",
-    reloadLabel: "{/literal}{ts escape='js'}Reload Page{/ts}{literal}"
-  });
-});
-</script>
-{/literal}

From 8974e1c1116bafe0e6d7f8118f21c1426b3a6f94 Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Wed, 24 Oct 2018 10:48:10 -0300
Subject: [PATCH 08/23] PCHR-4346: Sync CRM_Export_BAO_Export in hrjobcontract
 with CiviCRM 5.7.0

---
 hrjobcontract/CRM/Export/BAO/Export.php | 1015 ++++++++---------------
 1 file changed, 357 insertions(+), 658 deletions(-)

diff --git a/hrjobcontract/CRM/Export/BAO/Export.php b/hrjobcontract/CRM/Export/BAO/Export.php
index 2ed08db6325..f8a50920aa2 100644
--- a/hrjobcontract/CRM/Export/BAO/Export.php
+++ b/hrjobcontract/CRM/Export/BAO/Export.php
@@ -42,48 +42,13 @@ class CRM_Export_BAO_Export {
   const EXPORT_ROW_COUNT = 100000;
 
   /**
-   * Get Querymode based on ExportMode
+   * Key representing the head of household in the relationship array.
    *
-   * @param int $exportMode
-   *   Export mode.
+   * e.g. ['8_b_a' => 'Household Member Is', '8_a_b = 'Household Member Of'.....]
    *
-   * @return string $Querymode
-   *   Query Mode
+   * @var
    */
-  public static function getQueryMode($exportMode) {
-    $queryMode = CRM_Contact_BAO_Query::MODE_CONTACTS;
-
-    switch ($exportMode) {
-      case CRM_Export_Form_Select::CONTRIBUTE_EXPORT:
-        $queryMode = CRM_Contact_BAO_Query::MODE_CONTRIBUTE;
-        break;
-
-      case CRM_Export_Form_Select::EVENT_EXPORT:
-        $queryMode = CRM_Contact_BAO_Query::MODE_EVENT;
-        break;
-
-      case CRM_Export_Form_Select::MEMBER_EXPORT:
-        $queryMode = CRM_Contact_BAO_Query::MODE_MEMBER;
-        break;
-
-      case CRM_Export_Form_Select::PLEDGE_EXPORT:
-        $queryMode = CRM_Contact_BAO_Query::MODE_PLEDGE;
-        break;
-
-      case CRM_Export_Form_Select::CASE_EXPORT:
-        $queryMode = CRM_Contact_BAO_Query::MODE_CASE;
-        break;
-
-      case CRM_Export_Form_Select::GRANT_EXPORT:
-        $queryMode = CRM_Contact_BAO_Query::MODE_GRANT;
-        break;
-
-      case CRM_Export_Form_Select::ACTIVITY_EXPORT:
-        $queryMode = CRM_Contact_BAO_Query::MODE_ACTIVITY;
-        break;
-    }
-    return $queryMode;
-  }
+  protected static $relationshipTypes = [];
 
   /**
    * Get default return property for export based on mode
@@ -157,10 +122,8 @@ public static function exportComponent($exportMode) {
 
   /**
    * Get Query Group By Clause
-   * @param int $exportMode
+   * @param \CRM_Export_BAO_ExportProcessor $processor
    *   Export Mode
-   * @param string $queryMode
-   *   Query Mode
    * @param array $returnProperties
    *   Return Properties
    * @param object $query
@@ -169,8 +132,10 @@ public static function exportComponent($exportMode) {
    * @return string $groupBy
    *   Group By Clause
    */
-  public static function getGroupBy($exportMode, $queryMode, $returnProperties, $query) {
+  public static function getGroupBy($processor, $returnProperties, $query) {
     $groupBy = '';
+    $exportMode = $processor->getExportMode();
+    $queryMode = $processor->getQueryMode();
     // @custom HRJobContract extension override by PCHR-1409.
     // We don't want to group Contacts by their ID as it doesn't allow
     // to export Job Contracts and their revisions. So the block below
@@ -221,53 +186,6 @@ public static function getGroupBy($exportMode, $queryMode, $returnProperties, $q
     return $groupBy;
   }
 
-  /**
-   * Define extra properties for the export based on query mode
-   *
-   * @param string $queryMode
-   *   Query Mode
-   * @return array $extraProperties
-   *   Extra Properties
-   */
-  public static function defineExtraProperties($queryMode) {
-    switch ($queryMode) {
-      case CRM_Contact_BAO_Query::MODE_EVENT:
-        $paymentFields = TRUE;
-        $paymentTableId = 'participant_id';
-        $extraReturnProperties = array();
-        break;
-
-      case CRM_Contact_BAO_Query::MODE_MEMBER:
-        $paymentFields = TRUE;
-        $paymentTableId = 'membership_id';
-        $extraReturnProperties = array();
-        break;
-
-      case CRM_Contact_BAO_Query::MODE_PLEDGE:
-        $extraReturnProperties = CRM_Pledge_BAO_Query::extraReturnProperties($queryMode);
-        $paymentFields = TRUE;
-        $paymentTableId = 'pledge_payment_id';
-        break;
-
-      case CRM_Contact_BAO_Query::MODE_CASE:
-        $extraReturnProperties = CRM_Case_BAO_Query::extraReturnProperties($queryMode);
-        $paymentFields = FALSE;
-        $paymentTableId = '';
-        break;
-
-      default:
-        $paymentFields = FALSE;
-        $paymentTableId = '';
-        $extraReturnProperties = array();
-    }
-    $extraProperties = array(
-      'paymentFields' => $paymentFields,
-      'paymentTableId' => $paymentTableId,
-      'extraReturnProperties' => $extraReturnProperties,
-    );
-    return $extraProperties;
-  }
-
   /**
    * Get the list the export fields.
    *
@@ -318,48 +236,20 @@ public static function exportComponents(
     $queryOperator = 'AND'
   ) {
 
+    $processor = new CRM_Export_BAO_ExportProcessor($exportMode, $fields, $queryOperator, $mergeSameHousehold);
     $returnProperties = array();
-    $paymentFields = $selectedPaymentFields = FALSE;
 
     $phoneTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 'phone_type_id');
     // Warning - this imProviders var is used in a somewhat fragile way - don't rename it
     // without manually testing the export of IM provider still works.
     $imProviders = CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 'provider_id');
-    $contactRelationshipTypes = CRM_Contact_BAO_Relationship::getContactRelationshipType(
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      TRUE,
-      'name',
-      FALSE
-    );
+    self::$relationshipTypes = $processor->getRelationshipTypes();
 
-    $queryMode = self::getQueryMode($exportMode);
+    $queryMode = $processor->getQueryMode();
 
     if ($fields) {
-      //construct return properties
-      $locationTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id');
-      $locationTypeFields = array(
-        'street_address',
-        'supplemental_address_1',
-        'supplemental_address_2',
-        'supplemental_address_3',
-        'city',
-        'postal_code',
-        'postal_code_suffix',
-        'geo_code_1',
-        'geo_code_2',
-        'state_province',
-        'country',
-        'phone',
-        'email',
-        'im',
-      );
-
       foreach ($fields as $key => $value) {
-        $relationField = NULL;
-        $relationshipTypes = $fieldName = CRM_Utils_Array::value(1, $value);
+        $fieldName = CRM_Utils_Array::value(1, $value);
         if (!$fieldName) {
           continue;
         }
@@ -368,63 +258,19 @@ public static function exportComponents(
           $returnProperties['contact_id'] = 1;
         }
 
-        if (array_key_exists($relationshipTypes, $contactRelationshipTypes) && (!empty($value[2]) || !empty($value[4]))) {
-          $relPhoneTypeId = $relIMProviderId = NULL;
-          if (!empty($value[2])) {
-            $relationField = CRM_Utils_Array::value(2, $value);
-            if (trim(CRM_Utils_Array::value(3, $value))) {
-              $relLocTypeId = CRM_Utils_Array::value(3, $value);
-            }
-            else {
-              $relLocTypeId = 'Primary';
-            }
-
-            if ($relationField == 'phone') {
-              $relPhoneTypeId = CRM_Utils_Array::value(4, $value);
-            }
-            elseif ($relationField == 'im') {
-              $relIMProviderId = CRM_Utils_Array::value(4, $value);
-            }
-          }
-          elseif (!empty($value[4])) {
-            $relationField = CRM_Utils_Array::value(4, $value);
-            $relLocTypeId = CRM_Utils_Array::value(5, $value);
-            if ($relationField == 'phone') {
-              $relPhoneTypeId = CRM_Utils_Array::value(6, $value);
-            }
-            elseif ($relationField == 'im') {
-              $relIMProviderId = CRM_Utils_Array::value(6, $value);
-            }
-          }
-          if (in_array($relationField, $locationTypeFields) && is_numeric($relLocTypeId)) {
-            if ($relPhoneTypeId) {
-              $returnProperties[$relationshipTypes]['location'][$locationTypes[$relLocTypeId]]['phone-' . $relPhoneTypeId] = 1;
-            }
-            elseif ($relIMProviderId) {
-              $returnProperties[$relationshipTypes]['location'][$locationTypes[$relLocTypeId]]['im-' . $relIMProviderId] = 1;
-            }
-            else {
-              $returnProperties[$relationshipTypes]['location'][$locationTypes[$relLocTypeId]][$relationField] = 1;
-            }
-          }
-          else {
-            $returnProperties[$relationshipTypes][$relationField] = 1;
-          }
-        }
-
-        if ($relationField) {
-          // already handled.
+        if ($processor->isRelationshipTypeKey($fieldName) && (!empty($value[2]) || !empty($value[4]))) {
+          $returnProperties[$fieldName] = $processor->setRelationshipReturnProperties($value, $fieldName);
         }
         elseif (is_numeric(CRM_Utils_Array::value(2, $value))) {
-          $locTypeId = $value[2];
+          $locationName = CRM_Core_PseudoConstant::getName('CRM_Core_BAO_Address', 'location_type_id', $value[2]);
           if ($fieldName == 'phone') {
-            $returnProperties['location'][$locationTypes[$locTypeId]]['phone-' . CRM_Utils_Array::value(3, $value)] = 1;
+            $returnProperties['location'][$locationName]['phone-' . CRM_Utils_Array::value(3, $value)] = 1;
           }
           elseif ($fieldName == 'im') {
-            $returnProperties['location'][$locationTypes[$locTypeId]]['im-' . CRM_Utils_Array::value(3, $value)] = 1;
+            $returnProperties['location'][$locationName]['im-' . CRM_Utils_Array::value(3, $value)] = 1;
           }
           else {
-            $returnProperties['location'][$locationTypes[$locTypeId]][$fieldName] = 1;
+            $returnProperties['location'][$locationName][$fieldName] = 1;
           }
         }
         else {
@@ -433,14 +279,6 @@ public static function exportComponents(
           if ($fieldName == 'event_id') {
             $returnProperties['event_id'] = 1;
           }
-          elseif (
-            $exportMode == CRM_Export_Form_Select::EVENT_EXPORT &&
-            array_key_exists($fieldName, self::componentPaymentFields())
-          ) {
-            $selectedPaymentFields = TRUE;
-            $paymentTableId = 'participant_id';
-            $returnProperties[$fieldName] = 1;
-          }
           else {
             $returnProperties[$fieldName] = 1;
           }
@@ -452,56 +290,11 @@ public static function exportComponents(
       }
     }
     else {
-      $primary = TRUE;
-      $fields = CRM_Contact_BAO_Contact::exportableFields('All', TRUE, TRUE);
-      foreach ($fields as $key => $var) {
-        if ($key && (substr($key, 0, 6) != 'custom')) {
-          //for CRM=952
-          $returnProperties[$key] = 1;
-        }
-      }
-
-      if ($primary) {
-        $returnProperties['location_type'] = 1;
-        $returnProperties['im_provider'] = 1;
-        $returnProperties['phone_type_id'] = 1;
-        $returnProperties['provider_id'] = 1;
-        $returnProperties['current_employer'] = 1;
-      }
-
-      $extraProperties = self::defineExtraProperties($queryMode);
-      $paymentFields = $extraProperties['paymentFields'];
-      $extraReturnProperties = $extraProperties['extraReturnProperties'];
-      $paymentTableId = $extraProperties['paymentTableId'];
-
-      if ($queryMode != CRM_Contact_BAO_Query::MODE_CONTACTS) {
-        $componentReturnProperties = CRM_Contact_BAO_Query::defaultReturnProperties($queryMode);
-        if ($queryMode == CRM_Contact_BAO_Query::MODE_CONTRIBUTE) {
-          // soft credit columns are not automatically populated, because contribution search doesn't require them by default
-          $componentReturnProperties = array_merge(
-              $componentReturnProperties,
-              CRM_Contribute_BAO_Query::softCreditReturnProperties(TRUE));
-        }
-        $returnProperties = array_merge($returnProperties, $componentReturnProperties);
-
-        if (!empty($extraReturnProperties)) {
-          $returnProperties = array_merge($returnProperties, $extraReturnProperties);
-        }
-
-        // unset non exportable fields for components
-        $nonExpoFields = array(
-          'groups',
-          'tags',
-          'notes',
-          'contribution_status_id',
-          'pledge_status_id',
-          'pledge_payment_status_id',
-        );
-        foreach ($nonExpoFields as $value) {
-          unset($returnProperties[$value]);
-        }
-      }
+      $returnProperties = $processor->getDefaultReturnProperties();
     }
+    // @todo - we are working towards this being entirely a property of the processor
+    $processor->setReturnProperties($returnProperties);
+    $paymentTableId = $processor->getPaymentTableID();
 
     if ($mergeSameAddress) {
       //make sure the addressee fields are selected
@@ -564,114 +357,26 @@ public static function exportComponents(
       CRM_Contact_BAO_ProximityQuery::fixInputParams($params);
     }
 
-    $query = new CRM_Contact_BAO_Query($params, $returnProperties, NULL,
-      FALSE, FALSE, $queryMode,
-      FALSE, TRUE, TRUE, NULL, $queryOperator
-    );
-
-    //sort by state
-    //CRM-15301
-    $query->_sort = $order;
-    list($select, $from, $where, $having) = $query->query();
+    list($query, $select, $from, $where, $having) = $processor->runQuery($params, $order, $returnProperties);
 
     if ($mergeSameHousehold == 1) {
       if (empty($returnProperties['id'])) {
         $returnProperties['id'] = 1;
       }
 
-      //also merge Head of Household
-      $relationKeyMOH = CRM_Utils_Array::key('Household Member of', $contactRelationshipTypes);
-      $relationKeyHOH = CRM_Utils_Array::key('Head of Household for', $contactRelationshipTypes);
-
       foreach ($returnProperties as $key => $value) {
-        if (!array_key_exists($key, $contactRelationshipTypes)) {
-          $returnProperties[$relationKeyMOH][$key] = $value;
-          $returnProperties[$relationKeyHOH][$key] = $value;
-        }
-      }
-
-      unset($returnProperties[$relationKeyMOH]['location_type']);
-      unset($returnProperties[$relationKeyMOH]['im_provider']);
-      unset($returnProperties[$relationKeyHOH]['location_type']);
-      unset($returnProperties[$relationKeyHOH]['im_provider']);
-    }
-
-    $allRelContactArray = $relationQuery = array();
-
-    foreach ($contactRelationshipTypes as $rel => $dnt) {
-      if ($relationReturnProperties = CRM_Utils_Array::value($rel, $returnProperties)) {
-        $allRelContactArray[$rel] = array();
-        // build Query for each relationship
-        $relationQuery[$rel] = new CRM_Contact_BAO_Query(NULL, $relationReturnProperties,
-          NULL, FALSE, FALSE, $queryMode
-        );
-        list($relationSelect, $relationFrom, $relationWhere, $relationHaving) = $relationQuery[$rel]->query();
-
-        list($id, $direction) = explode('_', $rel, 2);
-        // identify the relationship direction
-        $contactA = 'contact_id_a';
-        $contactB = 'contact_id_b';
-        if ($direction == 'b_a') {
-          $contactA = 'contact_id_b';
-          $contactB = 'contact_id_a';
-        }
-        if ($exportMode == CRM_Export_Form_Select::CONTACT_EXPORT) {
-          $relIDs = $ids;
-        }
-        elseif ($exportMode == CRM_Export_Form_Select::ACTIVITY_EXPORT) {
-          $sourceID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Source');
-          $dao = CRM_Core_DAO::executeQuery("
-            SELECT contact_id FROM civicrm_activity_contact
-            WHERE activity_id IN ( " . implode(',', $ids) . ") AND
-            record_type_id = {$sourceID}
-          ");
-
-          while ($dao->fetch()) {
-            $relIDs[] = $dao->contact_id;
-          }
-        }
-        else {
-          $component = self::exportComponent($exportMode);
-
-          if ($exportMode == CRM_Export_Form_Select::CASE_EXPORT) {
-            $relIDs = CRM_Case_BAO_Case::retrieveContactIdsByCaseId($ids);
-          }
-          else {
-            $relIDs = CRM_Core_DAO::getContactIDsFromComponent($ids, $component);
+        if (!$processor->isRelationshipTypeKey($key)) {
+          foreach ($processor->getHouseholdRelationshipTypes() as $householdRelationshipType) {
+            if (!in_array($key, ['location_type', 'im_provider'])) {
+              $returnProperties[$householdRelationshipType][$key] = $value;
+            }
           }
         }
-
-        $relationshipJoin = $relationshipClause = '';
-        if (!$selectAll && $componentTable) {
-          $relationshipJoin = " INNER JOIN {$componentTable} ctTable ON ctTable.contact_id = {$contactA}";
-        }
-        elseif (!empty($relIDs)) {
-          $relID = implode(',', $relIDs);
-          $relationshipClause = " AND crel.{$contactA} IN ( {$relID} )";
-        }
-
-        $relationFrom = " {$relationFrom}
-                INNER JOIN civicrm_relationship crel ON crel.{$contactB} = contact_a.id AND crel.relationship_type_id = {$id}
-                {$relationshipJoin} ";
-
-        //check for active relationship status only
-        $today = date('Ymd');
-        $relationActive = " AND (crel.is_active = 1 AND ( crel.end_date is NULL OR crel.end_date >= {$today} ) )";
-        $relationWhere = " WHERE contact_a.is_deleted = 0 {$relationshipClause} {$relationActive}";
-        $relationGroupBy = CRM_Contact_BAO_Query::getGroupByFromSelectColumns($relationQuery[$rel]->_select, "crel.{$contactA}");
-        $relationSelect = "{$relationSelect}, {$contactA} as refContact ";
-        $relationQueryString = "$relationSelect $relationFrom $relationWhere $relationHaving $relationGroupBy";
-
-        $allRelContactDAO = CRM_Core_DAO::executeQuery($relationQueryString);
-        while ($allRelContactDAO->fetch()) {
-          //FIX Me: Migrate this to table rather than array
-          // build the array of all related contacts
-          $allRelContactArray[$rel][$allRelContactDAO->refContact] = clone($allRelContactDAO);
-        }
-        $allRelContactDAO->free();
       }
     }
 
+    list($relationQuery, $allRelContactArray) = self::buildRelatedContactArray($selectAll, $ids, $processor, $componentTable, $returnProperties);
+
     // make sure the groups stuff is included only if specifically specified
     // by the fields param (CRM-1969), else we limit the contacts outputted to only
     // ones that are part of a group
@@ -715,7 +420,7 @@ public static function exportComponents(
 
     $queryString = "$select $from $where $having";
 
-    $groupBy = self::getGroupBy($exportMode, $queryMode, $returnProperties, $query);
+    $groupBy = self::getGroupBy($processor, $returnProperties, $query);
 
     $queryString .= $groupBy;
 
@@ -738,14 +443,14 @@ public static function exportComponents(
     $addPaymentHeader = FALSE;
 
     $paymentDetails = array();
-    if ($paymentFields || $selectedPaymentFields) {
+    if ($processor->isExportPaymentFields()) {
 
       // get payment related in for event and members
       $paymentDetails = CRM_Contribute_BAO_Contribution::getContributionDetails($exportMode, $ids);
       //get all payment headers.
       // If we haven't selected specific payment fields, load in all the
       // payment headers.
-      if (!$selectedPaymentFields) {
+      if (!$processor->isExportSpecifiedPaymentFields()) {
         $paymentHeaders = self::componentPaymentFields();
         if (!empty($paymentDetails)) {
           $addPaymentHeader = TRUE;
@@ -773,7 +478,7 @@ public static function exportComponents(
     // for CRM-3157 purposes
     $i18n = CRM_Core_I18n::singleton();
 
-    list($outputColumns, $headerRows, $sqlColumns, $metadata) = self::getExportStructureArrays($returnProperties, $query, $contactRelationshipTypes, $relationQuery, $selectedPaymentFields);
+    list($outputColumns, $headerRows, $sqlColumns, $metadata) = self::getExportStructureArrays($returnProperties, $processor);
 
     $limitReached = FALSE;
     while (!$limitReached) {
@@ -818,112 +523,23 @@ public static function exportComponents(
             }
           }
 
-          if ($field == 'id') {
-            $row[$field] = $iterationDAO->contact_id;
-            // special case for calculated field
-          }
-          elseif ($field == 'source_contact_id') {
-            $row[$field] = $iterationDAO->contact_id;
-          }
-          elseif ($field == 'pledge_balance_amount') {
-            $row[$field] = $iterationDAO->pledge_amount - $iterationDAO->pledge_total_paid;
-            // special case for calculated field
-          }
-          elseif ($field == 'pledge_next_pay_amount') {
-            $row[$field] = $iterationDAO->pledge_next_pay_amount + $iterationDAO->pledge_outstanding_amount;
-          }
-          elseif (array_key_exists($field, $contactRelationshipTypes)) {
+          if ($processor->isRelationshipTypeKey($field)) {
             $relDAO = CRM_Utils_Array::value($iterationDAO->contact_id, $allRelContactArray[$field]);
             $relationQuery[$field]->convertToPseudoNames($relDAO);
             self::fetchRelationshipDetails($relDAO, $value, $field, $row);
           }
-          elseif (isset($fieldValue) &&
-            $fieldValue != ''
-          ) {
-            //check for custom data
-            if ($cfID = CRM_Core_BAO_CustomField::getKeyID($field)) {
-              $row[$field] = CRM_Core_BAO_CustomField::displayValue($fieldValue, $cfID);
-            }
-
-            elseif (in_array($field, array(
-              'email_greeting',
-              'postal_greeting',
-              'addressee',
-            ))) {
-              //special case for greeting replacement
-              $fldValue = "{$field}_display";
-              $row[$field] = $iterationDAO->$fldValue;
-            }
-            else {
-              //normal fields with a touch of CRM-3157
-              switch ($field) {
-                case 'country':
-                case 'world_region':
-                  $row[$field] = $i18n->crm_translate($fieldValue, array('context' => 'country'));
-                  break;
-
-                case 'state_province':
-                  $row[$field] = $i18n->crm_translate($fieldValue, array('context' => 'province'));
-                  break;
-
-                case 'gender':
-                case 'preferred_communication_method':
-                case 'preferred_mail_format':
-                case 'communication_style':
-                  $row[$field] = $i18n->crm_translate($fieldValue);
-                  break;
-
-                default:
-                  if (isset($metadata[$field])) {
-                    // No I don't know why we do it this way & whether we could
-                    // make better use of pseudoConstants.
-                    if (!empty($metadata[$field]['context'])) {
-                      $row[$field] = $i18n->crm_translate($fieldValue, $metadata[$field]);
-                      break;
-                    }
-                    if (!empty($metadata[$field]['pseudoconstant'])) {
-                      // This is not our normal syntax for pseudoconstants but I am a bit loath to
-                      // call an external function until sure it is not increasing php processing given this
-                      // may be iterated 100,000 times & we already have the $imProvider var loaded.
-                      // That can be next refactor...
-                      // Yes - definitely feeling hatred for this bit of code - I know you will beat me up over it's awfulness
-                      // but I have to reach a stable point....
-                      $varName = $metadata[$field]['pseudoconstant']['var'];
-                      $labels = $$varName;
-                      $row[$field] = $labels[$fieldValue];
-                      break;
-                    }
-
-                  }
-                  $row[$field] = $fieldValue;
-                  break;
-              }
-            }
-          }
-          elseif ($selectedPaymentFields && array_key_exists($field, self::componentPaymentFields())) {
-            $paymentData = CRM_Utils_Array::value($iterationDAO->$paymentTableId, $paymentDetails);
-            $payFieldMapper = array(
-              'componentPaymentField_total_amount' => 'total_amount',
-              'componentPaymentField_contribution_status' => 'contribution_status',
-              'componentPaymentField_payment_instrument' => 'pay_instru',
-              'componentPaymentField_transaction_id' => 'trxn_id',
-              'componentPaymentField_received_date' => 'receive_date',
-            );
-            $row[$field] = CRM_Utils_Array::value($payFieldMapper[$field], $paymentData, '');
-          }
           else {
-            // if field is empty or null
-            $row[$field] = '';
+            $row[$field] = self::getTransformedFieldValue($field, $iterationDAO, $fieldValue, $i18n, $metadata, $paymentDetails, $processor);
           }
         }
 
         // add payment headers if required
-        if ($addPaymentHeader && $paymentFields) {
+        if ($addPaymentHeader && $processor->isExportPaymentFields()) {
           // @todo rather than do this for every single row do it before the loop starts.
           // where other header definitions take place.
           $headerRows = array_merge($headerRows, $paymentHeaders);
           foreach (array_keys($paymentHeaders) as $paymentHdr) {
-            self::sqlColumnDefn($query, $sqlColumns, $paymentHdr);
+            self::sqlColumnDefn($processor, $sqlColumns, $paymentHdr);
           }
         }
 
@@ -938,8 +554,8 @@ public static function exportComponents(
         // data will already be in $row. Otherwise, add payment related
         // information, if appropriate.
         if ($addPaymentHeader) {
-          if (!$selectedPaymentFields) {
-            if ($paymentFields) {
+          if (!$processor->isExportSpecifiedPaymentFields()) {
+            if ($processor->isExportPaymentFields()) {
               $paymentData = CRM_Utils_Array::value($row[$paymentTableId], $paymentDetails);
               if (!is_array($paymentData) || empty($paymentData)) {
                 $paymentData = $nullContributionDetails;
@@ -992,8 +608,9 @@ public static function exportComponents(
 
       // merge the records if they have corresponding households
       if ($mergeSameHousehold) {
-        self::mergeSameHousehold($exportTempTable, $headerRows, $sqlColumns, $relationKeyMOH);
-        self::mergeSameHousehold($exportTempTable, $headerRows, $sqlColumns, $relationKeyHOH);
+        foreach ($processor->getHouseholdRelationshipTypes() as $householdRelationshipType) {
+          self::mergeSameHousehold($exportTempTable, $sqlColumns, $householdRelationshipType);
+        }
       }
 
       // call export hook
@@ -1005,8 +622,8 @@ public static function exportComponents(
         self::writeCSVFromTable($exportTempTable, $headerRows, $sqlColumns, $exportMode);
       }
       else {
-        // return tableName and sqlColumns in test context
-        return array($exportTempTable, $sqlColumns);
+        // return tableName sqlColumns headerRows in test context
+        return array($exportTempTable, $sqlColumns, $headerRows);
       }
 
       // delete the export temp table and component table
@@ -1151,127 +768,12 @@ public static function exportCustom($customSearchClass, $formValues, $order) {
   }
 
   /**
-   * @param $query
+   * @param \CRM_Export_BAO_ExportProcessor $processor
    * @param $sqlColumns
    * @param $field
    */
-  public static function sqlColumnDefn($query, &$sqlColumns, $field) {
-    if (substr($field, -4) == '_a_b' || substr($field, -4) == '_b_a') {
-      return;
-    }
-
-    $fieldName = CRM_Utils_String::munge(strtolower($field), '_', 64);
-    if ($fieldName == 'id') {
-      $fieldName = 'civicrm_primary_id';
-    }
-
-    // early exit for master_id, CRM-12100
-    // in the DB it is an ID, but in the export, we retrive the display_name of the master record
-    // also for current_employer, CRM-16939
-    if ($fieldName == 'master_id' || $fieldName == 'current_employer') {
-      $sqlColumns[$fieldName] = "$fieldName varchar(128)";
-      return;
-    }
-
-    if (substr($fieldName, -11) == 'campaign_id') {
-      // CRM-14398
-      $sqlColumns[$fieldName] = "$fieldName varchar(128)";
-      return;
-    }
-
-    $lookUp = array('prefix_id', 'suffix_id');
-    // set the sql columns
-    if (isset($query->_fields[$field]['type'])) {
-      switch ($query->_fields[$field]['type']) {
-        case CRM_Utils_Type::T_INT:
-        case CRM_Utils_Type::T_BOOLEAN:
-          if (in_array($field, $lookUp)) {
-            $sqlColumns[$fieldName] = "$fieldName varchar(255)";
-          }
-          else {
-            $sqlColumns[$fieldName] = "$fieldName varchar(16)";
-          }
-          break;
-
-        case CRM_Utils_Type::T_STRING:
-          if (isset($query->_fields[$field]['maxlength'])) {
-            $sqlColumns[$fieldName] = "$fieldName varchar({$query->_fields[$field]['maxlength']})";
-          }
-          else {
-            $sqlColumns[$fieldName] = "$fieldName varchar(255)";
-          }
-          break;
-
-        case CRM_Utils_Type::T_TEXT:
-        case CRM_Utils_Type::T_LONGTEXT:
-        case CRM_Utils_Type::T_BLOB:
-        case CRM_Utils_Type::T_MEDIUMBLOB:
-          $sqlColumns[$fieldName] = "$fieldName longtext";
-          break;
-
-        case CRM_Utils_Type::T_FLOAT:
-        case CRM_Utils_Type::T_ENUM:
-        case CRM_Utils_Type::T_DATE:
-        case CRM_Utils_Type::T_TIME:
-        case CRM_Utils_Type::T_TIMESTAMP:
-        case CRM_Utils_Type::T_MONEY:
-        case CRM_Utils_Type::T_EMAIL:
-        case CRM_Utils_Type::T_URL:
-        case CRM_Utils_Type::T_CCNUM:
-        default:
-          $sqlColumns[$fieldName] = "$fieldName varchar(32)";
-          break;
-      }
-    }
-    else {
-      if (substr($fieldName, -3, 3) == '_id') {
-        $sqlColumns[$fieldName] = "$fieldName varchar(255)";
-      }
-      elseif (substr($fieldName, -5, 5) == '_note') {
-        $sqlColumns[$fieldName] = "$fieldName text";
-      }
-      else {
-        $changeFields = array(
-          'groups',
-          'tags',
-          'notes',
-        );
-
-        if (in_array($fieldName, $changeFields)) {
-          $sqlColumns[$fieldName] = "$fieldName text";
-        }
-        else {
-          // set the sql columns for custom data
-          if (isset($query->_fields[$field]['data_type'])) {
-
-            switch ($query->_fields[$field]['data_type']) {
-              case 'String':
-                // May be option labels, which could be up to 512 characters
-                $length = max(512, CRM_Utils_Array::value('text_length', $query->_fields[$field]));
-                $sqlColumns[$fieldName] = "$fieldName varchar($length)";
-                break;
-
-              case 'Country':
-              case 'StateProvince':
-              case 'Link':
-                $sqlColumns[$fieldName] = "$fieldName varchar(255)";
-                break;
-
-              case 'Memo':
-                $sqlColumns[$fieldName] = "$fieldName text";
-                break;
-
-              default:
-                $sqlColumns[$fieldName] = "$fieldName varchar(255)";
-                break;
-            }
-          }
-          else {
-            $sqlColumns[$fieldName] = "$fieldName text";
-          }
-        }
-      }
-    }
+  public static function sqlColumnDefn($processor, &$sqlColumns, $field) {
+    $sqlColumns[$processor->getMungedFieldName($field)] = $processor->getSqlColumnDefinition($field);
   }
 
   /**
@@ -1279,7 +781,7 @@ public static function sqlColumnDefn($query, &$sqlColumns, $field) {
    * @param $details
    * @param $sqlColumns
    */
-  public static function writeDetailsToTable($tableName, &$details, &$sqlColumns) {
+  public static function writeDetailsToTable($tableName, $details, $sqlColumns) {
     if (empty($details)) {
       return;
     }
@@ -1296,10 +798,10 @@ public static function writeDetailsToTable($tableName, &$details, &$sqlColumns)
 
     $sqlClause = array();
 
-    foreach ($details as $dontCare => $row) {
+    foreach ($details as $row) {
       $id++;
       $valueString = array($id);
-      foreach ($row as $dontCare => $value) {
+      foreach ($row as $value) {
         if (empty($value)) {
           $valueString[] = "''";
         }
@@ -1326,9 +828,9 @@ public static function writeDetailsToTable($tableName, &$details, &$sqlColumns)
    *
    * @return string
    */
-  public static function createTempTable(&$sqlColumns) {
+  public static function createTempTable($sqlColumns) {
     //creating a temporary table for the search result that need be exported
-    $exportTempTable = CRM_Core_DAO::createTempTableName('civicrm_export', TRUE);
+    $exportTempTable = CRM_Utils_SQL_TempTable::build()->setDurable()->setCategory('export')->getName();
 
     // also create the sql table
     $sql = "DROP TABLE IF EXISTS {$exportTempTable}";
@@ -1654,18 +1156,15 @@ public static function _buildMasterCopyArray($sql, $exportParams, $sharedAddress
    *
    * @param string $exportTempTable
    *   Temporary temp table that stores the records.
-   * @param array $headerRows
-   *   Array of headers for the export file.
    * @param array $sqlColumns
    *   Array of names of the table columns of the temp table.
    * @param string $prefix
    *   Name of the relationship type that is prefixed to the table columns.
    */
-  public static function mergeSameHousehold($exportTempTable, &$headerRows, &$sqlColumns, $prefix) {
+  public static function mergeSameHousehold($exportTempTable, &$sqlColumns, $prefix) {
     $prefixColumn = $prefix . '_';
     $allKeys = array_keys($sqlColumns);
     $replaced = array();
-    $headerRows = array_values($headerRows);
 
     // name map of the non standard fields in header rows & sql columns
     $mappingFields = array(
@@ -1697,9 +1196,6 @@ public static function mergeSameHousehold($exportTempTable, &$headerRows, &$sqlC
     foreach ($replaced as $from => $to) {
       $clause[] = "$from = $to ";
       unset($sqlColumns[$to]);
-      if ($key = CRM_Utils_Array::key($to, $allKeys)) {
-        unset($headerRows[$key]);
-      }
     }
     $query .= implode(",\n", $clause);
     $query .= " WHERE {$replaced['civicrm_primary_id']} != ''";
@@ -1794,12 +1290,11 @@ public static function writeCSVFromTable($exportTempTable, $headerRows, $sqlColu
    * Manipulate header rows for relationship fields.
    *
    * @param $headerRows
-   * @param $contactRelationshipTypes
    */
-  public static function manipulateHeaderRows(&$headerRows, $contactRelationshipTypes) {
+  public static function manipulateHeaderRows(&$headerRows) {
     foreach ($headerRows as & $header) {
       $split = explode('-', $header);
-      if ($relationTypeName = CRM_Utils_Array::value($split[0], $contactRelationshipTypes)) {
+      if ($relationTypeName = CRM_Utils_Array::value($split[0], self::$relationshipTypes)) {
         $split[0] = $relationTypeName;
         $header = implode('-', $split);
       }
@@ -1885,108 +1380,35 @@ public static function componentPaymentFields() {
    *
    * @param string $field
    * @param array $headerRows
-   * @param array $sqlColumns
-   *   Columns to go in the temp table.
-   * @param CRM_Contact_BAO_Query $query
-   * @param array|string $value
-   * @param array $phoneTypes
-   * @param array $imProviders
-   * @param array $contactRelationshipTypes
-   * @param string $relationQuery
-   * @param array $selectedPaymentFields
+   * @param \CRM_Export_BAO_ExportProcessor $processor
+   *
    * @return array
    */
-  public static function setHeaderRows($field, $headerRows, $sqlColumns, $query, $value, $phoneTypes, $imProviders, $contactRelationshipTypes, $relationQuery, $selectedPaymentFields) {
+  public static function setHeaderRows($field, $headerRows, $processor) {
 
-    // Split campaign into 2 fields for id and title
-    if (substr($field, -14) == 'campaign_title') {
-      $headerRows[] = ts('Campaign Title');
-    }
-    elseif (substr($field, -11) == 'campaign_id') {
+    $queryFields = $processor->getQueryFields();
+    if (substr($field, -11) == 'campaign_id') {
+      // @todo - set this correctly in the xml rather than here.
       $headerRows[] = ts('Campaign ID');
     }
-    elseif (isset($query->_fields[$field]['title'])) {
-      $headerRows[] = $query->_fields[$field]['title'];
+    elseif ($processor->isMergeSameHousehold() && $field === 'id') {
+      $headerRows[] = ts('Household ID');
     }
-    elseif ($field == 'phone_type_id') {
-      $headerRows[] = ts('Phone Type');
+    elseif (isset($queryFields[$field]['title'])) {
+      $headerRows[] = $queryFields[$field]['title'];
     }
     elseif ($field == 'provider_id') {
+      // @todo - set this correctly in the xml rather than here.
       $headerRows[] = ts('IM Service Provider');
     }
-    elseif (substr($field, 0, 5) == 'case_' && $query->_fields['case'][$field]['title']) {
-      $headerRows[] = $query->_fields['case'][$field]['title'];
-    }
-    elseif (array_key_exists($field, $contactRelationshipTypes)) {
-      foreach ($value as $relationField => $relationValue) {
-        // below block is same as primary block (duplicate)
-        if (isset($relationQuery[$field]->_fields[$relationField]['title'])) {
-          if ($relationQuery[$field]->_fields[$relationField]['name'] == 'name') {
-            $headerName = $field . '-' . $relationField;
-          }
-          else {
-            if ($relationField == 'current_employer') {
-              $headerName = $field . '-' . 'current_employer';
-            }
-            else {
-              $headerName = $field . '-' . $relationQuery[$field]->_fields[$relationField]['name'];
-            }
-          }
-
-          $headerRows[] = $headerName;
-
-          self::sqlColumnDefn($query, $sqlColumns, $headerName);
-        }
-        elseif ($relationField == 'phone_type_id') {
-          $headerName = $field . '-' . 'Phone Type';
-          $headerRows[] = $headerName;
-          self::sqlColumnDefn($query, $sqlColumns, $headerName);
-        }
-        elseif ($relationField == 'provider_id') {
-          $headerName = $field . '-' . 'Im Service Provider';
-          $headerRows[] = $headerName;
-          self::sqlColumnDefn($query, $sqlColumns, $headerName);
-        }
-        elseif ($relationField == 'state_province_id') {
-          $headerName = $field . '-' . 'state_province_id';
-          $headerRows[] = $headerName;
-          self::sqlColumnDefn($query, $sqlColumns, $headerName);
-        }
-        elseif (is_array($relationValue) && $relationField == 'location') {
-          // fix header for location type case
-          foreach ($relationValue as $ltype => $val) {
-            foreach (array_keys($val) as $fld) {
-              $type = explode('-', $fld);
-
-              $hdr = "{$ltype}-" . $relationQuery[$field]->_fields[$type[0]]['title'];
-
-              if (!empty($type[1])) {
-                if (CRM_Utils_Array::value(0, $type) == 'phone') {
-                  $hdr .= "-" . CRM_Utils_Array::value($type[1], $phoneTypes);
-                }
-                elseif (CRM_Utils_Array::value(0, $type) == 'im') {
-                  $hdr .= "-" . CRM_Utils_Array::value($type[1], $imProviders);
-                }
-              }
-              $headerName = $field . '-' . $hdr;
-              $headerRows[] = $headerName;
-              self::sqlColumnDefn($query, $sqlColumns, $headerName);
-            }
-          }
-        }
-      }
-      self::manipulateHeaderRows($headerRows, $contactRelationshipTypes);
-    }
-    elseif ($selectedPaymentFields && array_key_exists($field, self::componentPaymentFields())) {
+    elseif ($processor->isExportPaymentFields() && array_key_exists($field, self::componentPaymentFields())) {
       $headerRows[] = CRM_Utils_Array::value($field, self::componentPaymentFields());
     }
     else {
       $headerRows[] = $field;
     }
 
-    self::sqlColumnDefn($query, $sqlColumns, $field);
-
-    return array($headerRows, $sqlColumns);
+    return $headerRows;
   }
 
   /**
@@ -1999,10 +1421,8 @@ public static function setHeaderRows($field, $headerRows, $sqlColumns, $query, $
    * as a step on the refactoring path rather than how it should be.
    *
    * @param array $returnProperties
-   * @param CRM_Contact_BAO_Contact $query
-   * @param array $contactRelationshipTypes
-   * @param string $relationQuery
-   * @param array $selectedPaymentFields
+   * @param \CRM_Export_BAO_ExportProcessor $processor
+   *
    * @return array
    *   - outputColumns Array of columns to be exported. The values don't matter but the key must match the
    *   alias for the field generated by BAO_Query object.
@@ -2019,15 +1439,81 @@ public static function setHeaderRows($field, $headerRows, $sqlColumns, $query, $
    *    - b) this code is old & outdated. Submit your answers to circular bin or better
    *       yet find a way to comment them for posterity.
    */
-  public static function getExportStructureArrays($returnProperties, $query, $contactRelationshipTypes, $relationQuery, $selectedPaymentFields) {
+  public static function getExportStructureArrays($returnProperties, $processor) {
     $metadata = $headerRows = $outputColumns = $sqlColumns = array();
     $phoneTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 'phone_type_id');
     $imProviders = CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 'provider_id');
-
+    $queryFields = $processor->getQueryFields();
     foreach ($returnProperties as $key => $value) {
-      if ($key != 'location' || !is_array($value)) {
+      if (($key != 'location' || !is_array($value)) && !$processor->isRelationshipTypeKey($key)) {
+        $outputColumns[$key] = $value;
+        $headerRows = self::setHeaderRows($key, $headerRows, $processor);
+        self::sqlColumnDefn($processor, $sqlColumns, $key);
+      }
+      elseif ($processor->isRelationshipTypeKey($key)) {
         $outputColumns[$key] = $value;
-        list($headerRows, $sqlColumns) = self::setHeaderRows($key, $headerRows, $sqlColumns, $query, $value, $phoneTypes, $imProviders, $contactRelationshipTypes, $relationQuery, $selectedPaymentFields);
+        $field = $key;
+        foreach ($value as $relationField => $relationValue) {
+          // below block is same as primary block (duplicate)
+          if (isset($queryFields[$relationField]['title'])) {
+            if ($queryFields[$relationField]['name'] == 'name') {
+              $headerName = $field . '-' . $relationField;
+            }
+            else {
+              if ($relationField == 'current_employer') {
+                $headerName = $field . '-' . 'current_employer';
+              }
+              else {
+                $headerName = $field . '-' . $queryFields[$relationField]['name'];
+              }
+            }
+
+            if (!$processor->isHouseholdMergeRelationshipTypeKey($field)) {
+              // Do not add to header row if we are only generating for merge reasons.
+              $headerRows[] = $headerName;
+            }
+
+            self::sqlColumnDefn($processor, $sqlColumns, $headerName);
+          }
+          elseif ($relationField == 'phone_type_id') {
+            $headerName = $field . '-' . 'Phone Type';
+            $headerRows[] = $headerName;
+            self::sqlColumnDefn($processor, $sqlColumns, $headerName);
+          }
+          elseif ($relationField == 'provider_id') {
+            $headerName = $field . '-' . 'Im Service Provider';
+            $headerRows[] = $headerName;
+            self::sqlColumnDefn($processor, $sqlColumns, $headerName);
+          }
+          elseif ($relationField == 'state_province_id') {
+            $headerName = $field . '-' . 'state_province_id';
+            $headerRows[] = $headerName;
+            self::sqlColumnDefn($processor, $sqlColumns, $headerName);
+          }
+          elseif (is_array($relationValue) && $relationField == 'location') {
+            // fix header for location type case
+            foreach ($relationValue as $ltype => $val) {
+              foreach (array_keys($val) as $fld) {
+                $type = explode('-', $fld);
+
+                $hdr = "{$ltype}-" . $queryFields[$type[0]]['title'];
+
+                if (!empty($type[1])) {
+                  if (CRM_Utils_Array::value(0, $type) == 'phone') {
+                    $hdr .= "-" . CRM_Core_PseudoConstant::getLabel('CRM_Core_BAO_Phone', 'phone_type_id', $type[1]);
+                  }
+                  elseif (CRM_Utils_Array::value(0, $type) == 'im') {
+                    $hdr .= "-" . CRM_Core_PseudoConstant::getLabel('CRM_Core_BAO_IM', 'provider_id', $type[1]);
+                  }
+                }
+                $headerName = $field . '-' . $hdr;
+                $headerRows[] = $headerName;
+                self::sqlColumnDefn($processor, $sqlColumns, $headerName);
+              }
+            }
+          }
+        }
+        self::manipulateHeaderRows($headerRows);
       }
       else {
         foreach ($value as $locationType => $locationFields) {
@@ -2035,7 +1521,7 @@ public static function getExportStructureArrays($returnProperties, $query, $cont
             $type = explode('-', $locationFieldName);
 
             $actualDBFieldName = $type[0];
-            $outputFieldName = $locationType . '-' . $query->_fields[$actualDBFieldName]['title'];
+            $outputFieldName = $locationType . '-' . $queryFields[$actualDBFieldName]['title'];
             $daoFieldName = CRM_Utils_String::munge($locationType) . '-' . $actualDBFieldName;
 
             if (!empty($type[1])) {
@@ -2051,8 +1537,9 @@ public static function getExportStructureArrays($returnProperties, $query, $cont
               // Warning: shame inducing hack.
               $metadata[$daoFieldName]['pseudoconstant']['var'] = 'imProviders';
             }
-            self::sqlColumnDefn($query, $sqlColumns, $outputFieldName);
-            list($headerRows, $sqlColumns) = self::setHeaderRows($outputFieldName, $headerRows, $sqlColumns, $query, $value, $phoneTypes, $imProviders, $contactRelationshipTypes, $relationQuery, $selectedPaymentFields);
+            self::sqlColumnDefn($processor, $sqlColumns, $outputFieldName);
+            $headerRows = self::setHeaderRows($outputFieldName, $headerRows, $processor);
+            self::sqlColumnDefn($processor, $sqlColumns, $outputFieldName);
             if ($actualDBFieldName == 'country' || $actualDBFieldName == 'world_region') {
               $metadata[$daoFieldName] = array('context' => 'country');
             }
@@ -2117,6 +1604,10 @@ private static function fetchRelationshipDetails($relDAO, $value, $field, &$row)
       }
       elseif (is_array($relationValue) && $relationField == 'location') {
         foreach ($relationValue as $ltype => $val) {
+          // If the location name has a space in it the we need to handle that. This
+          // is kinda hacky but specifically covered in the ExportTest so later efforts to
+          // improve it should be secure in the knowled it will be caught.
+          $ltype = str_replace(' ', '_', $ltype);
           foreach (array_keys($val) as $fld) {
             $type = explode('-', $fld);
             $fldValue = "{$ltype}-" . $type[0];
@@ -2181,4 +1672,212 @@ private static function fetchRelationshipDetails($relDAO, $value, $field, &$row)
     }
   }
 
+  /**
+   * Get the ids that we want to get related contact details for.
+   *
+   * @param array $ids
+   * @param int $exportMode
+   *
+   * @return array
+   */
+  protected static function getIDsForRelatedContact($ids, $exportMode) {
+    if ($exportMode == CRM_Export_Form_Select::CONTACT_EXPORT) {
+      return $ids;
+    }
+    if ($exportMode == CRM_Export_Form_Select::ACTIVITY_EXPORT) {
+      $relIDs = [];
+      $sourceID = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Source');
+      $dao = CRM_Core_DAO::executeQuery("
+            SELECT contact_id FROM civicrm_activity_contact
+            WHERE activity_id IN ( " . implode(',', $ids) . ") AND
+            record_type_id = {$sourceID}
+          ");
+
+      while ($dao->fetch()) {
+        $relIDs[] = $dao->contact_id;
+      }
+      return $relIDs;
+    }
+    $component = self::exportComponent($exportMode);
+
+    if ($exportMode == CRM_Export_Form_Select::CASE_EXPORT) {
+      return CRM_Case_BAO_Case::retrieveContactIdsByCaseId($ids);
+    }
+    else {
+      return CRM_Core_DAO::getContactIDsFromComponent($ids, $component);
+    }
+  }
+
+  /**
+   * @param $selectAll
+   * @param $ids
+   * @param \CRM_Export_BAO_ExportProcessor $processor
+   * @param $componentTable
+   * @param $returnProperties
+   *
+   * @return array
+   */
+  protected static function buildRelatedContactArray($selectAll, $ids, $processor, $componentTable, $returnProperties) {
+    $allRelContactArray = $relationQuery = array();
+    $queryMode = $processor->getQueryMode();
+    $exportMode = $processor->getExportMode();
+    foreach (self::$relationshipTypes as $rel => $dnt) {
+      if ($relationReturnProperties = CRM_Utils_Array::value($rel, $returnProperties)) {
+        $allRelContactArray[$rel] = array();
+        // build Query for each relationship
+        $relationQuery[$rel] = new CRM_Contact_BAO_Query(NULL, $relationReturnProperties,
+          NULL, FALSE, FALSE, $queryMode
+        );
+        list($relationSelect, $relationFrom, $relationWhere, $relationHaving) = $relationQuery[$rel]->query();
+
+        list($id, $direction) = explode('_', $rel, 2);
+        // identify the relationship direction
+        $contactA = 'contact_id_a';
+        $contactB = 'contact_id_b';
+        if ($direction == 'b_a') {
+          $contactA = 'contact_id_b';
+          $contactB = 'contact_id_a';
+        }
+        $relIDs = self::getIDsForRelatedContact($ids, $exportMode);
+
+        $relationshipJoin = $relationshipClause = '';
+        if (!$selectAll && $componentTable) {
+          $relationshipJoin = " INNER JOIN {$componentTable} ctTable ON ctTable.contact_id = {$contactA}";
+        }
+        elseif (!empty($relIDs)) {
+          $relID = implode(',', $relIDs);
+          $relationshipClause = " AND crel.{$contactA} IN ( {$relID} )";
+        }
+
+        $relationFrom = " {$relationFrom}
+                INNER JOIN civicrm_relationship crel ON crel.{$contactB} = contact_a.id AND crel.relationship_type_id = {$id}
+                {$relationshipJoin} ";
+
+        //check for active relationship status only
+        $today = date('Ymd');
+        $relationActive = " AND (crel.is_active = 1 AND ( crel.end_date is NULL OR crel.end_date >= {$today} ) )";
+        $relationWhere = " WHERE contact_a.is_deleted = 0 {$relationshipClause} {$relationActive}";
+        $relationGroupBy = CRM_Contact_BAO_Query::getGroupByFromSelectColumns($relationQuery[$rel]->_select, "crel.{$contactA}");
+        $relationSelect = "{$relationSelect}, {$contactA} as refContact ";
+        $relationQueryString = "$relationSelect $relationFrom $relationWhere $relationHaving $relationGroupBy";
+
+        $allRelContactDAO = CRM_Core_DAO::executeQuery($relationQueryString);
+        while ($allRelContactDAO->fetch()) {
+          //FIX Me: Migrate this to table rather than array
+          // build the array of all related contacts
+          $allRelContactArray[$rel][$allRelContactDAO->refContact] = clone($allRelContactDAO);
+        }
+        $allRelContactDAO->free();
+      }
+    }
+    return array($relationQuery, $allRelContactArray);
+  }
+
+  /**
+   * @param $field
+   * @param $iterationDAO
+   * @param $fieldValue
+   * @param $i18n
+   * @param $metadata
+   * @param $paymentDetails
+   *
+   * @param \CRM_Export_BAO_ExportProcessor $processor
+   *
+   * @return string
+   */
+  protected static function getTransformedFieldValue($field, $iterationDAO, $fieldValue, $i18n, $metadata, $paymentDetails, $processor) {
+
+    if ($field == 'id') {
+      return $iterationDAO->contact_id;
+      // special case for calculated field
+    }
+    elseif ($field == 'source_contact_id') {
+      return $iterationDAO->contact_id;
+    }
+    elseif ($field == 'pledge_balance_amount') {
+      return $iterationDAO->pledge_amount - $iterationDAO->pledge_total_paid;
+      // special case for calculated field
+    }
+    elseif ($field == 'pledge_next_pay_amount') {
+      return $iterationDAO->pledge_next_pay_amount + $iterationDAO->pledge_outstanding_amount;
+    }
+    elseif (isset($fieldValue) &&
+      $fieldValue != ''
+    ) {
+      //check for custom data
+      if ($cfID = CRM_Core_BAO_CustomField::getKeyID($field)) {
+        return CRM_Core_BAO_CustomField::displayValue($fieldValue, $cfID);
+      }
+
+      elseif (in_array($field, array(
+        'email_greeting',
+        'postal_greeting',
+        'addressee',
+      ))) {
+        //special case for greeting replacement
+        $fldValue = "{$field}_display";
+        return $iterationDAO->$fldValue;
+      }
+      else {
+        //normal fields with a touch of CRM-3157
+        switch ($field) {
+          case 'country':
+          case 'world_region':
+            return $i18n->crm_translate($fieldValue, array('context' => 'country'));
+
+          case 'state_province':
+            return $i18n->crm_translate($fieldValue, array('context' => 'province'));
+
+          case 'gender':
+          case 'preferred_communication_method':
+          case 'preferred_mail_format':
+          case 'communication_style':
+            return $i18n->crm_translate($fieldValue);
+
+          default:
+            if (isset($metadata[$field])) {
+              // No I don't know why we do it this way & whether we could
+              // make better use of pseudoConstants.
+              if (!empty($metadata[$field]['context'])) {
+                return $i18n->crm_translate($fieldValue, $metadata[$field]);
+              }
+              if (!empty($metadata[$field]['pseudoconstant'])) {
+                // This is not our normal syntax for pseudoconstants but I am a bit loath to
+                // call an external function until sure it is not increasing php processing given this
+                // may be iterated 100,000 times & we already have the $imProvider var loaded.
+                // That can be next refactor...
+                // Yes - definitely feeling hatred for this bit of code - I know you will beat me up over it's awfulness
+                // but I have to reach a stable point....
+                $varName = $metadata[$field]['pseudoconstant']['var'];
+                if ($varName === 'imProviders') {
+                  return CRM_Core_PseudoConstant::getLabel('CRM_Core_DAO_IM', 'provider_id', $fieldValue);
+                }
+                if ($varName === 'phoneTypes') {
+                  return CRM_Core_PseudoConstant::getLabel('CRM_Core_DAO_Phone', 'phone_type_id', $fieldValue);
+                }
+              }
+
+            }
+            return $fieldValue;
+        }
+      }
+    }
+    elseif ($processor->isExportSpecifiedPaymentFields() && array_key_exists($field, self::componentPaymentFields())) {
+      $paymentTableId = $processor->getPaymentTableID();
+      $paymentData = CRM_Utils_Array::value($iterationDAO->$paymentTableId, $paymentDetails);
+      $payFieldMapper = array(
+        'componentPaymentField_total_amount' => 'total_amount',
+        'componentPaymentField_contribution_status' => 'contribution_status',
+        'componentPaymentField_payment_instrument' => 'pay_instru',
+        'componentPaymentField_transaction_id' => 'trxn_id',
+        'componentPaymentField_received_date' => 'receive_date',
+      );
+      return CRM_Utils_Array::value($payFieldMapper[$field], $paymentData, '');
+    }
+    else {
+      // if field is empty or null
+      return '';
+    }
+  }
+
 }

From 0232ce435a7be3721621020827916e79868f4cf1 Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Thu, 1 Nov 2018 09:27:38 -0300
Subject: [PATCH 09/23] PCHR-4346: Remove the overridden `Navigation.php` file

The only reason we needed the overridden file was to fix an
error in CiviCRM Core. Since this has been now fixed in core,
we don't need to file anymore.

References: https://github.com/civicrm/civicrm-core/pull/13031
https://github.com/compucorp/civicrm-core/pull/28
---
 hrui/CRM/Core/BAO/Navigation.php | 1047 ------------------------------
 1 file changed, 1047 deletions(-)
 delete mode 100755 hrui/CRM/Core/BAO/Navigation.php

diff --git a/hrui/CRM/Core/BAO/Navigation.php b/hrui/CRM/Core/BAO/Navigation.php
deleted file mode 100755
index 40d105823df..00000000000
--- a/hrui/CRM/Core/BAO/Navigation.php
+++ /dev/null
@@ -1,1047 +0,0 @@
-<?php
-/*
- +--------------------------------------------------------------------+
- | CiviCRM version 5                                                  |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
- */
-
-/**
- *
- * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
- */
-class CRM_Core_BAO_Navigation extends CRM_Core_DAO_Navigation {
-
-  // Number of characters in the menu js cache key
-  const CACHE_KEY_STRLEN = 8;
-
-  /**
-   * Class constructor.
-   */
-  public function __construct() {
-    parent::__construct();
-  }
-
-  /**
-   * Update the is_active flag in the db.
-   *
-   * @param int $id
-   *   Id of the database record.
-   * @param bool $is_active
-   *   Value we want to set the is_active field.
-   *
-   * @return bool
-   *   true if we found and updated the object, else false
-   */
-  public static function setIsActive($id, $is_active) {
-    return CRM_Core_DAO::setFieldValue('CRM_Core_DAO_Navigation', $id, 'is_active', $is_active);
-  }
-
-  /**
-   * Add/update navigation record.
-   *
-   * @param array $params Submitted values
-   *
-   * @return CRM_Core_DAO_Navigation
-   *   navigation object
-   */
-  public static function add(&$params) {
-    $navigation = new CRM_Core_DAO_Navigation();
-    if (empty($params['id'])) {
-      $params['is_active'] = CRM_Utils_Array::value('is_active', $params, FALSE);
-      $params['has_separator'] = CRM_Utils_Array::value('has_separator', $params, FALSE);
-      $params['domain_id'] = CRM_Utils_Array::value('domain_id', $params, CRM_Core_Config::domainID());
-    }
-
-    if (!isset($params['id']) ||
-      (CRM_Utils_Array::value('parent_id', $params) != CRM_Utils_Array::value('current_parent_id', $params))
-    ) {
-      /* re/calculate the weight, if the Parent ID changed OR create new menu */
-
-      if ($navName = CRM_Utils_Array::value('name', $params)) {
-        $params['name'] = $navName;
-      }
-      elseif ($navLabel = CRM_Utils_Array::value('label', $params)) {
-        $params['name'] = $navLabel;
-      }
-
-      $params['weight'] = self::calculateWeight(CRM_Utils_Array::value('parent_id', $params));
-    }
-
-    if (array_key_exists('permission', $params) && is_array($params['permission'])) {
-      $params['permission'] = implode(',', $params['permission']);
-    }
-
-    $navigation->copyValues($params);
-
-    $navigation->save();
-    return $navigation;
-  }
-
-  /**
-   * Fetch object based on array of properties.
-   *
-   * @param array $params
-   *   (reference ) an assoc array of name/value pairs.
-   * @param array $defaults
-   *   (reference ) an assoc array to hold the flattened values.
-   *
-   * @return CRM_Core_BAO_Navigation|null
-   *   object on success, NULL otherwise
-   */
-  public static function retrieve(&$params, &$defaults) {
-    $navigation = new CRM_Core_DAO_Navigation();
-    $navigation->copyValues($params);
-
-    $navigation->domain_id = CRM_Core_Config::domainID();
-
-    if ($navigation->find(TRUE)) {
-      CRM_Core_DAO::storeValues($navigation, $defaults);
-      return $navigation;
-    }
-    return NULL;
-  }
-
-  /**
-   * Calculate navigation weight.
-   *
-   * @param int $parentID
-   *   Parent_id of a menu.
-   * @param int $menuID
-   *   Menu id.
-   *
-   * @return int
-   *   $weight string
-   */
-  public static function calculateWeight($parentID = NULL, $menuID = NULL) {
-    $domainID = CRM_Core_Config::domainID();
-
-    $weight = 1;
-    // we reset weight for each parent, i.e we start from 1 to n
-    // calculate max weight for top level menus, if parent id is absent
-    if (!$parentID) {
-      $query = "SELECT max(weight) as weight FROM civicrm_navigation WHERE parent_id IS NULL AND domain_id = $domainID";
-    }
-    else {
-      // if parent is passed, we need to get max weight for that particular parent
-      $query = "SELECT max(weight) as weight FROM civicrm_navigation WHERE parent_id = {$parentID} AND domain_id = $domainID";
-    }
-
-    $dao = CRM_Core_DAO::executeQuery($query);
-    $dao->fetch();
-    return $weight = $weight + $dao->weight;
-  }
-
-  /**
-   * Get formatted menu list.
-   *
-   * @return array
-   *   returns associated array
-   */
-  public static function getNavigationList() {
-    $cacheKeyString = "navigationList";
-    $whereClause = '';
-
-    $config = CRM_Core_Config::singleton();
-
-    // check if we can retrieve from database cache
-    $navigations = CRM_Core_BAO_Cache::getItem('navigation', $cacheKeyString);
-
-    if (!$navigations) {
-      $domainID = CRM_Core_Config::domainID();
-      $query = "
-SELECT id, label, parent_id, weight, is_active, name
-FROM civicrm_navigation WHERE domain_id = $domainID";
-      $result = CRM_Core_DAO::executeQuery($query);
-
-      $pidGroups = array();
-      while ($result->fetch()) {
-        $pidGroups[$result->parent_id][$result->label] = $result->id;
-      }
-
-      foreach ($pidGroups[''] as $label => $val) {
-        $pidGroups[''][$label] = self::_getNavigationValue($val, $pidGroups);
-      }
-
-      $navigations = array();
-      self::_getNavigationLabel($pidGroups[''], $navigations);
-
-      CRM_Core_BAO_Cache::setItem($navigations, 'navigation', $cacheKeyString);
-    }
-    return $navigations;
-  }
-
-  /**
-   * Helper function for getNavigationList().
-   *
-   * @param array $list
-   *   Menu info.
-   * @param array $navigations
-   *   Navigation menus.
-   * @param string $separator
-   *   Menu separator.
-   */
-  public static function _getNavigationLabel($list, &$navigations, $separator = '') {
-    $i18n = CRM_Core_I18n::singleton();
-    foreach ($list as $label => $val) {
-      if ($label == 'navigation_id') {
-        continue;
-      }
-      $translatedLabel = $i18n->crm_translate($label, array('context' => 'menu'));
-      $navigations[is_array($val) ? $val['navigation_id'] : $val] = "{$separator}{$translatedLabel}";
-      if (is_array($val)) {
-        self::_getNavigationLabel($val, $navigations, $separator . '&nbsp;&nbsp;&nbsp;&nbsp;');
-      }
-    }
-  }
-
-  /**
-   * Helper function for getNavigationList().
-   *
-   * @param string $val
-   *   Menu name.
-   * @param array $pidGroups
-   *   Parent menus.
-   *
-   * @return array
-   */
-  public static function _getNavigationValue($val, &$pidGroups) {
-    if (array_key_exists($val, $pidGroups)) {
-      $list = array('navigation_id' => $val);
-      foreach ($pidGroups[$val] as $label => $id) {
-        $list[$label] = self::_getNavigationValue($id, $pidGroups);
-      }
-      unset($pidGroups[$val]);
-      return $list;
-    }
-    else {
-      return $val;
-    }
-  }
-
-  /**
-   * Build navigation tree.
-   *
-   * @return array
-   *   nested array of menus
-   */
-  public static function buildNavigationTree() {
-    $domainID = CRM_Core_Config::domainID();
-    $navigationTree = array();
-
-    $navigationMenu = new self();
-    $navigationMenu->domain_id = $domainID;
-    $navigationMenu->orderBy('parent_id, weight');
-    $navigationMenu->find();
-
-    while ($navigationMenu->fetch()) {
-      $navigationTree[$navigationMenu->id] = array(
-        'attributes' => array(
-          'label' => $navigationMenu->label,
-          'name' => $navigationMenu->name,
-          'url' => $navigationMenu->url,
-          'icon' => $navigationMenu->icon,
-          'weight' => $navigationMenu->weight,
-          'permission' => $navigationMenu->permission,
-          'operator' => $navigationMenu->permission_operator,
-          'separator' => $navigationMenu->has_separator,
-          'parentID' => $navigationMenu->parent_id,
-          'navID' => $navigationMenu->id,
-          'active' => $navigationMenu->is_active,
-        ),
-      );
-    }
-
-    return self::buildTree($navigationTree);
-  }
-
-  /**
-   * Convert flat array to nested.
-   *
-   * @param array $elements
-   * @param int|null $parentId
-   *
-   * @return array
-   */
-  private static function buildTree($elements, $parentId = NULL) {
-    $branch = array();
-
-    foreach ($elements as $id => $element) {
-      if ($element['attributes']['parentID'] == $parentId) {
-        $children = self::buildTree($elements, $id);
-        if ($children) {
-          $element['child'] = $children;
-        }
-        $branch[$id] = $element;
-      }
-    }
-
-    return $branch;
-  }
-
-  /**
-   * Build menu.
-   *
-   * @return string
-   */
-  public static function buildNavigation() {
-    $navigations = self::buildNavigationTree();
-    $navigationString = '';
-
-    // run the Navigation  through a hook so users can modify it
-    CRM_Utils_Hook::navigationMenu($navigations);
-    self::fixNavigationMenu($navigations);
-
-    // Hooks have added menu items in an arbitrary order. We need to order by
-    // weight again. I would put this function directly after
-    // CRM_Utils_Hook::navigationMenu but for some reason, fixNavigationMenu is
-    // moving items added by hooks on the end of the menu. Hence I do it
-    // afterwards
-    self::orderByWeight($navigations);
-
-    //skip children menu item if user don't have access to parent menu item
-    $skipMenuItems = array();
-    foreach ($navigations as $key => $value) {
-      // Home is a special case
-      if ($value['attributes']['name'] != 'Home') {
-        $name = self::getMenuName($value, $skipMenuItems);
-        if ($name) {
-          //separator before
-          if (isset($value['attributes']['separator']) && $value['attributes']['separator'] == 2) {
-            $navigationString .= '<li class="menu-separator"></li>';
-          }
-          $removeCharacters = array('/', '!', '&', '*', ' ', '(', ')', '.');
-          $navigationString .= '<li class="menumain crm-' . str_replace($removeCharacters, '_', $value['attributes']['label']) . '">' . $name;
-        }
-      }
-      self::recurseNavigation($value, $navigationString, $skipMenuItems);
-    }
-
-    // clean up - Need to remove empty <ul>'s, this happens when user don't have
-    // permission to access parent
-    $navigationString = str_replace('<ul></ul></li>', '', $navigationString);
-
-    return $navigationString;
-  }
-
-  /**
-   * buildNavigationTree retreives items in order. We call this function to
-   * ensure that any items added by the hook are also in the correct order.
-   */
-  private static function orderByWeight(&$navigations) {
-    // sort each item in navigations by weight
-    usort($navigations, function($a, $b) {
-
-      // If no weight have been defined for an item put it at the end of the list
-      if (!isset($a['attributes']['weight'])) {
-        $a['attributes']['weight'] = 1000;
-      }
-      if (!isset($b['attributes']['weight'])) {
-        $b['attributes']['weight'] = 1000;
-      }
-      return $a['attributes']['weight'] - $b['attributes']['weight'];
-    });
-
-    // If any of the $navigations have children, recurse
-    foreach ($navigations as $navigation) {
-      if (isset($navigation['child'])) {
-        self::orderByWeight($navigation['child']);
-      }
-    }
-  }
-
-  /**
-   * Recursively check child menus.
-   *
-   * @param array $value
-   * @param string $navigationString
-   * @param array $skipMenuItems
-   *
-   * @return string
-   */
-  public static function recurseNavigation(&$value, &$navigationString, $skipMenuItems) {
-    if (!empty($value['child'])) {
-      $navigationString .= '<ul>';
-    }
-    else {
-      $navigationString .= '</li>';
-      //locate separator after
-      if (isset($value['attributes']['separator']) && $value['attributes']['separator'] == 1) {
-        $navigationString .= '<li class="menu-separator"></li>';
-      }
-    }
-
-    if (!empty($value['child'])) {
-      foreach ($value['child'] as $val) {
-        $name = self::getMenuName($val, $skipMenuItems);
-        if ($name) {
-          //locate separator before
-          if (isset($val['attributes']['separator']) && $val['attributes']['separator'] == 2) {
-            $navigationString .= '<li class="menu-separator"></li>';
-          }
-          $removeCharacters = array('/', '!', '&', '*', ' ', '(', ')', '.');
-          $navigationString .= '<li class="crm-' . str_replace($removeCharacters, '_', $val['attributes']['label']) . '">' . $name;
-          self::recurseNavigation($val, $navigationString, $skipMenuItems);
-        }
-      }
-    }
-    if (!empty($value['child'])) {
-      $navigationString .= '</ul></li>';
-      if (isset($value['attributes']['separator']) && $value['attributes']['separator'] == 1) {
-        $navigationString .= '<li class="menu-separator"></li>';
-      }
-    }
-    return $navigationString;
-  }
-
-  /**
-   * Given a navigation menu, generate navIDs for any items which are
-   * missing them.
-   *
-   * @param array $nodes
-   *   Each key is a numeral; each value is a node in
-   *   the menu tree (with keys "child" and "attributes").
-   */
-  public static function fixNavigationMenu(&$nodes) {
-    $maxNavID = 1;
-    array_walk_recursive($nodes, function($item, $key) use (&$maxNavID) {
-      if ($key === 'navID') {
-        $maxNavID = max($maxNavID, $item);
-      }
-    });
-    self::_fixNavigationMenu($nodes, $maxNavID, NULL);
-  }
-
-  /**
-   * @param array $nodes
-   *   Each key is a numeral; each value is a node in
-   *   the menu tree (with keys "child" and "attributes").
-   * @param int $maxNavID
-   * @param int $parentID
-   */
-  private static function _fixNavigationMenu(&$nodes, &$maxNavID, $parentID) {
-    $origKeys = array_keys($nodes);
-    foreach ($origKeys as $origKey) {
-      if (!isset($nodes[$origKey]['attributes']['parentID']) && $parentID !== NULL) {
-        $nodes[$origKey]['attributes']['parentID'] = $parentID;
-      }
-      // If no navID, then assign navID and fix key.
-      if (!isset($nodes[$origKey]['attributes']['navID'])) {
-        $newKey = ++$maxNavID;
-        $nodes[$origKey]['attributes']['navID'] = $newKey;
-        if ($origKey != $newKey) {
-          // If the keys are different, reset the array index to match.
-          $nodes[$newKey] = $nodes[$origKey];
-          unset($nodes[$origKey]);
-          $origKey = $newKey;
-        }
-      }
-      if (isset($nodes[$origKey]['child']) && is_array($nodes[$origKey]['child'])) {
-        self::_fixNavigationMenu($nodes[$origKey]['child'], $maxNavID, $nodes[$origKey]['attributes']['navID']);
-      }
-    }
-  }
-
-  /**
-   * Get Menu name.
-   *
-   * @param $value
-   * @param array $skipMenuItems
-   *
-   * @return bool|string
-   */
-  public static function getMenuName(&$value, &$skipMenuItems) {
-    // we need to localise the menu labels (CRM-5456) and don’t
-    // want to use ts() as it would throw the ts-extractor off
-    $i18n = CRM_Core_I18n::singleton();
-
-    $name = $i18n->crm_translate($value['attributes']['label'], array('context' => 'menu'));
-    $url = CRM_Utils_Array::value('url', $value['attributes']);
-    $permission = CRM_Utils_Array::value('permission', $value['attributes']);
-    $operator = CRM_Utils_Array::value('operator', $value['attributes']);
-    $parentID = CRM_Utils_Array::value('parentID', $value['attributes']);
-    $navID = CRM_Utils_Array::value('navID', $value['attributes']);
-    $active = CRM_Utils_Array::value('active', $value['attributes']);
-    $menuName = CRM_Utils_Array::value('name', $value['attributes']);
-    $target = CRM_Utils_Array::value('target', $value['attributes']);
-
-    if (in_array($parentID, $skipMenuItems) || !$active) {
-      $skipMenuItems[] = $navID;
-      return FALSE;
-    }
-
-    $config = CRM_Core_Config::singleton();
-
-    $makeLink = FALSE;
-    if (!empty($url)) {
-      // Skip processing fully-formed urls
-      if (substr($url, 0, 4) !== 'http' && $url[0] !== '/') {
-        //CRM-7656 --make sure to separate out url path from url params,
-        //as we'r going to validate url path across cross-site scripting.
-        $parsedUrl = parse_url($url);
-        if (empty($parsedUrl['query'])) {
-          $parsedUrl['query'] = NULL;
-        }
-        if (empty($parsedUrl['fragment'])) {
-          $parsedUrl['fragment'] = NULL;
-        }
-        $url = CRM_Utils_System::url($parsedUrl['path'], $parsedUrl['query'], FALSE, $parsedUrl['fragment'], TRUE);
-      }
-      elseif (strpos($url, '&amp;') === FALSE) {
-        $url = htmlspecialchars($url);
-      }
-      $makeLink = TRUE;
-    }
-
-    static $allComponents;
-    if (!$allComponents) {
-      $allComponents = CRM_Core_Component::getNames();
-    }
-
-    if (isset($permission) && $permission) {
-      $permissions = explode(',', $permission);
-
-      $hasPermission = FALSE;
-      foreach ($permissions as $key) {
-        $key = trim($key);
-        $showItem = TRUE;
-
-        //get the component name from permission.
-        $componentName = CRM_Core_Permission::getComponentName($key);
-
-        if ($componentName) {
-          if (!in_array($componentName, $config->enableComponents) ||
-            !CRM_Core_Permission::check($key)
-          ) {
-            $showItem = FALSE;
-            if ($operator == 'AND') {
-              $skipMenuItems[] = $navID;
-              return $showItem;
-            }
-          }
-          else {
-            $hasPermission = TRUE;
-          }
-        }
-        elseif (!CRM_Core_Permission::check($key)) {
-          $showItem = FALSE;
-          if ($operator == 'AND') {
-            $skipMenuItems[] = $navID;
-            return $showItem;
-          }
-        }
-        else {
-          $hasPermission = TRUE;
-        }
-      }
-
-      if (!$showItem && !$hasPermission) {
-        $skipMenuItems[] = $navID;
-        return FALSE;
-      }
-    }
-
-    if (!empty($value['attributes']['icon'])) {
-      $menuIcon = sprintf('<i class="%s"></i>', $value['attributes']['icon']);
-      $name = $menuIcon . $name;
-    }
-
-    if ($makeLink) {
-      $url = CRM_Utils_System::evalUrl($url);
-      if ($target) {
-        $name = "<a href=\"{$url}\" target=\"{$target}\">{$name}</a>";
-      }
-      else {
-        $name = "<a href=\"{$url}\">{$name}</a>";
-      }
-    }
-
-    return $name;
-  }
-
-  /**
-   * Create navigation for CiviCRM Admin Menu.
-   *
-   * @param int $contactID
-   *   Contact id.
-   *
-   * @return string
-   *   returns navigation html
-   */
-  public static function createNavigation($contactID) {
-    $config = CRM_Core_Config::singleton();
-
-    $navigation = self::buildNavigation();
-
-    if ($navigation) {
-
-      //add additional navigation items
-      $logoutURL = CRM_Utils_System::url('civicrm/logout', 'reset=1');
-
-      // get home menu from db
-      $homeParams = array('name' => 'Home');
-      $homeNav = array();
-      $homeIcon = '<span class="crm-logo-sm" ></span>';
-      self::retrieve($homeParams, $homeNav);
-      if ($homeNav) {
-        if (array_key_exists('query', parse_url($homeNav['url']))) {
-          list($path, $q) = explode('?', $homeNav['url']);
-        } else {
-          $q = NULL;
-          $path = $homeNav['url'];
-        }
-
-        $homeURL = CRM_Utils_System::url($path, $q);
-        $homeLabel = $homeNav['label'];
-        // CRM-6804 (we need to special-case this as we don’t ts()-tag variables)
-        if ($homeLabel == 'Home') {
-          $homeLabel = ts('CiviCRM Home');
-        }
-      }
-      else {
-        $homeURL = CRM_Utils_System::url('civicrm/dashboard', 'reset=1');
-        $homeLabel = ts('CiviCRM Home');
-      }
-      // Link to hide the menubar
-      $hideLabel = ts('Hide Menu');
-
-      $prepandString = "
-        <li class='menumain crm-link-home'>$homeIcon
-          <ul id='civicrm-home'>
-            <li><a href='$homeURL'>$homeLabel</a></li>
-            <li><a href='#' class='crm-hidemenu'>$hideLabel</a></li>
-            <li><a href='$logoutURL' class='crm-logout-link'>" . ts('Log out') . "</a></li>
-          </ul>";
-      // <li> tag doesn't need to be closed
-    }
-    return $prepandString . $navigation;
-  }
-
-  /**
-   * Reset navigation for all contacts or a specified contact.
-   *
-   * @param int $contactID
-   *   Reset only entries belonging to that contact ID.
-   *
-   * @return string
-   */
-  public static function resetNavigation($contactID = NULL) {
-    $newKey = CRM_Utils_String::createRandom(self::CACHE_KEY_STRLEN, CRM_Utils_String::ALPHANUMERIC);
-    if (!$contactID) {
-      $ser = serialize($newKey);
-      $query = "UPDATE civicrm_setting SET value = '$ser' WHERE name='navigation' AND contact_id IS NOT NULL";
-      CRM_Core_DAO::executeQuery($query);
-      CRM_Core_BAO_Cache::deleteGroup('navigation');
-    }
-    else {
-      // before inserting check if contact id exists in db
-      // this is to handle weird case when contact id is in session but not in db
-      $contact = new CRM_Contact_DAO_Contact();
-      $contact->id = $contactID;
-      if ($contact->find(TRUE)) {
-        CRM_Core_BAO_Setting::setItem(
-          $newKey,
-          CRM_Core_BAO_Setting::PERSONAL_PREFERENCES_NAME,
-          'navigation',
-          NULL,
-          $contactID,
-          $contactID
-        );
-      }
-    }
-
-    return $newKey;
-  }
-
-  /**
-   * Process navigation.
-   *
-   * @param array $params
-   *   Associated array, $_GET.
-   */
-  public static function processNavigation(&$params) {
-    $nodeID = (int) str_replace("node_", "", $params['id']);
-    $referenceID = (int) str_replace("node_", "", $params['ref_id']);
-    $position = $params['ps'];
-    $type = $params['type'];
-    $label = CRM_Utils_Array::value('data', $params);
-
-    switch ($type) {
-      case "move":
-        self::processMove($nodeID, $referenceID, $position);
-        break;
-
-      case "rename":
-        self::processRename($nodeID, $label);
-        break;
-
-      case "delete":
-        self::processDelete($nodeID);
-        break;
-    }
-
-    //reset navigation menus
-    self::resetNavigation();
-    CRM_Utils_System::civiExit();
-  }
-
-  /**
-   * Process move action.
-   *
-   * @param $nodeID
-   *   Node that is being moved.
-   * @param $referenceID
-   *   Parent id where node is moved. 0 mean no parent.
-   * @param $position
-   *   New position of the nod, it starts with 0 - n.
-   */
-  public static function processMove($nodeID, $referenceID, $position) {
-    // based on the new position we need to get the weight of the node after moved node
-    // 1. update the weight of $position + 1 nodes to weight + 1
-    // 2. weight of the ( $position -1 ) node - 1 is the new weight of the node being moved
-
-    // check if there is parent id, which means node is moved inside existing parent container, so use parent id
-    // to find the correct position else use NULL to get the weights of parent ( $position - 1 )
-    // accordingly set the new parent_id
-    if ($referenceID) {
-      $newParentID = $referenceID;
-      $parentClause = "parent_id = {$referenceID} ";
-    }
-    else {
-      $newParentID = 'NULL';
-      $parentClause = 'parent_id IS NULL';
-    }
-
-    $incrementOtherNodes = TRUE;
-    $sql = "SELECT weight from civicrm_navigation WHERE {$parentClause} ORDER BY weight LIMIT %1, 1";
-    $params = array(1 => array($position, 'Positive'));
-    $newWeight = CRM_Core_DAO::singleValueQuery($sql, $params);
-
-    // this means node is moved to last position, so you need to get the weight of last element + 1
-    if (!$newWeight) {
-      // If this is not the first item being added to a parent
-      if ($position) {
-        $lastPosition = $position - 1;
-        $sql = "SELECT weight from civicrm_navigation WHERE {$parentClause} ORDER BY weight LIMIT %1, 1";
-        $params = array(1 => array($lastPosition, 'Positive'));
-        $newWeight = CRM_Core_DAO::singleValueQuery($sql, $params);
-
-        // since last node increment + 1
-        $newWeight = $newWeight + 1;
-      }
-      else {
-        $newWeight = '0';
-      }
-
-      // since this is a last node we don't need to increment other nodes
-      $incrementOtherNodes = FALSE;
-    }
-
-    $transaction = new CRM_Core_Transaction();
-
-    // now update the existing nodes to weight + 1, if required.
-    if ($incrementOtherNodes) {
-      $query = "UPDATE civicrm_navigation SET weight = weight + 1
-                  WHERE {$parentClause} AND weight >= {$newWeight}";
-
-      CRM_Core_DAO::executeQuery($query);
-    }
-
-    // finally set the weight of current node
-    $query = "UPDATE civicrm_navigation SET weight = {$newWeight}, parent_id = {$newParentID} WHERE id = {$nodeID}";
-    CRM_Core_DAO::executeQuery($query);
-
-    $transaction->commit();
-  }
-
-  /**
-   * Function to process rename action for tree.
-   *
-   * @param int $nodeID
-   * @param $label
-   */
-  public static function processRename($nodeID, $label) {
-    CRM_Core_DAO::setFieldValue('CRM_Core_DAO_Navigation', $nodeID, 'label', $label);
-  }
-
-  /**
-   * Process delete action for tree.
-   *
-   * @param int $nodeID
-   */
-  public static function processDelete($nodeID) {
-    $query = "DELETE FROM civicrm_navigation WHERE id = {$nodeID}";
-    CRM_Core_DAO::executeQuery($query);
-  }
-
-  /**
-   * Update menu.
-   *
-   * @param array $params
-   * @param array $newParams
-   *   New value of params.
-   */
-  public static function processUpdate($params, $newParams) {
-    $dao = new CRM_Core_DAO_Navigation();
-    $dao->copyValues($params);
-    if ($dao->find(TRUE)) {
-      $dao->copyValues($newParams);
-      $dao->save();
-    }
-  }
-
-  /**
-   * Rebuild reports menu.
-   *
-   * All Contact reports will become sub-items of 'Contact Reports' and so on.
-   *
-   * @param int $domain_id
-   */
-  public static function rebuildReportsNavigation($domain_id) {
-    $component_to_nav_name = array(
-      'CiviContact' => 'Contact Reports',
-      'CiviContribute' => 'Contribution Reports',
-      'CiviMember' => 'Membership Reports',
-      'CiviEvent' => 'Event Reports',
-      'CiviPledge' => 'Pledge Reports',
-      'CiviGrant' => 'Grant Reports',
-      'CiviMail' => 'Mailing Reports',
-      'CiviCampaign' => 'Campaign Reports',
-    );
-
-    // Create or update the top level Reports link.
-    $reports_nav = self::createOrUpdateTopLevelReportsNavItem($domain_id);
-
-    // Get all active report instances grouped by component.
-    $components = self::getAllActiveReportsByComponent($domain_id);
-    foreach ($components as $component_id => $component) {
-      // Create or update the per component reports links.
-      $component_nav_name = $component['name'];
-      if (isset($component_to_nav_name[$component_nav_name])) {
-        $component_nav_name = $component_to_nav_name[$component_nav_name];
-      }
-      $permission = "access {$component['name']}";
-      if ($component['name'] === 'CiviContact') {
-        $permission = "administer CiviCRM";
-      }
-      elseif ($component['name'] === 'CiviCampaign') {
-        $permission = "access CiviReport";
-      }
-      $component_nav = self::createOrUpdateReportNavItem($component_nav_name, 'civicrm/report/list',
-        "compid={$component_id}&reset=1", $reports_nav->id, $permission, $domain_id, TRUE);
-      foreach ($component['reports'] as $report_id => $report) {
-        // Create or update the report instance links.
-        $report_nav = self::createOrUpdateReportNavItem($report['title'], $report['url'], 'reset=1', $component_nav->id, $report['permission'], $domain_id, FALSE, TRUE);
-        // Update the report instance to include the navigation id.
-        $query = "UPDATE civicrm_report_instance SET navigation_id = %1 WHERE id = %2";
-        $params = array(
-          1 => array($report_nav->id, 'Integer'),
-          2 => array($report_id, 'Integer'),
-        );
-        CRM_Core_DAO::executeQuery($query, $params);
-      }
-    }
-
-    // Create or update the All Reports link.
-    self::createOrUpdateReportNavItem('All Reports', 'civicrm/report/list', 'reset=1', $reports_nav->id, 'access CiviReport', $domain_id, TRUE);
-    // Create or update the My Reports link.
-    self::createOrUpdateReportNavItem('My Reports', 'civicrm/report/list', 'myreports=1&reset=1', $reports_nav->id, 'access CiviReport', $domain_id, TRUE);
-
-  }
-
-  /**
-   * Create the top level 'Reports' item in the navigation tree.
-   *
-   * @param int $domain_id
-   *
-   * @return bool|\CRM_Core_DAO
-   */
-  static public function createOrUpdateTopLevelReportsNavItem($domain_id) {
-    $id = NULL;
-
-    $dao = new CRM_Core_BAO_Navigation();
-    $dao->name = 'Reports';
-    $dao->domain_id = $domain_id;
-    // The first selectAdd clears it - so that we only retrieve the one field.
-    $dao->selectAdd();
-    $dao->selectAdd('id');
-    if ($dao->find(TRUE)) {
-      $id = $dao->id;
-    }
-
-    $nav = self::createReportNavItem('Reports', NULL, NULL, NULL, 'access CiviReport', $id, $domain_id);
-    return $nav;
-  }
-
-  /**
-   * Retrieve a navigation item using it's url.
-   *
-   * Note that we use LIKE to permit a wildcard as the calling code likely doesn't
-   * care about output params appended.
-   *
-   * @param string $url
-   * @param array $url_params
-   *
-   * @param int|null $parent_id
-   *   Optionally restrict to one parent.
-   *
-   * @return bool|\CRM_Core_BAO_Navigation
-   */
-  public static function getNavItemByUrl($url, $url_params, $parent_id = NULL) {
-    $nav = new CRM_Core_BAO_Navigation();
-    $nav->parent_id = $parent_id;
-    $nav->whereAdd("url LIKE '{$url}?{$url_params}'");
-
-    if ($nav->find(TRUE)) {
-      return $nav;
-    }
-    return FALSE;
-  }
-
-  /**
-   * Get all active reports, organised by component.
-   *
-   * @param int $domain_id
-   *
-   * @return array
-   */
-  public static function getAllActiveReportsByComponent($domain_id) {
-    $sql = "
-      SELECT
-        civicrm_report_instance.id, civicrm_report_instance.title, civicrm_report_instance.permission, civicrm_component.name, civicrm_component.id AS component_id
-      FROM
-        civicrm_option_group
-      LEFT JOIN
-        civicrm_option_value ON civicrm_option_value.option_group_id = civicrm_option_group.id AND civicrm_option_group.name = 'report_template'
-      LEFT JOIN
-        civicrm_report_instance ON civicrm_option_value.value = civicrm_report_instance.report_id
-      LEFT JOIN
-        civicrm_component ON civicrm_option_value.component_id = civicrm_component.id
-      WHERE
-        civicrm_option_value.is_active = 1
-      AND
-        civicrm_report_instance.domain_id = %1
-      ORDER BY civicrm_option_value.weight";
-
-    $dao = CRM_Core_DAO::executeQuery($sql, array(
-      1 => array($domain_id, 'Integer'),
-    ));
-    $rows = array();
-    while ($dao->fetch()) {
-      $component_name = is_null($dao->name) ? 'CiviContact' : $dao->name;
-      $component_id = is_null($dao->component_id) ? 99 : $dao->component_id;
-      $rows[$component_id]['name'] = $component_name;
-      $rows[$component_id]['reports'][$dao->id] = array(
-        'title' => $dao->title,
-        'url' => "civicrm/report/instance/{$dao->id}",
-        'permission' => $dao->permission,
-      );
-    }
-    return $rows;
-  }
-
-  /**
-   * Create or update a navigation item for a report instance.
-   *
-   * The function will check whether create or update is required.
-   *
-   * @param string $name
-   * @param string $url
-   * @param string $url_params
-   * @param int $parent_id
-   * @param string $permission
-   * @param int $domain_id
-   *
-   * @param bool $onlyMatchParentID
-   *   If True then do not match with a url that has a different parent
-   *   (This is because for top level items there is a risk of 'stealing' rows that normally
-   *   live under 'Contact' and intentionally duplicate the report examples.)
-   *
-   * @return \CRM_Core_DAO_Navigation
-   */
-  protected static function createOrUpdateReportNavItem($name, $url, $url_params, $parent_id, $permission,
-                                                        $domain_id, $onlyMatchParentID = FALSE, $useWildcard = TRUE) {
-    $id = NULL;
-    $existing_url_params = $useWildcard ? $url_params . '%' : $url_params;
-    $existing_nav = CRM_Core_BAO_Navigation::getNavItemByUrl($url, $existing_url_params, ($onlyMatchParentID ? $parent_id : NULL));
-    if ($existing_nav) {
-      $id = $existing_nav->id;
-    }
-
-    $nav = self::createReportNavItem($name, $url, $url_params, $parent_id, $permission, $id, $domain_id);
-    return $nav;
-  }
-
-  /**
-   * Create a navigation item for a report instance.
-   *
-   * @param string $name
-   * @param string $url
-   * @param string $url_params
-   * @param int $parent_id
-   * @param string $permission
-   * @param int $id
-   * @param int $domain_id
-   *   ID of domain to create item in.
-   *
-   * @return \CRM_Core_DAO_Navigation
-   */
-  public static function createReportNavItem($name, $url, $url_params, $parent_id, $permission, $id, $domain_id) {
-    if ($url !== NULL) {
-      $url = "{$url}?{$url_params}";
-    }
-    $params = array(
-      'name' => $name,
-      'label' => ts($name),
-      'url' => $url,
-      'parent_id' => $parent_id,
-      'is_active' => TRUE,
-      'permission' => array(
-        $permission,
-      ),
-      'domain_id' => $domain_id,
-    );
-    if ($id) {
-      $params['id'] = $id;
-    }
-    return CRM_Core_BAO_Navigation::add($params);
-  }
-
-  /**
-   * Get cache key.
-   *
-   * @param int $cid
-   *
-   * @return object|string
-   */
-  public static function getCacheKey($cid) {
-    $key = Civi::service('settings_manager')
-      ->getBagByContact(NULL, $cid)
-      ->get('navigation');
-    if (strlen($key) !== self::CACHE_KEY_STRLEN) {
-      $key = self::resetNavigation($cid);
-    }
-    return $key;
-  }
-
-}

From 53d06afaa033c5cdda7bf3c84b1f26c59cfbe082 Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Thu, 6 Dec 2018 14:41:46 -0200
Subject: [PATCH 10/23] PCHR-4426: Make sure number_of_hours is always a float

---
 .../CRM/HRLeaveAndAbsences/BAO/WorkPattern.php                  | 2 +-
 .../CRM/HRLeaveAndAbsences/Service/ContactWorkPatternTest.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/uk.co.compucorp.civicrm.hrleaveandabsences/CRM/HRLeaveAndAbsences/BAO/WorkPattern.php b/uk.co.compucorp.civicrm.hrleaveandabsences/CRM/HRLeaveAndAbsences/BAO/WorkPattern.php
index 36444d60c7a..3bbc885f6d7 100644
--- a/uk.co.compucorp.civicrm.hrleaveandabsences/CRM/HRLeaveAndAbsences/BAO/WorkPattern.php
+++ b/uk.co.compucorp.civicrm.hrleaveandabsences/CRM/HRLeaveAndAbsences/BAO/WorkPattern.php
@@ -414,7 +414,7 @@ public static function getValuesArray($id) {
         'time_to' => $row['time_to'],
         'break' => $row['break'],
         'leave_days' => $row['leave_days'],
-        'number_of_hours' => $row['number_of_hours'],
+        'number_of_hours' => (float)$row['number_of_hours'],
       ];
 
       $workDayIndex++;
diff --git a/uk.co.compucorp.civicrm.hrleaveandabsences/tests/phpunit/CRM/HRLeaveAndAbsences/Service/ContactWorkPatternTest.php b/uk.co.compucorp.civicrm.hrleaveandabsences/tests/phpunit/CRM/HRLeaveAndAbsences/Service/ContactWorkPatternTest.php
index b737afb1ebc..6816c3be20d 100644
--- a/uk.co.compucorp.civicrm.hrleaveandabsences/tests/phpunit/CRM/HRLeaveAndAbsences/Service/ContactWorkPatternTest.php
+++ b/uk.co.compucorp.civicrm.hrleaveandabsences/tests/phpunit/CRM/HRLeaveAndAbsences/Service/ContactWorkPatternTest.php
@@ -182,7 +182,7 @@ private function getExpectedWorkDayArray($workDay) {
       'time_to' => CRM_Utils_Array::value('time_to', $workDay, ''),
       'break' => CRM_Utils_Array::value('break', $workDay, ''),
       'leave_days' => !empty($workDay['leave_days']) ? $workDay['leave_days'] : '',
-      'number_of_hours' =>  !empty($workDay['number_of_hours']) ? $workDay['number_of_hours'] : ''
+      'number_of_hours' => (float)CRM_Utils_Array::value('number_of_hours', $workDay, 0),
     ];
   }
 }

From 62dbfc686486535eb1887e7704501f71bf554267 Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Fri, 7 Dec 2018 10:24:52 -0200
Subject: [PATCH 11/23] PCHR-4441: Fix warnings on the L&A settings page

Due to the difference in how PHP 7 handles variable variables,
a couple of notices about undefined variables and invalid function
names started appearing on the L&A settings page.

This PR fixes the issue by simplifying how we call the method in the
html_type setting.
---
 .../Form/GeneralSettings.php                  | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/uk.co.compucorp.civicrm.hrleaveandabsences/CRM/HRLeaveAndAbsences/Form/GeneralSettings.php b/uk.co.compucorp.civicrm.hrleaveandabsences/CRM/HRLeaveAndAbsences/Form/GeneralSettings.php
index 9648d514db5..0a2f78f8d42 100644
--- a/uk.co.compucorp.civicrm.hrleaveandabsences/CRM/HRLeaveAndAbsences/Form/GeneralSettings.php
+++ b/uk.co.compucorp.civicrm.hrleaveandabsences/CRM/HRLeaveAndAbsences/Form/GeneralSettings.php
@@ -9,18 +9,6 @@
  */
 class CRM_HRLeaveAndAbsences_Form_GeneralSettings extends CRM_Core_Form {
 
-  /**
-   * @var array
-   *   The filter to pass to the setting.getfields API
-   */
-  private $settingFilter = ['group' => 'leave_and_absences_general_settings'];
-
-  /**
-   * @var array
-   *   An array to store settings once it has been retrieved from the settings API
-   */
-  private $settings = [];
-
   private $submittedValues = [];
 
   public function buildQuickForm() {
@@ -28,7 +16,9 @@ public function buildQuickForm() {
 
     foreach ($settings as $name => $setting) {
       if ($name == 'relationship_types_allowed_to_approve_leave') {
-        $this->$setting['html_type'](
+        $htmlType = $setting['html_type'];
+
+        $this->$htmlType(
           $name,
           [
             'options' => $this->getRelationshipTypes(),
@@ -84,9 +74,9 @@ public function getRenderableElementNames() {
    * @return array
    */
   public function getFormSettings() {
-    if (empty($this->settings)) {
-      $settings = civicrm_api3('Setting', 'getfields', ['filters' => $this->settingFilter]);
-    }
+    $settingFilter = ['group' => 'leave_and_absences_general_settings'];
+
+    $settings = civicrm_api3('Setting', 'getfields', ['filters' => $settingFilter]);
 
     return $settings['values'];
   }

From 88b050569883d2aa41ccc836bc3f5d3e370abc7b Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Fri, 14 Dec 2018 07:52:55 -0200
Subject: [PATCH 12/23] PCHR-4346: Change CiviCRM version to 5.7.0

Now that the final version has been released, we don't
need to use the branch version anymore
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2c64f90bedf..3eaec096865 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,7 +49,7 @@ pipeline {
       steps {
         script {
           // Build site with CV Buildkit
-          sh "civibuild create ${params.CIVIHR_BUILDNAME} --type drupal-clean --civi-ver 5.7 --url $WEBURL --admin-pass $ADMIN_PASS"
+          sh "civibuild create ${params.CIVIHR_BUILDNAME} --type drupal-clean --civi-ver 5.7.0 --url $WEBURL --admin-pass $ADMIN_PASS"
 
           // Get target and PR branches name
           def prBranch = env.CHANGE_BRANCH

From 85b828739f22fab34888b8b2b828d730b5feb890 Mon Sep 17 00:00:00 2001
From: Tunbola Ogunwande <tunbolawande@yahoo.com>
Date: Fri, 14 Dec 2018 13:03:03 +0100
Subject: [PATCH 13/23] PCHR-4446: Fix expected variable reference warning

---
 .../hrleaveandabsences.php                                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uk.co.compucorp.civicrm.hrleaveandabsences/hrleaveandabsences.php b/uk.co.compucorp.civicrm.hrleaveandabsences/hrleaveandabsences.php
index 5694e95aae4..fd905f2b07a 100644
--- a/uk.co.compucorp.civicrm.hrleaveandabsences/hrleaveandabsences.php
+++ b/uk.co.compucorp.civicrm.hrleaveandabsences/hrleaveandabsences.php
@@ -334,7 +334,7 @@ function hrleaveandabsences_civicrm_post($op, $objectName, $objectId, &$objectRe
     return;
   }
 
-  call_user_func_array($postFunction, [$op, $objectId, $objectRef]);
+  call_user_func_array($postFunction, [$op, $objectId, &$objectRef]);
 }
 
 /**

From fb73df3b053bec0bcbadc5f9362704cc14ab8b15 Mon Sep 17 00:00:00 2001
From: Tunbola Ogunwande <tunbolawande@yahoo.com>
Date: Fri, 14 Dec 2018 16:19:37 +0100
Subject: [PATCH 14/23] PCHR-4448: Fix error related no variable not
 implementing Countable Interface.

---
 hrjobcontract/CRM/Hrjobcontract/Import/Parser.php           | 4 ++--
 hrjobcontract/CRM/Hrjobcontract/Import/Parser/BaseClass.php | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hrjobcontract/CRM/Hrjobcontract/Import/Parser.php b/hrjobcontract/CRM/Hrjobcontract/Import/Parser.php
index 6452efdc63e..db58ae3dc97 100644
--- a/hrjobcontract/CRM/Hrjobcontract/Import/Parser.php
+++ b/hrjobcontract/CRM/Hrjobcontract/Import/Parser.php
@@ -313,9 +313,9 @@ function addField($name, $title, $type = CRM_Utils_Type::T_INT, $headerPattern =
   }
 
   /**
-   * @param $elements
+   * @param array $elements
    */
-  function setActiveFieldLocationTypes($elements) {
+  function setActiveFieldLocationTypes(Array $elements) {
     for ($i = 0; $i < count($elements); $i++) {
       $this->_activeFields[$i]->_hasLocationType = $elements[$i];
     }
diff --git a/hrjobcontract/CRM/Hrjobcontract/Import/Parser/BaseClass.php b/hrjobcontract/CRM/Hrjobcontract/Import/Parser/BaseClass.php
index 00b89a6afee..5edbc571b1b 100755
--- a/hrjobcontract/CRM/Hrjobcontract/Import/Parser/BaseClass.php
+++ b/hrjobcontract/CRM/Hrjobcontract/Import/Parser/BaseClass.php
@@ -82,8 +82,10 @@ function init() {
       $field['headerPattern'] = CRM_Utils_Array::value('headerPattern', $field, '//');
       $this->addField($name, CRM_Utils_Array::value('title', $field, $name), $field['type'], $field['headerPattern'], $field['dataPattern']);
     }
+
+    $mapperLocType = !empty($mapperLocType) ? $mapperLocType : [];
     $this->setActiveFields($this->_mapperKeys);
-    $this->setActiveFieldLocationTypes($this->_mapperLocType);
+    $this->setActiveFieldLocationTypes($mapperLocType);
 
     // Fetch select list options from the database and cache them
     $this->_optionsList['HRJobHour-hours_type'] = CRM_Hrjobcontract_SelectValues::buildDbOptions('hrjc_hours_type');

From 5fd26d206c1aaf260ab88b8e0616f94285d17c61 Mon Sep 17 00:00:00 2001
From: Tunbola Ogunwande <tunbolawande@yahoo.com>
Date: Fri, 14 Dec 2018 16:20:27 +0100
Subject: [PATCH 15/23] PCHR-4448: Fix error related to Object not being able
 to convert to int/

---
 hrjobcontract/CRM/Hrjobcontract/Import/Parser/Api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hrjobcontract/CRM/Hrjobcontract/Import/Parser/Api.php b/hrjobcontract/CRM/Hrjobcontract/Import/Parser/Api.php
index 3c38f7a876f..5e8489321a4 100755
--- a/hrjobcontract/CRM/Hrjobcontract/Import/Parser/Api.php
+++ b/hrjobcontract/CRM/Hrjobcontract/Import/Parser/Api.php
@@ -568,7 +568,7 @@ private function validateField($key, $value)  {
     switch($key)  {
       case 'HRJobContractRevision-jobcontract_id':
         $contractDetails = CRM_Hrjobcontract_BAO_HRJobContract::checkContract($value);
-        if ($contractDetails == 0)  {
+        if (!$contractDetails)  {
           $errorMessage = "{$this->_fields[$key]->_title} is not found";
         }
         break;

From 63b9decf8bbd6ca48e19495a52800cd36460ba05 Mon Sep 17 00:00:00 2001
From: Tunbola Ogunwande <tunbolawande@yahoo.com>
Date: Fri, 14 Dec 2018 17:10:51 +0100
Subject: [PATCH 16/23] PCHR-4446: Use class property for $_mapperLocType
 variable

---
 hrjobcontract/CRM/Hrjobcontract/Import/Parser/BaseClass.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hrjobcontract/CRM/Hrjobcontract/Import/Parser/BaseClass.php b/hrjobcontract/CRM/Hrjobcontract/Import/Parser/BaseClass.php
index 5edbc571b1b..4c0a411046f 100755
--- a/hrjobcontract/CRM/Hrjobcontract/Import/Parser/BaseClass.php
+++ b/hrjobcontract/CRM/Hrjobcontract/Import/Parser/BaseClass.php
@@ -83,7 +83,7 @@ function init() {
       $this->addField($name, CRM_Utils_Array::value('title', $field, $name), $field['type'], $field['headerPattern'], $field['dataPattern']);
     }
 
-    $mapperLocType = !empty($mapperLocType) ? $mapperLocType : [];
+    $mapperLocType = !empty($this->_mapperLocType) ? $this->_mapperLocType : [];
     $this->setActiveFields($this->_mapperKeys);
     $this->setActiveFieldLocationTypes($mapperLocType);
 

From ef55c5c34de2a4989b7a3e38603ed0d6ec307077 Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Wed, 19 Dec 2018 15:07:26 -0200
Subject: [PATCH 17/23] PCHR-4473: Use Civi 5.9 in Jenkins

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3eaec096865..796e3a10120 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,7 +49,7 @@ pipeline {
       steps {
         script {
           // Build site with CV Buildkit
-          sh "civibuild create ${params.CIVIHR_BUILDNAME} --type drupal-clean --civi-ver 5.7.0 --url $WEBURL --admin-pass $ADMIN_PASS"
+          sh "civibuild create ${params.CIVIHR_BUILDNAME} --type drupal-clean --civi-ver 5.9 --url $WEBURL --admin-pass $ADMIN_PASS"
 
           // Get target and PR branches name
           def prBranch = env.CHANGE_BRANCH

From 9b04f989853b0fdbe2fdcafe29b250501e9e39cd Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Thu, 20 Dec 2018 12:12:34 -0200
Subject: [PATCH 18/23] PCHR-4473: Sync overridden core files with CiviCRM
 5.9.0

---
 hrjobcontract/CRM/Export/BAO/Export.php       | 536 ++++--------------
 .../CRM/Hrjobcontract/Dedupe/Merger.php       |   4 +-
 .../CRM/Hrjobcontract/Form/Merge.php          |   4 +-
 .../CRM/Hrjobcontract/Form/Merge.hlp          |   2 +-
 .../CRM/Hrjobcontract/Form/Merge.tpl          |   2 +-
 hrui/templates/CRM/common/footer.tpl          |   2 +-
 6 files changed, 118 insertions(+), 432 deletions(-)

diff --git a/hrjobcontract/CRM/Export/BAO/Export.php b/hrjobcontract/CRM/Export/BAO/Export.php
index f8a50920aa2..f7de0d5d07b 100644
--- a/hrjobcontract/CRM/Export/BAO/Export.php
+++ b/hrjobcontract/CRM/Export/BAO/Export.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  */
 
 /**
@@ -176,14 +176,7 @@ public static function getGroupBy($processor, $returnProperties, $query) {
       $groupBy = array('contact_a.id', 'hrjobcontract.id');
     }
 
-    if (!empty($groupBy)) {
-      if (!Civi::settings()->get('searchPrimaryDetailsOnly')) {
-        CRM_Core_DAO::disableFullGroupByMode();
-      }
-      $groupBy = CRM_Contact_BAO_Query::getGroupByFromSelectColumns($query->_select, $groupBy);
-    }
-
-    return $groupBy;
+    return $groupBy ? ' GROUP BY ' . $groupBy : '';
   }
 
   /**
@@ -238,15 +231,8 @@ public static function exportComponents(
 
     $processor = new CRM_Export_BAO_ExportProcessor($exportMode, $fields, $queryOperator, $mergeSameHousehold);
     $returnProperties = array();
-
-    $phoneTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 'phone_type_id');
-    // Warning - this imProviders var is used in a somewhat fragile way - don't rename it
-    // without manually testing the export of IM provider still works.
-    $imProviders = CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 'provider_id');
     self::$relationshipTypes = $processor->getRelationshipTypes();
 
-    $queryMode = $processor->getQueryMode();
-
     if ($fields) {
       foreach ($fields as $key => $value) {
         $fieldName = CRM_Utils_Array::value(1, $value);
@@ -315,6 +301,7 @@ public static function exportComponents(
         if (!array_key_exists($column, $returnProperties)) {
           $returnProperties[$column] = 1;
           $column = $column == 'id' ? 'civicrm_primary_id' : $column;
+          $processor->setColumnAsCalculationOnly($column);
           $exportParams['merge_same_address']['temp_columns'][$column] = 1;
         }
       }
@@ -347,6 +334,7 @@ public static function exportComponents(
         if (!array_key_exists($column, $returnProperties)) {
           $returnProperties[$column] = 1;
           $exportParams['postal_mailing_export']['temp_columns'][$column] = 1;
+          $processor->setColumnAsCalculationOnly($column);
         }
       }
     }
@@ -371,11 +359,13 @@ public static function exportComponents(
               $returnProperties[$householdRelationshipType][$key] = $value;
             }
           }
+          // @todo - don't use returnProperties above.
+          $processor->setHouseholdMergeReturnProperties($returnProperties[$householdRelationshipType]);
         }
       }
     }
 
-    list($relationQuery, $allRelContactArray) = self::buildRelatedContactArray($selectAll, $ids, $processor, $componentTable, $returnProperties);
+    self::buildRelatedContactArray($selectAll, $ids, $processor, $componentTable);
 
     // make sure the groups stuff is included only if specifically specified
     // by the fields param (CRM-1969), else we limit the contacts outputted to only
@@ -444,29 +434,19 @@ public static function exportComponents(
 
     $paymentDetails = array();
     if ($processor->isExportPaymentFields()) {
-
       // get payment related in for event and members
       $paymentDetails = CRM_Contribute_BAO_Contribution::getContributionDetails($exportMode, $ids);
       //get all payment headers.
       // If we haven't selected specific payment fields, load in all the
       // payment headers.
       if (!$processor->isExportSpecifiedPaymentFields()) {
-        $paymentHeaders = self::componentPaymentFields();
         if (!empty($paymentDetails)) {
           $addPaymentHeader = TRUE;
         }
       }
-      // If we have selected specific payment fields, leave the payment headers
-      // as an empty array; the headers for each selected field will be added
-      // elsewhere.
-      else {
-        $paymentHeaders = array();
-      }
-      $nullContributionDetails = array_fill_keys(array_keys($paymentHeaders), NULL);
     }
 
     $componentDetails = array();
-    $setHeader = TRUE;
 
     $rowCount = self::EXPORT_ROW_COUNT;
     $offset = 0;
@@ -475,15 +455,27 @@ public static function exportComponents(
 
     $count = -1;
 
-    // for CRM-3157 purposes
-    $i18n = CRM_Core_I18n::singleton();
+    list($outputColumns, $sqlColumns, $metadata) = self::getExportStructureArrays($returnProperties, $processor);
+    $headerRows = $processor->getHeaderRows();
 
-    list($outputColumns, $headerRows, $sqlColumns, $metadata) = self::getExportStructureArrays($returnProperties, $processor);
+    // add payment headers if required
+    if ($addPaymentHeader && $processor->isExportPaymentFields()) {
+      // @todo rather than do this for every single row do it before the loop starts.
+      // where other header definitions take place.
+      $headerRows = array_merge($headerRows, $processor->getPaymentHeaders());
+      foreach (array_keys($processor->getPaymentHeaders()) as $paymentHdr) {
+        self::sqlColumnDefn($processor, $sqlColumns, $paymentHdr);
+      }
+    }
 
+    $exportTempTable = self::createTempTable($sqlColumns);
     $limitReached = FALSE;
+
     while (!$limitReached) {
       $limitQuery = "{$queryString} LIMIT {$offset}, {$rowCount}";
+      CRM_Core_DAO::disableFullGroupByMode();
       $iterationDAO = CRM_Core_DAO::executeQuery($limitQuery);
+      CRM_Core_DAO::reenableFullGroupByMode();
       // If this is less than our limit by the end of the iteration we do not need to run the query again to
       // check if some remain.
       $rowsThisIteration = 0;
@@ -491,88 +483,7 @@ public static function exportComponents(
       while ($iterationDAO->fetch()) {
         $count++;
         $rowsThisIteration++;
-        $row = array();
-        $query->convertToPseudoNames($iterationDAO);
-
-        //first loop through output columns so that we return what is required, and in same order.
-        foreach ($outputColumns as $field => $value) {
-
-          // add im_provider to $dao object
-          if ($field == 'im_provider' && property_exists($iterationDAO, 'provider_id')) {
-            $iterationDAO->im_provider = $iterationDAO->provider_id;
-          }
-
-          //build row values (data)
-          $fieldValue = NULL;
-          if (property_exists($iterationDAO, $field)) {
-            $fieldValue = $iterationDAO->$field;
-            // to get phone type from phone type id
-            if ($field == 'phone_type_id' && isset($phoneTypes[$fieldValue])) {
-              $fieldValue = $phoneTypes[$fieldValue];
-            }
-            elseif ($field == 'provider_id' || $field == 'im_provider') {
-              $fieldValue = CRM_Utils_Array::value($fieldValue, $imProviders);
-            }
-            elseif (strstr($field, 'master_id')) {
-              $masterAddressId = NULL;
-              if (isset($iterationDAO->$field)) {
-                $masterAddressId = $iterationDAO->$field;
-              }
-              // get display name of contact that address is shared.
-              $fieldValue = CRM_Contact_BAO_Contact::getMasterDisplayName($masterAddressId);
-            }
-          }
-
-          if ($processor->isRelationshipTypeKey($field)) {
-            $relDAO = CRM_Utils_Array::value($iterationDAO->contact_id, $allRelContactArray[$field]);
-            $relationQuery[$field]->convertToPseudoNames($relDAO);
-            self::fetchRelationshipDetails($relDAO, $value, $field, $row);
-          }
-          else {
-            $row[$field] = self::getTransformedFieldValue($field, $iterationDAO, $fieldValue, $i18n, $metadata, $paymentDetails, $processor);
-          }
-        }
-
-        // add payment headers if required
-        if ($addPaymentHeader && $processor->isExportPaymentFields()) {
-          // @todo rather than do this for every single row do it before the loop starts.
-          // where other header definitions take place.
-          $headerRows = array_merge($headerRows, $paymentHeaders);
-          foreach (array_keys($paymentHeaders) as $paymentHdr) {
-            self::sqlColumnDefn($processor, $sqlColumns, $paymentHdr);
-          }
-        }
-
-        if ($setHeader) {
-          $exportTempTable = self::createTempTable($sqlColumns);
-        }
-
-        //build header only once
-        $setHeader = FALSE;
-
-        // If specific payment fields have been selected for export, payment
-        // data will already be in $row. Otherwise, add payment related
-        // information, if appropriate.
-        if ($addPaymentHeader) {
-          if (!$processor->isExportSpecifiedPaymentFields()) {
-            if ($processor->isExportPaymentFields()) {
-              $paymentData = CRM_Utils_Array::value($row[$paymentTableId], $paymentDetails);
-              if (!is_array($paymentData) || empty($paymentData)) {
-                $paymentData = $nullContributionDetails;
-              }
-              $row = array_merge($row, $paymentData);
-            }
-            elseif (!empty($paymentDetails)) {
-              $row = array_merge($row, $nullContributionDetails);
-            }
-          }
-        }
-        //remove organization name for individuals if it is set for current employer
-        if (!empty($row['contact_type']) &&
-          $row['contact_type'] == 'Individual' && array_key_exists('organization_name', $row)
-        ) {
-          $row['organization_name'] = '';
-        }
+        $row = $processor->buildRow($query, $iterationDAO, $outputColumns, $metadata, $paymentDetails, $addPaymentHeader, $paymentTableId);
 
         // add component info
         // write the row to a file
@@ -598,12 +509,12 @@ public static function exportComponents(
       if (isset($exportParams['postal_mailing_export']['postal_mailing_export']) &&
         $exportParams['postal_mailing_export']['postal_mailing_export'] == 1
       ) {
-        self::postalMailingFormat($exportTempTable, $headerRows, $sqlColumns, $exportMode);
+        self::postalMailingFormat($exportTempTable, $sqlColumns, $exportMode);
       }
 
       // do merge same address and merge same household processing
       if ($mergeSameAddress) {
-        self::mergeSameAddress($exportTempTable, $headerRows, $sqlColumns, $exportParams);
+        self::mergeSameAddress($exportTempTable, $sqlColumns, $exportParams);
       }
 
       // merge the records if they have corresponding households
@@ -614,12 +525,12 @@ public static function exportComponents(
       }
 
       // call export hook
-      CRM_Utils_Hook::export($exportTempTable, $headerRows, $sqlColumns, $exportMode);
+      CRM_Utils_Hook::export($exportTempTable, $headerRows, $sqlColumns, $exportMode, $componentTable, $ids);
 
       // In order to be able to write a unit test against this function we need to suppress
       // the csv writing. In future hopefully the csv writing & the main processing will be in separate functions.
       if (empty($exportParams['suppress_csv_for_testing'])) {
-        self::writeCSVFromTable($exportTempTable, $headerRows, $sqlColumns, $exportMode);
+        self::writeCSVFromTable($exportTempTable, $headerRows, $sqlColumns, $processor);
       }
       else {
         // return tableName sqlColumns headerRows in test context
@@ -638,45 +549,6 @@ public static function exportComponents(
     }
   }
 
-  /**
-   * Name of the export file based on mode.
-   *
-   * @param string $output
-   *   Type of output.
-   * @param int $mode
-   *   Export mode.
-   *
-   * @return string
-   *   name of the file
-   */
-  public static function getExportFileName($output = 'csv', $mode = CRM_Export_Form_Select::CONTACT_EXPORT) {
-    switch ($mode) {
-      case CRM_Export_Form_Select::CONTACT_EXPORT:
-        return ts('CiviCRM Contact Search');
-
-      case CRM_Export_Form_Select::CONTRIBUTE_EXPORT:
-        return ts('CiviCRM Contribution Search');
-
-      case CRM_Export_Form_Select::MEMBER_EXPORT:
-        return ts('CiviCRM Member Search');
-
-      case CRM_Export_Form_Select::EVENT_EXPORT:
-        return ts('CiviCRM Participant Search');
-
-      case CRM_Export_Form_Select::PLEDGE_EXPORT:
-        return ts('CiviCRM Pledge Search');
-
-      case CRM_Export_Form_Select::CASE_EXPORT:
-        return ts('CiviCRM Case Search');
-
-      case CRM_Export_Form_Select::GRANT_EXPORT:
-        return ts('CiviCRM Grant Search');
-
-      case CRM_Export_Form_Select::ACTIVITY_EXPORT:
-        return ts('CiviCRM Activity Search');
-    }
-  }
-
   /**
    * Handle import error file creation.
    */
@@ -763,7 +635,7 @@ public static function exportCustom($customSearchClass, $formValues, $order) {
       $rows[] = $row;
     }
 
-    CRM_Core_Report_Excel::writeCSVFile(self::getExportFileName(), $header, $rows);
+    CRM_Core_Report_Excel::writeCSVFile(ts('CiviCRM Contact Search'), $header, $rows);
     CRM_Utils_System::civiExit();
   }
 
@@ -870,11 +742,10 @@ public static function createTempTable($sqlColumns) {
 
   /**
    * @param string $tableName
-   * @param $headerRows
    * @param $sqlColumns
    * @param array $exportParams
    */
-  public static function mergeSameAddress($tableName, &$headerRows, &$sqlColumns, $exportParams) {
+  public static function mergeSameAddress($tableName, &$sqlColumns, $exportParams) {
     // check if any records are present based on if they have used shared address feature,
     // and not based on if city / state .. matches.
     $sql = "
@@ -971,7 +842,7 @@ public static function mergeSameAddress($tableName, &$headerRows, &$sqlColumns,
       $unsetKeys = array_keys($sqlColumns);
       foreach ($unsetKeys as $headerKey => $sqlColKey) {
         if (array_key_exists($sqlColKey, $exportParams['merge_same_address']['temp_columns'])) {
-          unset($sqlColumns[$sqlColKey], $headerRows[$headerKey]);
+          unset($sqlColumns[$sqlColKey]);
         }
       }
     }
@@ -1163,16 +1034,11 @@ public static function _buildMasterCopyArray($sql, $exportParams, $sharedAddress
    */
   public static function mergeSameHousehold($exportTempTable, &$sqlColumns, $prefix) {
     $prefixColumn = $prefix . '_';
-    $allKeys = array_keys($sqlColumns);
     $replaced = array();
 
     // name map of the non standard fields in header rows & sql columns
     $mappingFields = array(
       'civicrm_primary_id' => 'id',
-      'contact_source' => 'source',
-      'current_employer_id' => 'employer_id',
-      'contact_is_deleted' => 'is_deleted',
-      'name' => 'address_name',
       'provider_id' => 'im_service_provider',
       'phone_type_id' => 'phone_type',
     );
@@ -1221,7 +1087,9 @@ public static function mergeSameHousehold($exportTempTable, &$sqlColumns, $prefi
 FROM {$exportTempTable}
 GROUP BY civicrm_primary_id ";
 
+    CRM_Core_DAO::disableFullGroupByMode();
     CRM_Core_DAO::executeQuery($query);
+    CRM_Core_DAO::reenableFullGroupByMode();
 
     $query = "DROP TABLE $exportTempTable";
     CRM_Core_DAO::executeQuery($query);
@@ -1234,11 +1102,10 @@ public static function mergeSameHousehold($exportTempTable, &$sqlColumns, $prefi
    * @param $exportTempTable
    * @param $headerRows
    * @param $sqlColumns
-   * @param $exportMode
-   * @param null $saveFile
-   * @param string $batchItems
+   * @param \CRM_Export_BAO_ExportProcessor $processor
    */
-  public static function writeCSVFromTable($exportTempTable, $headerRows, $sqlColumns, $exportMode, $saveFile = NULL, $batchItems = '') {
+  public static function writeCSVFromTable($exportTempTable, $headerRows, $sqlColumns, $processor) {
+    $exportMode = $processor->getExportMode();
     $writeHeader = TRUE;
     $offset = 0;
     $limit = self::EXPORT_ROW_COUNT;
@@ -1264,52 +1131,26 @@ public static function writeCSVFromTable($exportTempTable, $headerRows, $sqlColu
         }
         $componentDetails[] = $row;
       }
-      if ($exportMode == 'financial') {
-        $getExportFileName = 'CiviCRM Contribution Search';
-      }
-      else {
-        $getExportFileName = self::getExportFileName('csv', $exportMode);
-      }
-      $csvRows = CRM_Core_Report_Excel::writeCSVFile($getExportFileName,
+      CRM_Core_Report_Excel::writeCSVFile($processor->getExportFileName(),
         $headerRows,
         $componentDetails,
         NULL,
-        $writeHeader,
-        $saveFile);
-
-      if ($saveFile && !empty($csvRows)) {
-        $batchItems .= $csvRows;
-      }
+        $writeHeader
+      );
 
       $writeHeader = FALSE;
       $offset += $limit;
     }
   }
 
-  /**
-   * Manipulate header rows for relationship fields.
-   *
-   * @param $headerRows
-   */
-  public static function manipulateHeaderRows(&$headerRows) {
-    foreach ($headerRows as & $header) {
-      $split = explode('-', $header);
-      if ($relationTypeName = CRM_Utils_Array::value($split[0], self::$relationshipTypes)) {
-        $split[0] = $relationTypeName;
-        $header = implode('-', $split);
-      }
-    }
-  }
-
   /**
    * Exclude contacts who are deceased, have "Do not mail" privacy setting,
    * or have no street address
    * @param $exportTempTable
-   * @param $headerRows
    * @param $sqlColumns
    * @param $exportParams
    */
-  public static function postalMailingFormat($exportTempTable, &$headerRows, &$sqlColumns, $exportParams) {
+  public static function postalMailingFormat($exportTempTable, &$sqlColumns, $exportParams) {
     $whereClause = array();
 
     if (array_key_exists('is_deceased', $sqlColumns)) {
@@ -1352,7 +1193,7 @@ public static function postalMailingFormat($exportTempTable, &$headerRows, &$sql
       $unsetKeys = array_keys($sqlColumns);
       foreach ($unsetKeys as $headerKey => $sqlColKey) {
         if (array_key_exists($sqlColKey, $exportParams['postal_mailing_export']['temp_columns'])) {
-          unset($sqlColumns[$sqlColKey], $headerRows[$headerKey]);
+          unset($sqlColumns[$sqlColKey]);
         }
       }
     }
@@ -1360,6 +1201,11 @@ public static function postalMailingFormat($exportTempTable, &$headerRows, &$sql
 
   /**
    * Build componentPayment fields.
+   *
+   * This is no longer used by export but BAO_Mapping still calls it & we
+   * should find a generic way to handle this or move this to that class.
+   *
+   * @deprecated
    */
   public static function componentPaymentFields() {
     static $componentPaymentFields;
@@ -1375,42 +1221,6 @@ public static function componentPaymentFields() {
     return $componentPaymentFields;
   }
 
-  /**
-   * Set the definition for the header rows and sql columns based on the field to output.
-   *
-   * @param string $field
-   * @param array $headerRows
-   * @param \CRM_Export_BAO_ExportProcessor $processor
-   *
-   * @return array
-   */
-  public static function setHeaderRows($field, $headerRows, $processor) {
-
-    $queryFields = $processor->getQueryFields();
-    if (substr($field, -11) == 'campaign_id') {
-      // @todo - set this correctly in the xml rather than here.
-      $headerRows[] = ts('Campaign ID');
-    }
-    elseif ($processor->isMergeSameHousehold() && $field === 'id') {
-      $headerRows[] = ts('Household ID');
-    }
-    elseif (isset($queryFields[$field]['title'])) {
-      $headerRows[] = $queryFields[$field]['title'];
-    }
-    elseif ($field == 'provider_id') {
-      // @todo - set this correctly in the xml rather than here.
-      $headerRows[] = ts('IM Service Provider');
-    }
-    elseif ($processor->isExportPaymentFields() && array_key_exists($field, self::componentPaymentFields())) {
-      $headerRows[] = CRM_Utils_Array::value($field, self::componentPaymentFields());
-    }
-    else {
-      $headerRows[] = $field;
-    }
-
-    return $headerRows;
-  }
-
   /**
    * Get the various arrays that we use to structure our output.
    *
@@ -1440,14 +1250,14 @@ public static function setHeaderRows($field, $headerRows, $processor) {
    *       yet find a way to comment them for posterity.
    */
   public static function getExportStructureArrays($returnProperties, $processor) {
-    $metadata = $headerRows = $outputColumns = $sqlColumns = array();
+    $metadata = $outputColumns = $sqlColumns = array();
     $phoneTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 'phone_type_id');
     $imProviders = CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 'provider_id');
     $queryFields = $processor->getQueryFields();
     foreach ($returnProperties as $key => $value) {
       if (($key != 'location' || !is_array($value)) && !$processor->isRelationshipTypeKey($key)) {
         $outputColumns[$key] = $value;
-        $headerRows = self::setHeaderRows($key, $headerRows, $processor);
+        $processor->addOutputSpecification($key);
         self::sqlColumnDefn($processor, $sqlColumns, $key);
       }
       elseif ($processor->isRelationshipTypeKey($key)) {
@@ -1456,39 +1266,11 @@ public static function getExportStructureArrays($returnProperties, $processor) {
         foreach ($value as $relationField => $relationValue) {
           // below block is same as primary block (duplicate)
           if (isset($queryFields[$relationField]['title'])) {
-            if ($queryFields[$relationField]['name'] == 'name') {
-              $headerName = $field . '-' . $relationField;
-            }
-            else {
-              if ($relationField == 'current_employer') {
-                $headerName = $field . '-' . 'current_employer';
-              }
-              else {
-                $headerName = $field . '-' . $queryFields[$relationField]['name'];
-              }
-            }
-
             if (!$processor->isHouseholdMergeRelationshipTypeKey($field)) {
               // Do not add to header row if we are only generating for merge reasons.
-              $headerRows[] = $headerName;
+              $processor->addOutputSpecification($relationField, $key);
             }
-
-            self::sqlColumnDefn($processor, $sqlColumns, $headerName);
-          }
-          elseif ($relationField == 'phone_type_id') {
-            $headerName = $field . '-' . 'Phone Type';
-            $headerRows[] = $headerName;
-            self::sqlColumnDefn($processor, $sqlColumns, $headerName);
-          }
-          elseif ($relationField == 'provider_id') {
-            $headerName = $field . '-' . 'Im Service Provider';
-            $headerRows[] = $headerName;
-            self::sqlColumnDefn($processor, $sqlColumns, $headerName);
-          }
-          elseif ($relationField == 'state_province_id') {
-            $headerName = $field . '-' . 'state_province_id';
-            $headerRows[] = $headerName;
-            self::sqlColumnDefn($processor, $sqlColumns, $headerName);
+            self::sqlColumnDefn($processor, $sqlColumns, $field . '-' . $relationField);
           }
           elseif (is_array($relationValue) && $relationField == 'location') {
             // fix header for location type case
@@ -1506,14 +1288,12 @@ public static function getExportStructureArrays($returnProperties, $processor) {
                     $hdr .= "-" . CRM_Core_PseudoConstant::getLabel('CRM_Core_BAO_IM', 'provider_id', $type[1]);
                   }
                 }
-                $headerName = $field . '-' . $hdr;
-                $headerRows[] = $headerName;
-                self::sqlColumnDefn($processor, $sqlColumns, $headerName);
+                $processor->addOutputSpecification($field, $key, $ltype, CRM_Utils_Array::value(1, $type));
+                self::sqlColumnDefn($processor, $sqlColumns, $field . '-' . $hdr);
               }
             }
           }
         }
-        self::manipulateHeaderRows($headerRows);
       }
       else {
         foreach ($value as $locationType => $locationFields) {
@@ -1538,7 +1318,7 @@ public static function getExportStructureArrays($returnProperties, $processor) {
               $metadata[$daoFieldName]['pseudoconstant']['var'] = 'imProviders';
             }
             self::sqlColumnDefn($processor, $sqlColumns, $outputFieldName);
-            $headerRows = self::setHeaderRows($outputFieldName, $headerRows, $processor);
+            $processor->addOutputSpecification($outputFieldName, NULL, $locationType, CRM_Utils_Array::value(1, $type));
             self::sqlColumnDefn($processor, $sqlColumns, $outputFieldName);
             if ($actualDBFieldName == 'country' || $actualDBFieldName == 'world_region') {
               $metadata[$daoFieldName] = array('context' => 'country');
@@ -1551,7 +1331,7 @@ public static function getExportStructureArrays($returnProperties, $processor) {
         }
       }
     }
-    return array($outputColumns, $headerRows, $sqlColumns, $metadata);
+    return array($outputColumns, $sqlColumns, $metadata);
   }
 
   /**
@@ -1566,6 +1346,8 @@ private static function fetchRelationshipDetails($relDAO, $value, $field, &$row)
     $phoneTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 'phone_type_id');
     $imProviders = CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 'provider_id');
     $i18n = CRM_Core_I18n::singleton();
+    $field = $field . '_';
+
     foreach ($value as $relationField => $relationValue) {
       if (is_object($relDAO) && property_exists($relDAO, $relationField)) {
         $fieldValue = $relDAO->$relationField;
@@ -1596,7 +1378,6 @@ private static function fetchRelationshipDetails($relDAO, $value, $field, &$row)
       else {
         $fieldValue = '';
       }
-      $field = $field . '_';
       $relPrefix = $field . $relationField;
 
       if (is_object($relDAO) && $relationField == 'id') {
@@ -1713,171 +1494,76 @@ protected static function getIDsForRelatedContact($ids, $exportMode) {
    * @param $ids
    * @param \CRM_Export_BAO_ExportProcessor $processor
    * @param $componentTable
-   * @param $returnProperties
-   *
-   * @return array
    */
-  protected static function buildRelatedContactArray($selectAll, $ids, $processor, $componentTable, $returnProperties) {
+  protected static function buildRelatedContactArray($selectAll, $ids, $processor, $componentTable) {
     $allRelContactArray = $relationQuery = array();
     $queryMode = $processor->getQueryMode();
     $exportMode = $processor->getExportMode();
-    foreach (self::$relationshipTypes as $rel => $dnt) {
-      if ($relationReturnProperties = CRM_Utils_Array::value($rel, $returnProperties)) {
-        $allRelContactArray[$rel] = array();
-        // build Query for each relationship
-        $relationQuery[$rel] = new CRM_Contact_BAO_Query(NULL, $relationReturnProperties,
-          NULL, FALSE, FALSE, $queryMode
-        );
-        list($relationSelect, $relationFrom, $relationWhere, $relationHaving) = $relationQuery[$rel]->query();
-
-        list($id, $direction) = explode('_', $rel, 2);
-        // identify the relationship direction
-        $contactA = 'contact_id_a';
-        $contactB = 'contact_id_b';
-        if ($direction == 'b_a') {
-          $contactA = 'contact_id_b';
-          $contactB = 'contact_id_a';
-        }
-        $relIDs = self::getIDsForRelatedContact($ids, $exportMode);
 
-        $relationshipJoin = $relationshipClause = '';
-        if (!$selectAll && $componentTable) {
-          $relationshipJoin = " INNER JOIN {$componentTable} ctTable ON ctTable.contact_id = {$contactA}";
-        }
-        elseif (!empty($relIDs)) {
-          $relID = implode(',', $relIDs);
-          $relationshipClause = " AND crel.{$contactA} IN ( {$relID} )";
-        }
+    foreach ($processor->getRelationshipReturnProperties() as $relationshipKey => $relationReturnProperties) {
+      $allRelContactArray[$relationshipKey] = array();
+      // build Query for each relationship
+      $relationQuery = new CRM_Contact_BAO_Query(NULL, $relationReturnProperties,
+        NULL, FALSE, FALSE, $queryMode
+      );
+      list($relationSelect, $relationFrom, $relationWhere, $relationHaving) = $relationQuery->query();
+
+      list($id, $direction) = explode('_', $relationshipKey, 2);
+      // identify the relationship direction
+      $contactA = 'contact_id_a';
+      $contactB = 'contact_id_b';
+      if ($direction == 'b_a') {
+        $contactA = 'contact_id_b';
+        $contactB = 'contact_id_a';
+      }
+      $relIDs = self::getIDsForRelatedContact($ids, $exportMode);
 
-        $relationFrom = " {$relationFrom}
-                INNER JOIN civicrm_relationship crel ON crel.{$contactB} = contact_a.id AND crel.relationship_type_id = {$id}
-                {$relationshipJoin} ";
-
-        //check for active relationship status only
-        $today = date('Ymd');
-        $relationActive = " AND (crel.is_active = 1 AND ( crel.end_date is NULL OR crel.end_date >= {$today} ) )";
-        $relationWhere = " WHERE contact_a.is_deleted = 0 {$relationshipClause} {$relationActive}";
-        $relationGroupBy = CRM_Contact_BAO_Query::getGroupByFromSelectColumns($relationQuery[$rel]->_select, "crel.{$contactA}");
-        $relationSelect = "{$relationSelect}, {$contactA} as refContact ";
-        $relationQueryString = "$relationSelect $relationFrom $relationWhere $relationHaving $relationGroupBy";
-
-        $allRelContactDAO = CRM_Core_DAO::executeQuery($relationQueryString);
-        while ($allRelContactDAO->fetch()) {
-          //FIX Me: Migrate this to table rather than array
-          // build the array of all related contacts
-          $allRelContactArray[$rel][$allRelContactDAO->refContact] = clone($allRelContactDAO);
-        }
-        $allRelContactDAO->free();
+      $relationshipJoin = $relationshipClause = '';
+      if (!$selectAll && $componentTable) {
+        $relationshipJoin = " INNER JOIN {$componentTable} ctTable ON ctTable.contact_id = {$contactA}";
+      }
+      elseif (!empty($relIDs)) {
+        $relID = implode(',', $relIDs);
+        $relationshipClause = " AND crel.{$contactA} IN ( {$relID} )";
       }
-    }
-    return array($relationQuery, $allRelContactArray);
-  }
 
-  /**
-   * @param $field
-   * @param $iterationDAO
-   * @param $fieldValue
-   * @param $i18n
-   * @param $metadata
-   * @param $paymentDetails
-   *
-   * @param \CRM_Export_BAO_ExportProcessor $processor
-   *
-   * @return string
-   */
-  protected static function getTransformedFieldValue($field, $iterationDAO, $fieldValue, $i18n, $metadata, $paymentDetails, $processor) {
+      $relationFrom = " {$relationFrom}
+              INNER JOIN civicrm_relationship crel ON crel.{$contactB} = contact_a.id AND crel.relationship_type_id = {$id}
+              {$relationshipJoin} ";
 
-    if ($field == 'id') {
-      return $iterationDAO->contact_id;
-      // special case for calculated field
-    }
-    elseif ($field == 'source_contact_id') {
-      return $iterationDAO->contact_id;
-    }
-    elseif ($field == 'pledge_balance_amount') {
-      return $iterationDAO->pledge_amount - $iterationDAO->pledge_total_paid;
-      // special case for calculated field
-    }
-    elseif ($field == 'pledge_next_pay_amount') {
-      return $iterationDAO->pledge_next_pay_amount + $iterationDAO->pledge_outstanding_amount;
-    }
-    elseif (isset($fieldValue) &&
-      $fieldValue != ''
-    ) {
-      //check for custom data
-      if ($cfID = CRM_Core_BAO_CustomField::getKeyID($field)) {
-        return CRM_Core_BAO_CustomField::displayValue($fieldValue, $cfID);
-      }
+      //check for active relationship status only
+      $today = date('Ymd');
+      $relationActive = " AND (crel.is_active = 1 AND ( crel.end_date is NULL OR crel.end_date >= {$today} ) )";
+      $relationWhere = " WHERE contact_a.is_deleted = 0 {$relationshipClause} {$relationActive}";
+      CRM_Core_DAO::disableFullGroupByMode();
+      $relationSelect = "{$relationSelect}, {$contactA} as refContact ";
+      $relationQueryString = "$relationSelect $relationFrom $relationWhere $relationHaving GROUP BY crel.{$contactA}";
 
-      elseif (in_array($field, array(
-        'email_greeting',
-        'postal_greeting',
-        'addressee',
-      ))) {
-        //special case for greeting replacement
-        $fldValue = "{$field}_display";
-        return $iterationDAO->$fldValue;
-      }
-      else {
-        //normal fields with a touch of CRM-3157
-        switch ($field) {
-          case 'country':
-          case 'world_region':
-            return $i18n->crm_translate($fieldValue, array('context' => 'country'));
-
-          case 'state_province':
-            return $i18n->crm_translate($fieldValue, array('context' => 'province'));
-
-          case 'gender':
-          case 'preferred_communication_method':
-          case 'preferred_mail_format':
-          case 'communication_style':
-            return $i18n->crm_translate($fieldValue);
-
-          default:
-            if (isset($metadata[$field])) {
-              // No I don't know why we do it this way & whether we could
-              // make better use of pseudoConstants.
-              if (!empty($metadata[$field]['context'])) {
-                return $i18n->crm_translate($fieldValue, $metadata[$field]);
-              }
-              if (!empty($metadata[$field]['pseudoconstant'])) {
-                // This is not our normal syntax for pseudoconstants but I am a bit loath to
-                // call an external function until sure it is not increasing php processing given this
-                // may be iterated 100,000 times & we already have the $imProvider var loaded.
-                // That can be next refactor...
-                // Yes - definitely feeling hatred for this bit of code - I know you will beat me up over it's awfulness
-                // but I have to reach a stable point....
-                $varName = $metadata[$field]['pseudoconstant']['var'];
-                if ($varName === 'imProviders') {
-                  return CRM_Core_PseudoConstant::getLabel('CRM_Core_DAO_IM', 'provider_id', $fieldValue);
-                }
-                if ($varName === 'phoneTypes') {
-                  return CRM_Core_PseudoConstant::getLabel('CRM_Core_DAO_Phone', 'phone_type_id', $fieldValue);
-                }
-              }
+      $allRelContactDAO = CRM_Core_DAO::executeQuery($relationQueryString);
+      CRM_Core_DAO::reenableFullGroupByMode();
 
+      while ($allRelContactDAO->fetch()) {
+        $relationQuery->convertToPseudoNames($allRelContactDAO);
+        $row = [];
+        // @todo pass processor to fetchRelationshipDetails and set fields directly within it.
+        self::fetchRelationshipDetails($allRelContactDAO, $relationReturnProperties, $relationshipKey, $row);
+        foreach (array_keys($relationReturnProperties) as $property) {
+          if ($property === 'location') {
+            // @todo - simplify location in self::fetchRelationshipDetails - remove handling here. Or just call
+            // $processor->setRelationshipValue from fetchRelationshipDetails
+            foreach ($relationReturnProperties['location'] as $locationName => $locationValues) {
+              foreach (array_keys($locationValues) as $locationValue) {
+                $key = str_replace(' ', '_', $locationName) . '-' . $locationValue;
+                $processor->setRelationshipValue($relationshipKey, $allRelContactDAO->refContact, $key, $row[$relationshipKey . '__' . $key]);
+              }
             }
-            return $fieldValue;
+          }
+          else {
+            $processor->setRelationshipValue($relationshipKey, $allRelContactDAO->refContact, $property, $row[$relationshipKey . '_' . $property]);
+          }
         }
       }
     }
-    elseif ($processor->isExportSpecifiedPaymentFields() && array_key_exists($field, self::componentPaymentFields())) {
-      $paymentTableId = $processor->getPaymentTableID();
-      $paymentData = CRM_Utils_Array::value($iterationDAO->$paymentTableId, $paymentDetails);
-      $payFieldMapper = array(
-        'componentPaymentField_total_amount' => 'total_amount',
-        'componentPaymentField_contribution_status' => 'contribution_status',
-        'componentPaymentField_payment_instrument' => 'pay_instru',
-        'componentPaymentField_transaction_id' => 'trxn_id',
-        'componentPaymentField_received_date' => 'receive_date',
-      );
-      return CRM_Utils_Array::value($payFieldMapper[$field], $paymentData, '');
-    }
-    else {
-      // if field is empty or null
-      return '';
-    }
   }
 
 }
diff --git a/hrjobcontract/CRM/Hrjobcontract/Dedupe/Merger.php b/hrjobcontract/CRM/Hrjobcontract/Dedupe/Merger.php
index c13c8eef2c0..f64396c7bd7 100644
--- a/hrjobcontract/CRM/Hrjobcontract/Dedupe/Merger.php
+++ b/hrjobcontract/CRM/Hrjobcontract/Dedupe/Merger.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  */
 class CRM_Hrjobcontract_Dedupe_Merger {
 
diff --git a/hrjobcontract/CRM/Hrjobcontract/Form/Merge.php b/hrjobcontract/CRM/Hrjobcontract/Form/Merge.php
index 5dda31f9d95..f9fc7f29f4c 100644
--- a/hrjobcontract/CRM/Hrjobcontract/Form/Merge.php
+++ b/hrjobcontract/CRM/Hrjobcontract/Form/Merge.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  */
 
 /**
diff --git a/hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.hlp b/hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.hlp
index 1898e57360a..3062af37036 100644
--- a/hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.hlp
+++ b/hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.hlp
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.tpl b/hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.tpl
index 510c9745d90..89f75b0784a 100644
--- a/hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.tpl
+++ b/hrjobcontract/templates/CRM/Hrjobcontract/Form/Merge.tpl
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
diff --git a/hrui/templates/CRM/common/footer.tpl b/hrui/templates/CRM/common/footer.tpl
index 0b8567f4fe0..4cd2c4d8c88 100644
--- a/hrui/templates/CRM/common/footer.tpl
+++ b/hrui/templates/CRM/common/footer.tpl
@@ -2,7 +2,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |

From 8cfed4ea7c3037b6e3e95ad78460c54bdb8dd47b Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Fri, 21 Dec 2018 17:16:10 -0200
Subject: [PATCH 19/23] PCHR-4473: Fix tabs icons on the contact summary page

In Civi 5.8, some new default icons were added by default to the tabs and
they don't match the ones used by CiviHR.

With the tabset hook, we can make each extension declare which icon to
use for its tab.
---
 com.civicrm.hrjobroles/hrjobroles.php         |  1 +
 contactsummary/contactsummary.php             |  1 +
 hrbank/hrbank.php                             | 19 +++++++++++++++++++
 hrcareer/hrcareer.php                         | 19 +++++++++++++++++++
 hrjobcontract/hrjobcontract.php               |  1 +
 hrmed/hrmed.php                               | 19 +++++++++++++++++++
 hrqual/hrqual.php                             |  6 ++++++
 org.civicrm.hremergency/hremergency.php       | 19 +++++++++++++++++++
 .../hrleaveandabsences.php                    |  1 +
 9 files changed, 86 insertions(+)

diff --git a/com.civicrm.hrjobroles/hrjobroles.php b/com.civicrm.hrjobroles/hrjobroles.php
index 6bdd456a055..7a599914bdf 100644
--- a/com.civicrm.hrjobroles/hrjobroles.php
+++ b/com.civicrm.hrjobroles/hrjobroles.php
@@ -125,6 +125,7 @@ function hrjobroles_civicrm_tabset($tabsetName, &$tabs, $context) {
     $tabs[] = array( 'id' => 'hrjobroles',
       'url' => $url,
       'title' => 'Job Roles',
+      'icon' => 'fa fa-list-alt',
       'weight' => -180,
     );
   }
diff --git a/contactsummary/contactsummary.php b/contactsummary/contactsummary.php
index 0fe22fd666c..1c0c324d3ce 100644
--- a/contactsummary/contactsummary.php
+++ b/contactsummary/contactsummary.php
@@ -157,6 +157,7 @@ function contactsummary_civicrm_tabset($tabsetName, &$tabs, $context) {
       'id'     => 'contactsummary',
       'url'    => CRM_Utils_System::url('civicrm/contact-summary'),
       'title'  => ts('Contact Summary'),
+      'icon'   => 'fa fa-user',
       'weight' => -200,
     );
   }
diff --git a/hrbank/hrbank.php b/hrbank/hrbank.php
index 502f0583b39..3f9ac611314 100644
--- a/hrbank/hrbank.php
+++ b/hrbank/hrbank.php
@@ -104,3 +104,22 @@ function hrbank_civicrm_upgrade($op, CRM_Queue_Queue $queue = NULL) {
 function hrbank_civicrm_managed(&$entities) {
   return _hrbank_civix_civicrm_managed($entities);
 }
+
+/**
+ * Implementation of hook_civicrm_tabset
+ *
+ * @param string $tabsetName
+ * @param array $tabs
+ * @param mixed $context
+ */
+function hrbank_civicrm_tabset($tabsetName, &$tabs, $context) {
+  if ($tabsetName != 'civicrm/contact/view') {
+    return;
+  }
+
+  foreach ($tabs as $i => $tab) {
+    if ($tab['title'] == 'Bank Details') {
+        $tabs[$i]['icon'] = 'fa fa-bank';
+    }
+  }
+}
diff --git a/hrcareer/hrcareer.php b/hrcareer/hrcareer.php
index b4ccc91b659..9a52ded7cbb 100644
--- a/hrcareer/hrcareer.php
+++ b/hrcareer/hrcareer.php
@@ -192,3 +192,22 @@ function hrcareer_civicrm_pageRun($page) {
       ->addScriptFile('org.civicrm.hrcareer', 'js/dist/hrcareer.min.js', 1010);
   }
 }
+
+/**
+ * Implementation of hook_civicrm_tabset
+ *
+ * @param string $tabsetName
+ * @param array $tabs
+ * @param mixed $context
+ */
+function hrcareer_civicrm_tabset($tabsetName, &$tabs, $context) {
+  if ($tabsetName != 'civicrm/contact/view') {
+    return;
+  }
+
+  foreach ($tabs as $i => $tab) {
+    if ($tab['title'] == 'Career History') {
+        $tabs[$i]['icon'] = 'fa fa-history';
+    }
+  }
+}
diff --git a/hrjobcontract/hrjobcontract.php b/hrjobcontract/hrjobcontract.php
index dc8efb12aa6..99673b6e3e5 100644
--- a/hrjobcontract/hrjobcontract.php
+++ b/hrjobcontract/hrjobcontract.php
@@ -288,6 +288,7 @@ function hrjobcontract_civicrm_tabset($tabsetName, &$tabs, $context) {
       'id'        => 'hrjobcontract',
       'url'       => CRM_Utils_System::url('civicrm/contact/view/hrjobcontract', array('cid' => $context['contact_id'])),
       'title'     => ts('Job Contract'),
+      'icon'      => 'fa fa-file-o',
       'weight'    => -190,
     );
   }
diff --git a/hrmed/hrmed.php b/hrmed/hrmed.php
index d1633938a91..c28d3779e81 100644
--- a/hrmed/hrmed.php
+++ b/hrmed/hrmed.php
@@ -166,3 +166,22 @@ function hrmed_civicrm_pageRun($page) {
       ->addScriptFile('org.civicrm.hrmed', 'js/dist/hrmed.min.js', 1010);
   }
 }
+
+/**
+ * Implementation of hook_civicrm_tabset
+ *
+ * @param string $tabsetName
+ * @param array $tabs
+ * @param mixed $context
+ */
+function hrmed_civicrm_tabset($tabsetName, &$tabs, $context) {
+  if ($tabsetName != 'civicrm/contact/view') {
+    return;
+  }
+
+  foreach ($tabs as $i => $tab) {
+    if ($tab['title'] == 'Medical & Disability') {
+      $tabs[$i]['icon'] = 'fa fa-wheelchair';
+    }
+  }
+}
diff --git a/hrqual/hrqual.php b/hrqual/hrqual.php
index 7d6d8f84ae3..58b2711dbdc 100644
--- a/hrqual/hrqual.php
+++ b/hrqual/hrqual.php
@@ -191,6 +191,12 @@ function hrqual_civicrm_tabset($tabsetName, &$tabs, $context) {
         'optionGroups' => $val,
       ),
     ));
+
+    foreach ($tabs as $i => $tab) {
+      if ($tab['title'] == 'Qualifications') {
+        $tabs[$i]['icon'] = 'fa fa-certificate';
+      }
+    }
   }
 }
 
diff --git a/org.civicrm.hremergency/hremergency.php b/org.civicrm.hremergency/hremergency.php
index 71321f822b2..0898249a283 100644
--- a/org.civicrm.hremergency/hremergency.php
+++ b/org.civicrm.hremergency/hremergency.php
@@ -136,3 +136,22 @@ function hremergency_civicrm_container($container) {
 function hremergency_civicrm_alterAPIPermissions($entity, $action, &$params, &$permissions) {
   $permissions['contact']['deleteemergencycontact'] = 'access AJAX API';
 }
+
+/**
+ * Implementation of hook_civicrm_tabset
+ *
+ * @param string $tabsetName
+ * @param array $tabs
+ * @param mixed $context
+ */
+function hremergency_civicrm_tabset($tabsetName, &$tabs, $context) {
+  if ($tabsetName != 'civicrm/contact/view') {
+    return;
+  }
+
+  foreach ($tabs as $i => $tab) {
+    if ($tab['title'] == 'Emergency Contacts') {
+      $tabs[$i]['icon'] = 'fa fa-medkit';
+    }
+  }
+}
diff --git a/uk.co.compucorp.civicrm.hrleaveandabsences/hrleaveandabsences.php b/uk.co.compucorp.civicrm.hrleaveandabsences/hrleaveandabsences.php
index fd905f2b07a..9dbdf5d892a 100644
--- a/uk.co.compucorp.civicrm.hrleaveandabsences/hrleaveandabsences.php
+++ b/uk.co.compucorp.civicrm.hrleaveandabsences/hrleaveandabsences.php
@@ -384,6 +384,7 @@ function hrleaveandabsences_civicrm_tabset($tabsetName, &$tabs, $context) {
       'id'        => 'absence',
       'url'       => CRM_Utils_System::url('civicrm/contact/view/absence', ['cid' => $contactId]),
       'title'     => ts('Leave'),
+      'icon'      => 'fa fa-briefcase',
       'weight'    => 10
     ];
   }

From 7b8f5565d175dd0d9600c7e6ce930d78c4e8f31b Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Fri, 21 Dec 2018 17:17:07 -0200
Subject: [PATCH 20/23] PCHR-4473: Remove unecessary HR tag from key dates and
 key details panels

---
 .../js/src/contact-summary/controllers/key-dates.html          | 3 +--
 .../js/src/contact-summary/controllers/key-details.html        | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/contactsummary/js/src/contact-summary/controllers/key-dates.html b/contactsummary/js/src/contact-summary/controllers/key-dates.html
index 620fe1e2e14..a2c0f16048c 100644
--- a/contactsummary/js/src/contact-summary/controllers/key-dates.html
+++ b/contactsummary/js/src/contact-summary/controllers/key-dates.html
@@ -1,7 +1,6 @@
-<section class="panel panel-default panel-default-plain-inverted panel--key-dates" ng-controller="KeyDatesController as KeyDates">
+<section class="panel panel-default panel-default-plain panel-inverted panel--key-dates" ng-controller="KeyDatesController as KeyDates">
   <header class="panel-heading">
     <h2 class="panel-title">Key Dates</h2>
-    <hr>
   </header>
   <div class="panel-body">
     <div class="panel-body-section">
diff --git a/contactsummary/js/src/contact-summary/controllers/key-details.html b/contactsummary/js/src/contact-summary/controllers/key-details.html
index 8a8d34fc43a..bd614817d95 100644
--- a/contactsummary/js/src/contact-summary/controllers/key-details.html
+++ b/contactsummary/js/src/contact-summary/controllers/key-details.html
@@ -1,8 +1,7 @@
-<section class="panel panel-default panel-default-plain panel--key-details"
+<section class="panel panel-default panel--key-details"
   ng-controller="KeyDetailsController as KeyDetails">
   <header class="panel-heading">
     <h2 class="panel-title">Key Details</h2>
-    <hr>
   </header>
   <div class="panel-body">
     <dl class="dl-horizontal">

From d335cd3c57ba9347fd16301b894765ae61723404 Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Thu, 4 Apr 2019 14:07:57 -0300
Subject: [PATCH 21/23] PCHR-4473: Run tests on CiviCRM 5.12.0

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 36ce3da4f31..efb0e72ffb7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,7 +49,7 @@ pipeline {
       steps {
         script {
           // Build site with CV Buildkit
-          sh "civibuild create ${params.CIVIHR_BUILDNAME} --type drupal-clean --civi-ver 5.3.1 --url $WEBURL --admin-pass $ADMIN_PASS"
+          sh "civibuild create ${params.CIVIHR_BUILDNAME} --type drupal-clean --civi-ver 5.12.0 --url $WEBURL --admin-pass $ADMIN_PASS"
 
           // Get target and PR branches name
           def prBranch = env.CHANGE_BRANCH

From 356f9f381c42f3747881317f2233563360689bc1 Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Mon, 8 Apr 2019 14:40:50 -0300
Subject: [PATCH 22/23] PCHR-4473: Sync overridden files with CiviCRM 5.12.0

---
 hrjobcontract/CRM/Export/BAO/Export.php       | 294 +++---------------
 .../CRM/Hrjobcontract/Dedupe/Merger.php       |  18 +-
 2 files changed, 56 insertions(+), 256 deletions(-)

diff --git a/hrjobcontract/CRM/Export/BAO/Export.php b/hrjobcontract/CRM/Export/BAO/Export.php
index f7de0d5d07b..856babfc3fa 100644
--- a/hrjobcontract/CRM/Export/BAO/Export.php
+++ b/hrjobcontract/CRM/Export/BAO/Export.php
@@ -41,15 +41,6 @@ class CRM_Export_BAO_Export {
   // CRM-7675
   const EXPORT_ROW_COUNT = 100000;
 
-  /**
-   * Key representing the head of household in the relationship array.
-   *
-   * e.g. ['8_b_a' => 'Household Member Is', '8_a_b = 'Household Member Of'.....]
-   *
-   * @var
-   */
-  protected static $relationshipTypes = [];
-
   /**
    * Get default return property for export based on mode
    *
@@ -133,7 +124,7 @@ public static function exportComponent($exportMode) {
    *   Group By Clause
    */
   public static function getGroupBy($processor, $returnProperties, $query) {
-    $groupBy = '';
+    $groupBy = NULL;
     $exportMode = $processor->getExportMode();
     $queryMode = $processor->getQueryMode();
     // @custom HRJobContract extension override by PCHR-1409.
@@ -153,7 +144,7 @@ public static function getGroupBy($processor, $returnProperties, $query) {
         $groupBy = 'civicrm_contribution.id';
         if (CRM_Contribute_BAO_Query::isSoftCreditOptionEnabled()) {
           // especial group by  when soft credit columns are included
-          $groupBy = array('contribution_search_scredit_combined.id', 'contribution_search_scredit_combined.scredit_id');
+          $groupBy = ['contribution_search_scredit_combined.id', 'contribution_search_scredit_combined.scredit_id'];
         }
         break;
 
@@ -176,7 +167,7 @@ public static function getGroupBy($processor, $returnProperties, $query) {
       $groupBy = array('contact_a.id', 'hrjobcontract.id');
     }
 
-    return $groupBy ? ' GROUP BY ' . $groupBy : '';
+    return $groupBy ? ' GROUP BY ' . implode(', ', (array) $groupBy) : '';
   }
 
   /**
@@ -229,14 +220,18 @@ public static function exportComponents(
     $queryOperator = 'AND'
   ) {
 
-    $processor = new CRM_Export_BAO_ExportProcessor($exportMode, $fields, $queryOperator, $mergeSameHousehold);
+    $isPostalOnly = (
+      isset($exportParams['postal_mailing_export']['postal_mailing_export']) &&
+      $exportParams['postal_mailing_export']['postal_mailing_export'] == 1
+    );
+
+    $processor = new CRM_Export_BAO_ExportProcessor($exportMode, $fields, $queryOperator, $mergeSameHousehold, $isPostalOnly);
     $returnProperties = array();
-    self::$relationshipTypes = $processor->getRelationshipTypes();
 
     if ($fields) {
       foreach ($fields as $key => $value) {
         $fieldName = CRM_Utils_Array::value(1, $value);
-        if (!$fieldName) {
+        if (!$fieldName || $processor->isHouseholdMergeRelationshipTypeKey($fieldName)) {
           continue;
         }
 
@@ -301,7 +296,6 @@ public static function exportComponents(
         if (!array_key_exists($column, $returnProperties)) {
           $returnProperties[$column] = 1;
           $column = $column == 'id' ? 'civicrm_primary_id' : $column;
-          $processor->setColumnAsCalculationOnly($column);
           $exportParams['merge_same_address']['temp_columns'][$column] = 1;
         }
       }
@@ -334,7 +328,6 @@ public static function exportComponents(
         if (!array_key_exists($column, $returnProperties)) {
           $returnProperties[$column] = 1;
           $exportParams['postal_mailing_export']['temp_columns'][$column] = 1;
-          $processor->setColumnAsCalculationOnly($column);
         }
       }
     }
@@ -352,17 +345,7 @@ public static function exportComponents(
         $returnProperties['id'] = 1;
       }
 
-      foreach ($returnProperties as $key => $value) {
-        if (!$processor->isRelationshipTypeKey($key)) {
-          foreach ($processor->getHouseholdRelationshipTypes() as $householdRelationshipType) {
-            if (!in_array($key, ['location_type', 'im_provider'])) {
-              $returnProperties[$householdRelationshipType][$key] = $value;
-            }
-          }
-          // @todo - don't use returnProperties above.
-          $processor->setHouseholdMergeReturnProperties($returnProperties[$householdRelationshipType]);
-        }
-      }
+      $processor->setHouseholdMergeReturnProperties(array_diff_key($returnProperties, array_fill_keys(['location_type', 'im_provider'], 1)));
     }
 
     self::buildRelatedContactArray($selectAll, $ids, $processor, $componentTable);
@@ -432,7 +415,17 @@ public static function exportComponents(
 
     $addPaymentHeader = FALSE;
 
-    $paymentDetails = array();
+    list($outputColumns, $metadata) = self::getExportStructureArrays($returnProperties, $processor);
+
+    if (!empty($exportParams['merge_same_address']['temp_columns'])) {
+      // @todo - this is a temp fix  - ideally later we don't set stuff only to unset it.
+      // test exists covering this...
+      foreach (array_keys($exportParams['merge_same_address']['temp_columns']) as $field) {
+        $processor->setColumnAsCalculationOnly($field);
+      }
+    }
+
+    $paymentDetails = [];
     if ($processor->isExportPaymentFields()) {
       // get payment related in for event and members
       $paymentDetails = CRM_Contribute_BAO_Contribution::getContributionDetails($exportMode, $ids);
@@ -442,6 +435,9 @@ public static function exportComponents(
       if (!$processor->isExportSpecifiedPaymentFields()) {
         if (!empty($paymentDetails)) {
           $addPaymentHeader = TRUE;
+          foreach (array_keys($processor->getPaymentHeaders()) as $paymentField) {
+            $processor->addOutputSpecification($paymentField);
+          }
         }
       }
     }
@@ -455,19 +451,8 @@ public static function exportComponents(
 
     $count = -1;
 
-    list($outputColumns, $sqlColumns, $metadata) = self::getExportStructureArrays($returnProperties, $processor);
     $headerRows = $processor->getHeaderRows();
-
-    // add payment headers if required
-    if ($addPaymentHeader && $processor->isExportPaymentFields()) {
-      // @todo rather than do this for every single row do it before the loop starts.
-      // where other header definitions take place.
-      $headerRows = array_merge($headerRows, $processor->getPaymentHeaders());
-      foreach (array_keys($processor->getPaymentHeaders()) as $paymentHdr) {
-        self::sqlColumnDefn($processor, $sqlColumns, $paymentHdr);
-      }
-    }
-
+    $sqlColumns = $processor->getSQLColumns();
     $exportTempTable = self::createTempTable($sqlColumns);
     $limitReached = FALSE;
 
@@ -484,6 +469,9 @@ public static function exportComponents(
         $count++;
         $rowsThisIteration++;
         $row = $processor->buildRow($query, $iterationDAO, $outputColumns, $metadata, $paymentDetails, $addPaymentHeader, $paymentTableId);
+        if ($row === FALSE) {
+          continue;
+        }
 
         // add component info
         // write the row to a file
@@ -504,26 +492,11 @@ public static function exportComponents(
     if ($exportTempTable) {
       self::writeDetailsToTable($exportTempTable, $componentDetails, $sqlColumns);
 
-      // if postalMailing option is checked, exclude contacts who are deceased, have
-      // "Do not mail" privacy setting, or have no street address
-      if (isset($exportParams['postal_mailing_export']['postal_mailing_export']) &&
-        $exportParams['postal_mailing_export']['postal_mailing_export'] == 1
-      ) {
-        self::postalMailingFormat($exportTempTable, $sqlColumns, $exportMode);
-      }
-
       // do merge same address and merge same household processing
       if ($mergeSameAddress) {
         self::mergeSameAddress($exportTempTable, $sqlColumns, $exportParams);
       }
 
-      // merge the records if they have corresponding households
-      if ($mergeSameHousehold) {
-        foreach ($processor->getHouseholdRelationshipTypes() as $householdRelationshipType) {
-          self::mergeSameHousehold($exportTempTable, $sqlColumns, $householdRelationshipType);
-        }
-      }
-
       // call export hook
       CRM_Utils_Hook::export($exportTempTable, $headerRows, $sqlColumns, $exportMode, $componentTable, $ids);
 
@@ -534,7 +507,7 @@ public static function exportComponents(
       }
       else {
         // return tableName sqlColumns headerRows in test context
-        return array($exportTempTable, $sqlColumns, $headerRows);
+        return array($exportTempTable, $sqlColumns, $headerRows, $processor);
       }
 
       // delete the export temp table and component table
@@ -639,15 +612,6 @@ public static function exportCustom($customSearchClass, $formValues, $order) {
     CRM_Utils_System::civiExit();
   }
 
-  /**
-   * @param \CRM_Export_BAO_ExportProcessor $processor
-   * @param $sqlColumns
-   * @param $field
-   */
-  public static function sqlColumnDefn($processor, &$sqlColumns, $field) {
-    $sqlColumns[$processor->getMungedFieldName($field)] = $processor->getSqlColumnDefinition($field);
-  }
-
   /**
    * @param string $tableName
    * @param $details
@@ -702,14 +666,12 @@ public static function writeDetailsToTable($tableName, $details, $sqlColumns) {
    */
   public static function createTempTable($sqlColumns) {
     //creating a temporary table for the search result that need be exported
-    $exportTempTable = CRM_Utils_SQL_TempTable::build()->setDurable()->setCategory('export')->getName();
+    $exportTempTable = CRM_Utils_SQL_TempTable::build()->setDurable()->setCategory('export')->setUtf8();
 
     // also create the sql table
-    $sql = "DROP TABLE IF EXISTS {$exportTempTable}";
-    CRM_Core_DAO::executeQuery($sql);
+    $exportTempTable->drop();
 
     $sql = "
-CREATE TABLE {$exportTempTable} (
      id int unsigned NOT NULL AUTO_INCREMENT,
 ";
     $sql .= implode(",\n", array_values($sqlColumns));
@@ -732,12 +694,8 @@ public static function createTempTable($sqlColumns) {
       }
     }
 
-    $sql .= "
-) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci
-";
-
-    CRM_Core_DAO::executeQuery($sql);
-    return $exportTempTable;
+    $exportTempTable->createWithColumns($sql);
+    return $exportTempTable->getName();
   }
 
   /**
@@ -838,6 +796,7 @@ public static function mergeSameAddress($tableName, &$sqlColumns, $exportParams)
     }
 
     // unset temporary columns that were added for postal mailing format
+    // @todo - this part is pretty close to ready to be removed....
     if (!empty($exportParams['merge_same_address']['temp_columns'])) {
       $unsetKeys = array_keys($sqlColumns);
       foreach ($unsetKeys as $headerKey => $sqlColKey) {
@@ -1021,83 +980,6 @@ public static function _buildMasterCopyArray($sql, $exportParams, $sharedAddress
     return $merge;
   }
 
-  /**
-   * Merge household record into the individual record
-   * if exists
-   *
-   * @param string $exportTempTable
-   *   Temporary temp table that stores the records.
-   * @param array $sqlColumns
-   *   Array of names of the table columns of the temp table.
-   * @param string $prefix
-   *   Name of the relationship type that is prefixed to the table columns.
-   */
-  public static function mergeSameHousehold($exportTempTable, &$sqlColumns, $prefix) {
-    $prefixColumn = $prefix . '_';
-    $replaced = array();
-
-    // name map of the non standard fields in header rows & sql columns
-    $mappingFields = array(
-      'civicrm_primary_id' => 'id',
-      'provider_id' => 'im_service_provider',
-      'phone_type_id' => 'phone_type',
-    );
-
-    //figure out which columns are to be replaced by which ones
-    foreach ($sqlColumns as $columnNames => $dontCare) {
-      if ($rep = CRM_Utils_Array::value($columnNames, $mappingFields)) {
-        $replaced[$columnNames] = CRM_Utils_String::munge($prefixColumn . $rep, '_', 64);
-      }
-      else {
-        $householdColName = CRM_Utils_String::munge($prefixColumn . $columnNames, '_', 64);
-
-        if (!empty($sqlColumns[$householdColName])) {
-          $replaced[$columnNames] = $householdColName;
-        }
-      }
-    }
-    $query = "UPDATE $exportTempTable SET ";
-
-    $clause = array();
-    foreach ($replaced as $from => $to) {
-      $clause[] = "$from = $to ";
-      unset($sqlColumns[$to]);
-    }
-    $query .= implode(",\n", $clause);
-    $query .= " WHERE {$replaced['civicrm_primary_id']} != ''";
-
-    CRM_Core_DAO::executeQuery($query);
-
-    //drop the table columns that store redundant household info
-    $dropQuery = "ALTER TABLE $exportTempTable ";
-    foreach ($replaced as $householdColumns) {
-      $dropClause[] = " DROP $householdColumns ";
-    }
-    $dropQuery .= implode(",\n", $dropClause);
-
-    CRM_Core_DAO::executeQuery($dropQuery);
-
-    // also drop the temp table if exists
-    $sql = "DROP TABLE IF EXISTS {$exportTempTable}_temp";
-    CRM_Core_DAO::executeQuery($sql);
-
-    // clean up duplicate records
-    $query = "
-CREATE TABLE {$exportTempTable}_temp SELECT *
-FROM {$exportTempTable}
-GROUP BY civicrm_primary_id ";
-
-    CRM_Core_DAO::disableFullGroupByMode();
-    CRM_Core_DAO::executeQuery($query);
-    CRM_Core_DAO::reenableFullGroupByMode();
-
-    $query = "DROP TABLE $exportTempTable";
-    CRM_Core_DAO::executeQuery($query);
-
-    $query = "ALTER TABLE {$exportTempTable}_temp RENAME TO {$exportTempTable}";
-    CRM_Core_DAO::executeQuery($query);
-  }
-
   /**
    * @param $exportTempTable
    * @param $headerRows
@@ -1143,62 +1025,6 @@ public static function writeCSVFromTable($exportTempTable, $headerRows, $sqlColu
     }
   }
 
-  /**
-   * Exclude contacts who are deceased, have "Do not mail" privacy setting,
-   * or have no street address
-   * @param $exportTempTable
-   * @param $sqlColumns
-   * @param $exportParams
-   */
-  public static function postalMailingFormat($exportTempTable, &$sqlColumns, $exportParams) {
-    $whereClause = array();
-
-    if (array_key_exists('is_deceased', $sqlColumns)) {
-      $whereClause[] = 'is_deceased = 1';
-    }
-
-    if (array_key_exists('do_not_mail', $sqlColumns)) {
-      $whereClause[] = 'do_not_mail = 1';
-    }
-
-    if (array_key_exists('street_address', $sqlColumns)) {
-      $addressWhereClause = " ( (street_address IS NULL) OR (street_address = '') ) ";
-
-      // check for supplemental_address_1
-      if (array_key_exists('supplemental_address_1', $sqlColumns)) {
-        $addressOptions = CRM_Core_BAO_Setting::valueOptions(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
-          'address_options', TRUE, NULL, TRUE
-        );
-        if (!empty($addressOptions['supplemental_address_1'])) {
-          $addressWhereClause .= " AND ( (supplemental_address_1 IS NULL) OR (supplemental_address_1 = '') ) ";
-          // enclose it again, since we are doing an AND in between a set of ORs
-          $addressWhereClause = "( $addressWhereClause )";
-        }
-      }
-
-      $whereClause[] = $addressWhereClause;
-    }
-
-    if (!empty($whereClause)) {
-      $whereClause = implode(' OR ', $whereClause);
-      $query = "
-DELETE
-FROM   $exportTempTable
-WHERE  {$whereClause}";
-      CRM_Core_DAO::singleValueQuery($query);
-    }
-
-    // unset temporary columns that were added for postal mailing format
-    if (!empty($exportParams['postal_mailing_export']['temp_columns'])) {
-      $unsetKeys = array_keys($sqlColumns);
-      foreach ($unsetKeys as $headerKey => $sqlColKey) {
-        if (array_key_exists($sqlColKey, $exportParams['postal_mailing_export']['temp_columns'])) {
-          unset($sqlColumns[$sqlColKey]);
-        }
-      }
-    }
-  }
-
   /**
    * Build componentPayment fields.
    *
@@ -1250,46 +1076,26 @@ public static function componentPaymentFields() {
    *       yet find a way to comment them for posterity.
    */
   public static function getExportStructureArrays($returnProperties, $processor) {
-    $metadata = $outputColumns = $sqlColumns = array();
-    $phoneTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 'phone_type_id');
-    $imProviders = CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 'provider_id');
+    $outputColumns = $metadata = array();
     $queryFields = $processor->getQueryFields();
     foreach ($returnProperties as $key => $value) {
       if (($key != 'location' || !is_array($value)) && !$processor->isRelationshipTypeKey($key)) {
         $outputColumns[$key] = $value;
         $processor->addOutputSpecification($key);
-        self::sqlColumnDefn($processor, $sqlColumns, $key);
       }
       elseif ($processor->isRelationshipTypeKey($key)) {
         $outputColumns[$key] = $value;
-        $field = $key;
         foreach ($value as $relationField => $relationValue) {
           // below block is same as primary block (duplicate)
           if (isset($queryFields[$relationField]['title'])) {
-            if (!$processor->isHouseholdMergeRelationshipTypeKey($field)) {
-              // Do not add to header row if we are only generating for merge reasons.
-              $processor->addOutputSpecification($relationField, $key);
-            }
-            self::sqlColumnDefn($processor, $sqlColumns, $field . '-' . $relationField);
+            $processor->addOutputSpecification($relationField, $key);
           }
           elseif (is_array($relationValue) && $relationField == 'location') {
             // fix header for location type case
             foreach ($relationValue as $ltype => $val) {
               foreach (array_keys($val) as $fld) {
                 $type = explode('-', $fld);
-
-                $hdr = "{$ltype}-" . $queryFields[$type[0]]['title'];
-
-                if (!empty($type[1])) {
-                  if (CRM_Utils_Array::value(0, $type) == 'phone') {
-                    $hdr .= "-" . CRM_Core_PseudoConstant::getLabel('CRM_Core_BAO_Phone', 'phone_type_id', $type[1]);
-                  }
-                  elseif (CRM_Utils_Array::value(0, $type) == 'im') {
-                    $hdr .= "-" . CRM_Core_PseudoConstant::getLabel('CRM_Core_BAO_IM', 'provider_id', $type[1]);
-                  }
-                }
-                $processor->addOutputSpecification($field, $key, $ltype, CRM_Utils_Array::value(1, $type));
-                self::sqlColumnDefn($processor, $sqlColumns, $field . '-' . $hdr);
+                $processor->addOutputSpecification($type[0], $key, $ltype, CRM_Utils_Array::value(1, $type));
               }
             }
           }
@@ -1301,37 +1107,19 @@ public static function getExportStructureArrays($returnProperties, $processor) {
             $type = explode('-', $locationFieldName);
 
             $actualDBFieldName = $type[0];
-            $outputFieldName = $locationType . '-' . $queryFields[$actualDBFieldName]['title'];
             $daoFieldName = CRM_Utils_String::munge($locationType) . '-' . $actualDBFieldName;
 
             if (!empty($type[1])) {
               $daoFieldName .= "-" . $type[1];
-              if ($actualDBFieldName == 'phone') {
-                $outputFieldName .= "-" . CRM_Utils_Array::value($type[1], $phoneTypes);
-              }
-              elseif ($actualDBFieldName == 'im') {
-                $outputFieldName .= "-" . CRM_Utils_Array::value($type[1], $imProviders);
-              }
-            }
-            if ($type[0] == 'im_provider') {
-              // Warning: shame inducing hack.
-              $metadata[$daoFieldName]['pseudoconstant']['var'] = 'imProviders';
-            }
-            self::sqlColumnDefn($processor, $sqlColumns, $outputFieldName);
-            $processor->addOutputSpecification($outputFieldName, NULL, $locationType, CRM_Utils_Array::value(1, $type));
-            self::sqlColumnDefn($processor, $sqlColumns, $outputFieldName);
-            if ($actualDBFieldName == 'country' || $actualDBFieldName == 'world_region') {
-              $metadata[$daoFieldName] = array('context' => 'country');
-            }
-            if ($actualDBFieldName == 'state_province') {
-              $metadata[$daoFieldName] = array('context' => 'province');
             }
+            $processor->addOutputSpecification($actualDBFieldName, NULL, $locationType, CRM_Utils_Array::value(1, $type));
+            $metadata[$daoFieldName] = $processor->getMetaDataForField($actualDBFieldName);
             $outputColumns[$daoFieldName] = TRUE;
           }
         }
       }
     }
-    return array($outputColumns, $sqlColumns, $metadata);
+    return array($outputColumns, $metadata);
   }
 
   /**
diff --git a/hrjobcontract/CRM/Hrjobcontract/Dedupe/Merger.php b/hrjobcontract/CRM/Hrjobcontract/Dedupe/Merger.php
index f64396c7bd7..e47bcdb82ef 100644
--- a/hrjobcontract/CRM/Hrjobcontract/Dedupe/Merger.php
+++ b/hrjobcontract/CRM/Hrjobcontract/Dedupe/Merger.php
@@ -619,8 +619,11 @@ public static function retrieveFields($main, $other) {
       }
       $key1 = CRM_Utils_Array::value($key, $mainEvs);
       $key2 = CRM_Utils_Array::value($key, $otherEvs);
-      // CRM-17556 Get all non-empty fields, to make comparison easier
-      if (!empty($key1) || !empty($key2)) {
+      // We wish to retain '0' as it has a different meaning than NULL on a checkbox.
+      // However I can't think of a case where an empty string is more meaningful than null
+      // or where it would be FALSE or something else nullish.
+      $valuesToIgnore = [NULL, '', []];
+      if (!in_array($key1, $valuesToIgnore, TRUE) || !in_array($key2, $valuesToIgnore, TRUE)) {
         $result['custom'][] = $key;
       }
     }
@@ -1430,7 +1433,16 @@ public static function getRowsElementsAndInfo($mainId, $otherId, $checkPermissio
         }
       }
       if ($name == 'rel_table_memberships') {
-        $elements[] = array('checkbox', "operation[move_{$name}][add]", NULL, ts('add new'));
+        //Enable 'add new' checkbox if main contact does not contain any membership similar to duplicate contact.
+        $attributes = ['checked' => 'checked'];
+        $otherContactMemberships = CRM_Member_BAO_Membership::getAllContactMembership($otherId);
+        foreach ($otherContactMemberships as $membership) {
+          $mainMembership = CRM_Member_BAO_Membership::getContactMembership($mainId, $membership['membership_type_id'], FALSE);
+          if ($mainMembership) {
+            $attributes = [];
+          }
+        }
+        $elements[] = array('checkbox', "operation[move_{$name}][add]", NULL, ts('add new'), $attributes);
         $migrationInfo["operation"]["move_{$name}"]['add'] = 1;
       }
     }

From 14721334900914168a702c90060dc6607e052e88 Mon Sep 17 00:00:00 2001
From: Davi Alexandre <davi@davialexandre.com.br>
Date: Wed, 10 Apr 2019 16:12:41 -0300
Subject: [PATCH 23/23] PCHR-4473: Fix custom icons of the contact summary page
 tabs

Since CiviCRM 5.8, the tabs now have icons by default. Some of them are
different from the ones used in CiviHR so we have to customize them to
the ones we want.

The tabset hook was used to set the custom icons. For icons in core tabs,
the hrcore does the customization. For the other tabs, the customization
was done in the extension the tab belongs to.

As part of the change in core to support those icons, they also changed
the markup of the tab and now the label/title is wrapped around a `span`
tag. This change broke some javascript code in the hrui extension that
was renaming the title of the summary tab to "Personal Details", as the
jQuery code used there was not aware of the span and was replacing the
entire tab text instead of only the span, resulting in it removing the
icon. This was fixed by using the tabset in hrcore to replace the text.
This way, even if the markup changes again in the future, the replacement
will still work
---
 com.civicrm.hrjobroles/hrjobroles.php         |  2 +-
 contactsummary/contactsummary.php             |  2 +-
 hrbank/hrbank.php                             |  2 +-
 hrcareer/hrcareer.php                         |  2 +-
 hrjobcontract/hrjobcontract.php               |  2 +-
 hrmed/hrmed.php                               |  2 +-
 hrqual/hrqual.php                             |  2 +-
 hrui/js/dist/hrui.min.js                      |  2 +-
 hrui/js/src/hrui/main.js                      |  6 --
 org.civicrm.hremergency/hremergency.php       |  2 +-
 .../Hook/Tabset/CustomTabIconSetter.php       | 46 +++++++++++++
 .../HRCore/Hook/Tabset/SummaryTabModifier.php | 65 +++++++++++++++++++
 uk.co.compucorp.civicrm.hrcore/hrcore.php     |  2 +
 .../hrleaveandabsences.php                    |  2 +-
 14 files changed, 123 insertions(+), 16 deletions(-)
 create mode 100644 uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Tabset/CustomTabIconSetter.php
 create mode 100644 uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Tabset/SummaryTabModifier.php

diff --git a/com.civicrm.hrjobroles/hrjobroles.php b/com.civicrm.hrjobroles/hrjobroles.php
index 7a599914bdf..ca090bc0626 100644
--- a/com.civicrm.hrjobroles/hrjobroles.php
+++ b/com.civicrm.hrjobroles/hrjobroles.php
@@ -125,7 +125,7 @@ function hrjobroles_civicrm_tabset($tabsetName, &$tabs, $context) {
     $tabs[] = array( 'id' => 'hrjobroles',
       'url' => $url,
       'title' => 'Job Roles',
-      'icon' => 'fa fa-list-alt',
+      'icon' => 'crm-i fa-list-alt',
       'weight' => -180,
     );
   }
diff --git a/contactsummary/contactsummary.php b/contactsummary/contactsummary.php
index dc9a31c474b..712783e5119 100644
--- a/contactsummary/contactsummary.php
+++ b/contactsummary/contactsummary.php
@@ -157,7 +157,7 @@ function contactsummary_civicrm_tabset($tabsetName, &$tabs, $context) {
       'id'     => 'contactsummary',
       'url'    => CRM_Utils_System::url('civicrm/contact-summary'),
       'title'  => ts('Contact Summary'),
-      'icon'   => 'fa fa-user',
+      'icon'   => 'crm-i fa-user',
       'weight' => -200,
     );
   }
diff --git a/hrbank/hrbank.php b/hrbank/hrbank.php
index 3f9ac611314..23cf41c8145 100644
--- a/hrbank/hrbank.php
+++ b/hrbank/hrbank.php
@@ -119,7 +119,7 @@ function hrbank_civicrm_tabset($tabsetName, &$tabs, $context) {
 
   foreach ($tabs as $i => $tab) {
     if ($tab['title'] == 'Bank Details') {
-        $tabs[$i]['icon'] = 'fa fa-bank';
+        $tabs[$i]['icon'] = 'crm-i fa-bank';
     }
   }
 }
diff --git a/hrcareer/hrcareer.php b/hrcareer/hrcareer.php
index 3391bca74de..4e91a13f41e 100644
--- a/hrcareer/hrcareer.php
+++ b/hrcareer/hrcareer.php
@@ -207,7 +207,7 @@ function hrcareer_civicrm_tabset($tabsetName, &$tabs, $context) {
 
   foreach ($tabs as $i => $tab) {
     if ($tab['title'] == 'Career History') {
-        $tabs[$i]['icon'] = 'fa fa-history';
+        $tabs[$i]['icon'] = 'crm-i fa-history';
     }
   }
 }
diff --git a/hrjobcontract/hrjobcontract.php b/hrjobcontract/hrjobcontract.php
index c7eb2a960f9..8f58fe580b3 100644
--- a/hrjobcontract/hrjobcontract.php
+++ b/hrjobcontract/hrjobcontract.php
@@ -288,7 +288,7 @@ function hrjobcontract_civicrm_tabset($tabsetName, &$tabs, $context) {
       'id'        => 'hrjobcontract',
       'url'       => CRM_Utils_System::url('civicrm/contact/view/hrjobcontract', array('cid' => $context['contact_id'])),
       'title'     => ts('Job Contract'),
-      'icon'      => 'fa fa-file-o',
+      'icon'      => 'crm-i fa-file-o',
       'weight'    => -190,
     );
   }
diff --git a/hrmed/hrmed.php b/hrmed/hrmed.php
index 9c2add32bd6..a2d8737387c 100644
--- a/hrmed/hrmed.php
+++ b/hrmed/hrmed.php
@@ -181,7 +181,7 @@ function hrmed_civicrm_tabset($tabsetName, &$tabs, $context) {
 
   foreach ($tabs as $i => $tab) {
     if ($tab['title'] == 'Medical & Disability') {
-      $tabs[$i]['icon'] = 'fa fa-wheelchair';
+      $tabs[$i]['icon'] = 'crm-i fa-wheelchair';
     }
   }
 }
diff --git a/hrqual/hrqual.php b/hrqual/hrqual.php
index dc4e30660b1..43607b4979e 100644
--- a/hrqual/hrqual.php
+++ b/hrqual/hrqual.php
@@ -194,7 +194,7 @@ function hrqual_civicrm_tabset($tabsetName, &$tabs, $context) {
 
     foreach ($tabs as $i => $tab) {
       if ($tab['title'] == 'Qualifications') {
-        $tabs[$i]['icon'] = 'fa fa-certificate';
+        $tabs[$i]['icon'] = 'crm-i fa-certificate';
       }
     }
   }
diff --git a/hrui/js/dist/hrui.min.js b/hrui/js/dist/hrui.min.js
index 681c1467016..db9a28d4d72 100644
--- a/hrui/js/dist/hrui.min.js
+++ b/hrui/js/dist/hrui.min.js
@@ -1,2 +1,2 @@
-!function(t,n){define("hrui/main",[],function(){function n(){var n=t(".crm-link-home");v(n,s(n,_(n)))}function e(){t.ajax("/civicrm/hrcore/usermenu?snippet=4",{dataType:"html",success:function(t){u(t,"civihr-menu")}})}function i(n){1===t(n).length&&t(n).on("change",f)}function o(){t(".CRM_HRRecruitment_Form_Application").addClass("crm-form-block"),t(".CRM_HRRecruitment_Form_Application .crm-profile-name-application_profile").addClass("form-layout-compressed")}function a(){"contactForm"===CRM.formName&&(t("input#employer_id, input#job_title","form#Contact").parent("td").hide(),t("div.email-signature, td#Email-Bulkmail-html","form#Contact").hide(),t("#Email-Primary","form#Contact").prev("td").prev("td").hide(),t("td#Email-Bulkmail-html, #Email-Primary","form#Contact").prev("td").hide(),t(".crm-demographics-accordion","form#Contact").insertAfter(t(".crm-contactDetails-accordion")),t("tr#Phone_Block_2","form#Contact").length<1&&t("#addPhone").click(),t("#customFields").length<1&&b())}function c(){1===t(".CRM_HRRecruitment_Form_HRVacancy").length&&(p(t('label[for="start_date"]').parents("tr")),p(t('label[for="end_date"]').parents("tr")),t('[name="entryURL"]').val().indexOf(";template=1")>-1&&t(t(".CRM_HRRecruitment_Form_HRVacancy tbody").get(0)).addClass("CRM_HRRecruitment_Form_HRVacancy_Template"))}function r(){t("#activityCustomData").attr("colspan",3),t("#crm-activity-view-table .crm-case-activity-view-Client .label").html("Contact"),t("span.crm-frozen-field",".crm-profile-name-hrident_tab").closest("div").parent("div").hide(),t(".crm-accordion-header.crm-master-accordion-header").on("click",function(){window.setTimeout(function(){Array.prototype.forEach.call(document.querySelectorAll(".listing-box"),function(t){Ps.initialize(t)})},0)})}function l(){"viewSummary"===CRM.pageName&&(t(".crm-contact-job_title",".crm-summary-contactinfo-block").length&&t(".crm-contact-tabs-list #tab_summary a").text("Personal Details"),t(".Inline_Custom_Data").length&&C(".Inline_Custom_Data"),C(".Extended_Demographics"))}function m(){t("INPUT#contact_source").parent("td").children("a").click(function(){t("#crm-notification-container .crm-help .notify-content").remove(),t("#crm-notification-container .crm-help p").length&&t("#crm-notification-container .crm-help p").remove(),t("#crm-notification-container .crm-help").append("<p>Source is a useful field where data has been migrated to CiviHR from one or a number of other legacy systems. The Source field will indicate which legacy system the contact has come from.</p>")})}function s(n,e){return t("li > a",n).first().text("Home").wrapInner('<span class="menumain-label">').prepend(e)}function d(){"viewSummary"===CRM.pageName&&(t("div.crm-contact-current_employer, div.crm-contact-job_title",".crm-summary-contactinfo-block").parent("div.crm-summary-row").hide(),t("form#ContactInfo input#employer_id, form#ContactInfo input#job_title").closest("div.crm-summary-row").hide())}function u(n,e){var i=t(n),o=t("<div>");o.attr("id",e),o.append(t("#civicrm-menu")),o.append(i),o.insertAfter("#page")}function f(){var n=t(this)[0].files[0];t("#js-uploaded-file").remove(),void 0!==n&&(t(this).after('<span id="js-uploaded-file" class="uploaded-file">'+n.name+' <span class="uploaded-file-icon-trash"><i class="fa fa-trash-o"></i> Remove</span>'),t(".uploaded-file-icon-trash").on("click",h))}function p(t){t.find("label").attr("for",t.find(".crm-form-date").attr("id"))}function h(){var n=t("#js-uploaded-file").parent().find('input[type="file"]');t("#js-uploaded-file").remove(),n.val("")}function v(t,n){t.off().find("#civicrm-home").before(n).remove()}function b(){t("#Inline_Custom_Data").detach().find(".label").each(function(){var n=t(this),e=n.next(),i=t("<td/>");i.append(n.find("label")),i.append(t("<br/>")),i.append(e.html()),t("#nick_name").parent().after(i)})}function C(n){t(n).removeClass("crm-collapsible collapsed").addClass("crm-summary-block").appendTo(".contactTopBar .contactCardLeft").find(".collapsible-title").hide().end().find(".crm-summary-block").show()}function _(n){return t(".crm-logo-sm",n).addClass("chr_logo chr_logo--default-color").removeClass("crm-logo-sm").wrap('<span class="menumain-icon">').parent()}function g(){t(".menumain").not(".crm-Self_Service_Portal").hover(function(){t(this).addClass("activetarget")},function(){t(this).removeClass("activetarget")})}function y(){t("#root-menu-div .menu-item-arrow").each(function(n){var e=t(this);e.before('<i class="fa fa-caret-right menu-item-arrow"></i>'),e.remove()})}t(document).on("crmLoad",function(){d()}).ready(function(){i("input[type='file']"),e(),o(),n(),l(),a(),c(),r(),m(),g(),y(),t("#addEmail").on("click",a)})})}(CRM.$,CRM._),function(t,n){define("hrui/contact",[],function(){function n(n){n?(t(".crm-summary-contactname-block").removeClass("crm-summary-contactname-block-without-contract"),n.position&&t(".crm-contact-detail-position").html("<strong>Position:</strong> "+n.position),n.location&&t(".crm-contact-detail-location").html("<strong>Normal place of work:</strong> "+n.location)):(t(".crm-summary-contactname-block").addClass("crm-summary-contactname-block-without-contract"),t(".crm-contact-detail-position").html(""),t(".crm-contact-detail-location").html(""),e(null))}function e(n){n&&n.departments&&n.departments.length>0?t(".crm-contact-detail-departments").html("<strong>Department:</strong> "+n.departments.join(", ")):t(".crm-contact-detail-departments").html("")}t(document).on("crmLoad",function(n){t(".crm-inline-edit").one("DOMSubtreeModified",function(){var n=t(this).find("form");1===n.length&&n.find("label").each(function(){var n=t(this),e=n.attr("for");t("#"+e).attr("placeholder",n.text())})})}).on("updateContactHeader",function(t,i){void 0!==i.contract&&n(i.contract),void 0!==i.roles&&e(i.roles)})})}(CRM.$,CRM._),function(t){define("hrui/civihr-popup/attrchange",[],function(){"use strict";var n=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;t.fn.attrchange=function(t){if(n){var e={subtree:!1,attributes:!0},i=new n(function(n){n.forEach(function(n){t.call(n.target,n)})});return this.each(function(){i.observe(this,e)})}}})}(CRM.$),function(t){define("hrui/civihr-popup/civihr-popup",[],function(){"use strict";var n=t("body");n.on("click","#bootstrap-theme .btn-slide",function(){function e(){t(".civihr-popup").remove(),n.removeClass("civihr-popup-open")}function i(){r=m.clone(!0).appendTo(n).addClass("civihr-popup")}function o(){l.data("attrchange-is-on")||(l.data("attrchange-is-on",!0),l.attrchange(function(){l.hasClass("btn-slide-active")||e()}))}function a(){r.find("a").click(function(){var n=t(this).parent().index();m.find("li:nth("+n+") a").click()})}function c(){var t=l.offset();r.css({left:+t.left-(r.width()-l.outerWidth()),top:+t.top+l.outerHeight()}),r.show(),n.addClass("civihr-popup-open")}var r,l=t(this),m=l.children("ul.panel");!function(){e(),i(),c(),a(),o()}()})})}(CRM.$),function(t){t(["hrui/main","hrui/contact","hrui/civihr-popup/attrchange","hrui/civihr-popup/civihr-popup"])}(require);
+!function(t,n){define("hrui/main",[],function(){function n(){var n=t(".crm-link-home");v(n,s(n,b(n)))}function e(){t.ajax("/civicrm/hrcore/usermenu?snippet=4",{dataType:"html",success:function(t){u(t,"civihr-menu")}})}function i(n){1===t(n).length&&t(n).on("change",f)}function o(){t(".CRM_HRRecruitment_Form_Application").addClass("crm-form-block"),t(".CRM_HRRecruitment_Form_Application .crm-profile-name-application_profile").addClass("form-layout-compressed")}function a(){"contactForm"===CRM.formName&&(t("input#employer_id, input#job_title","form#Contact").parent("td").hide(),t("div.email-signature, td#Email-Bulkmail-html","form#Contact").hide(),t("#Email-Primary","form#Contact").prev("td").prev("td").hide(),t("td#Email-Bulkmail-html, #Email-Primary","form#Contact").prev("td").hide(),t(".crm-demographics-accordion","form#Contact").insertAfter(t(".crm-contactDetails-accordion")),t("tr#Phone_Block_2","form#Contact").length<1&&t("#addPhone").click(),t("#customFields").length<1&&C())}function c(){1===t(".CRM_HRRecruitment_Form_HRVacancy").length&&(p(t('label[for="start_date"]').parents("tr")),p(t('label[for="end_date"]').parents("tr")),t('[name="entryURL"]').val().indexOf(";template=1")>-1&&t(t(".CRM_HRRecruitment_Form_HRVacancy tbody").get(0)).addClass("CRM_HRRecruitment_Form_HRVacancy_Template"))}function r(){t("#activityCustomData").attr("colspan",3),t("#crm-activity-view-table .crm-case-activity-view-Client .label").html("Contact"),t("span.crm-frozen-field",".crm-profile-name-hrident_tab").closest("div").parent("div").hide(),t(".crm-accordion-header.crm-master-accordion-header").on("click",function(){window.setTimeout(function(){Array.prototype.forEach.call(document.querySelectorAll(".listing-box"),function(t){Ps.initialize(t)})},0)})}function l(){"viewSummary"===CRM.pageName&&(t(".Inline_Custom_Data").length&&_(".Inline_Custom_Data"),_(".Extended_Demographics"))}function m(){t("INPUT#contact_source").parent("td").children("a").click(function(){t("#crm-notification-container .crm-help .notify-content").remove(),t("#crm-notification-container .crm-help p").length&&t("#crm-notification-container .crm-help p").remove(),t("#crm-notification-container .crm-help").append("<p>Source is a useful field where data has been migrated to CiviHR from one or a number of other legacy systems. The Source field will indicate which legacy system the contact has come from.</p>")})}function s(n,e){return t("li > a",n).first().text("Home").wrapInner('<span class="menumain-label">').prepend(e)}function d(){"viewSummary"===CRM.pageName&&(t("div.crm-contact-current_employer, div.crm-contact-job_title",".crm-summary-contactinfo-block").parent("div.crm-summary-row").hide(),t("form#ContactInfo input#employer_id, form#ContactInfo input#job_title").closest("div.crm-summary-row").hide())}function u(n,e){var i=t(n),o=t("<div>");o.attr("id",e),o.append(t("#civicrm-menu")),o.append(i),o.insertAfter("#page")}function f(){var n=t(this)[0].files[0];t("#js-uploaded-file").remove(),void 0!==n&&(t(this).after('<span id="js-uploaded-file" class="uploaded-file">'+n.name+' <span class="uploaded-file-icon-trash"><i class="fa fa-trash-o"></i> Remove</span>'),t(".uploaded-file-icon-trash").on("click",h))}function p(t){t.find("label").attr("for",t.find(".crm-form-date").attr("id"))}function h(){var n=t("#js-uploaded-file").parent().find('input[type="file"]');t("#js-uploaded-file").remove(),n.val("")}function v(t,n){t.off().find("#civicrm-home").before(n).remove()}function C(){t("#Inline_Custom_Data").detach().find(".label").each(function(){var n=t(this),e=n.next(),i=t("<td/>");i.append(n.find("label")),i.append(t("<br/>")),i.append(e.html()),t("#nick_name").parent().after(i)})}function _(n){t(n).removeClass("crm-collapsible collapsed").addClass("crm-summary-block").appendTo(".contactTopBar .contactCardLeft").find(".collapsible-title").hide().end().find(".crm-summary-block").show()}function b(n){return t(".crm-logo-sm",n).addClass("chr_logo chr_logo--default-color").removeClass("crm-logo-sm").wrap('<span class="menumain-icon">').parent()}function g(){t(".menumain").not(".crm-Self_Service_Portal").hover(function(){t(this).addClass("activetarget")},function(){t(this).removeClass("activetarget")})}function y(){t("#root-menu-div .menu-item-arrow").each(function(n){var e=t(this);e.before('<i class="fa fa-caret-right menu-item-arrow"></i>'),e.remove()})}t(document).on("crmLoad",function(){d()}).ready(function(){i("input[type='file']"),e(),o(),n(),l(),a(),c(),r(),m(),g(),y(),t("#addEmail").on("click",a)})})}(CRM.$,CRM._),function(t,n){define("hrui/contact",[],function(){function n(n){n?(t(".crm-summary-contactname-block").removeClass("crm-summary-contactname-block-without-contract"),n.position&&t(".crm-contact-detail-position").html("<strong>Position:</strong> "+n.position),n.location&&t(".crm-contact-detail-location").html("<strong>Normal place of work:</strong> "+n.location)):(t(".crm-summary-contactname-block").addClass("crm-summary-contactname-block-without-contract"),t(".crm-contact-detail-position").html(""),t(".crm-contact-detail-location").html(""),e(null))}function e(n){n&&n.departments&&n.departments.length>0?t(".crm-contact-detail-departments").html("<strong>Department:</strong> "+n.departments.join(", ")):t(".crm-contact-detail-departments").html("")}t(document).on("crmLoad",function(n){t(".crm-inline-edit").one("DOMSubtreeModified",function(){var n=t(this).find("form");1===n.length&&n.find("label").each(function(){var n=t(this),e=n.attr("for");t("#"+e).attr("placeholder",n.text())})})}).on("updateContactHeader",function(t,i){void 0!==i.contract&&n(i.contract),void 0!==i.roles&&e(i.roles)})})}(CRM.$,CRM._),function(t){define("hrui/civihr-popup/attrchange",[],function(){"use strict";var n=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;t.fn.attrchange=function(t){if(n){var e={subtree:!1,attributes:!0},i=new n(function(n){n.forEach(function(n){t.call(n.target,n)})});return this.each(function(){i.observe(this,e)})}}})}(CRM.$),function(t){define("hrui/civihr-popup/civihr-popup",[],function(){"use strict";var n=t("body");n.on("click","#bootstrap-theme .btn-slide",function(){function e(){t(".civihr-popup").remove(),n.removeClass("civihr-popup-open")}function i(){r=m.clone(!0).appendTo(n).addClass("civihr-popup")}function o(){l.data("attrchange-is-on")||(l.data("attrchange-is-on",!0),l.attrchange(function(){l.hasClass("btn-slide-active")||e()}))}function a(){r.find("a").click(function(){var n=t(this).parent().index();m.find("li:nth("+n+") a").click()})}function c(){var t=l.offset();r.css({left:+t.left-(r.width()-l.outerWidth()),top:+t.top+l.outerHeight()}),r.show(),n.addClass("civihr-popup-open")}var r,l=t(this),m=l.children("ul.panel");!function(){e(),i(),c(),a(),o()}()})})}(CRM.$),function(t){t(["hrui/main","hrui/contact","hrui/civihr-popup/attrchange","hrui/civihr-popup/civihr-popup"])}(require);
 //# sourceMappingURL=/sites/all/modules/civicrm/tools/extensions/civihr/hrui/js/dist/hrui.min.js.map
\ No newline at end of file
diff --git a/hrui/js/src/hrui/main.js b/hrui/js/src/hrui/main.js
index 4bbce250041..e7e2919e6c9 100755
--- a/hrui/js/src/hrui/main.js
+++ b/hrui/js/src/hrui/main.js
@@ -130,12 +130,6 @@
      */
     function amendPersonalDetailsTab () {
       if (CRM.pageName === 'viewSummary') {
-        // Rename "Summary" tab to "Personal Details"
-        // Hack to check contact type - This field only appears for individuals
-        if ($('.crm-contact-job_title', '.crm-summary-contactinfo-block').length) {
-          $('.crm-contact-tabs-list #tab_summary a').text('Personal Details');
-        }
-
         if ($('.Inline_Custom_Data').length) {
           repositionPersonalDetailsBlock('.Inline_Custom_Data');
         }
diff --git a/org.civicrm.hremergency/hremergency.php b/org.civicrm.hremergency/hremergency.php
index 0898249a283..13a618bc2f4 100644
--- a/org.civicrm.hremergency/hremergency.php
+++ b/org.civicrm.hremergency/hremergency.php
@@ -151,7 +151,7 @@ function hremergency_civicrm_tabset($tabsetName, &$tabs, $context) {
 
   foreach ($tabs as $i => $tab) {
     if ($tab['title'] == 'Emergency Contacts') {
-      $tabs[$i]['icon'] = 'fa fa-medkit';
+      $tabs[$i]['icon'] = 'crm-i fa-medkit';
     }
   }
 }
diff --git a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Tabset/CustomTabIconSetter.php b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Tabset/CustomTabIconSetter.php
new file mode 100644
index 00000000000..89649f67db4
--- /dev/null
+++ b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Tabset/CustomTabIconSetter.php
@@ -0,0 +1,46 @@
+<?php
+
+class CRM_HRCore_Hook_Tabset_CustomTabIconSetter {
+  /**
+   * Sets custom icons for multiple different tabs in the
+   * contact summary page
+   *
+   * @param string $tabsetName
+   * @param array $tabs
+   * @param array $context
+   */
+  public function handle($tabsetName, &$tabs, $context) {
+    if (!$this->shouldHandle($tabsetName)) {
+      return;
+    }
+
+    $tabIcons = [
+      'activity' => 'fa-users',
+      'summary' => 'fa-puzzle-piece',
+      'rel' => 'fa-sitemap',
+      'note' => 'fa-pencil',
+      'log' => 'fa-archive'
+    ];
+
+    foreach ($tabs as $key => $tab) {
+      if (!empty($tabIcons[$tab['id']])) {
+        $tabs[$key]['icon'] = 'crm-i ' . $tabIcons[$tab['id']];
+      }
+    }
+  }
+
+  /**
+   * Checks if the hook should be handled.
+   *
+   * @param string $tabsetName
+   *
+   * @return bool
+   */
+  private function shouldHandle($tabsetName) {
+    if ($tabsetName === 'civicrm/contact/view') {
+      return TRUE;
+    }
+
+    return FALSE;
+  }
+}
diff --git a/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Tabset/SummaryTabModifier.php b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Tabset/SummaryTabModifier.php
new file mode 100644
index 00000000000..96e1906e51d
--- /dev/null
+++ b/uk.co.compucorp.civicrm.hrcore/CRM/HRCore/Hook/Tabset/SummaryTabModifier.php
@@ -0,0 +1,65 @@
+<?php
+
+class CRM_HRCore_Hook_Tabset_SummaryTabModifier {
+  /**
+   * Applies modifications to the Summary tab of the
+   * Contact Summary page.
+   *
+   * @param string $tabsetName
+   * @param array $tabs
+   * @param array $context
+   */
+  public function handle($tabsetName, &$tabs, $context) {
+    if (!$this->shouldHandle($tabsetName, $context)) {
+      return;
+    }
+
+    foreach ($tabs as $key => $tab) {
+      if ($tab['id'] === 'summary') {
+        $tabs[$key]['title'] = 'Personal Details';
+      }
+    }
+  }
+
+  /**
+   * Checks if the hook should be handled.
+   *
+   * @param string $tabsetName
+   *
+   * @return bool
+   */
+  private function shouldHandle($tabsetName, $context) {
+    if ($tabsetName === 'civicrm/contact/view' && $this->contactIsIndividual($context)) {
+      return TRUE;
+    }
+
+    return FALSE;
+  }
+
+  /**
+   * Checks whether the contact in the given $context is an
+   * Individual or not
+   *
+   * @param $context
+   *
+   * @return bool
+   */
+  private function contactIsIndividual($context) {
+    if (empty($context['contact_id'])) {
+      return FALSE;
+    }
+
+    try {
+      $result = civicrm_api3('Contact', 'getSingle', [
+        'id' => $context['contact_id'],
+        'contact_type' => 'Individual'
+      ]);
+
+      // Since we're using getsigle, the API will return an error if there is no
+      // matching contact
+      return empty($result['is_error']);
+    } catch(\Exception $e) {
+      return FALSE;
+    }
+  }
+}
diff --git a/uk.co.compucorp.civicrm.hrcore/hrcore.php b/uk.co.compucorp.civicrm.hrcore/hrcore.php
index 07184a43894..e1847a0a08b 100644
--- a/uk.co.compucorp.civicrm.hrcore/hrcore.php
+++ b/uk.co.compucorp.civicrm.hrcore/hrcore.php
@@ -50,6 +50,8 @@ function hrcore_civicrm_searchTasks($objectName, &$tasks) {
 function hrcore_civicrm_tabset($tabsetName, &$tabs, $context) {
   $listeners = [
     new CRM_HRCore_Hook_Tabset_ActivityTabModifier(),
+    new CRM_HRCore_Hook_Tabset_SummaryTabModifier(),
+    new CRM_HRCore_Hook_Tabset_CustomTabIconSetter(),
   ];
 
   foreach ($listeners as $currentListener) {
diff --git a/uk.co.compucorp.civicrm.hrleaveandabsences/hrleaveandabsences.php b/uk.co.compucorp.civicrm.hrleaveandabsences/hrleaveandabsences.php
index 9dbdf5d892a..0425f4d7297 100644
--- a/uk.co.compucorp.civicrm.hrleaveandabsences/hrleaveandabsences.php
+++ b/uk.co.compucorp.civicrm.hrleaveandabsences/hrleaveandabsences.php
@@ -384,7 +384,7 @@ function hrleaveandabsences_civicrm_tabset($tabsetName, &$tabs, $context) {
       'id'        => 'absence',
       'url'       => CRM_Utils_System::url('civicrm/contact/view/absence', ['cid' => $contactId]),
       'title'     => ts('Leave'),
-      'icon'      => 'fa fa-briefcase',
+      'icon'      => 'crm-i fa-briefcase',
       'weight'    => 10
     ];
   }